From 8ceecde31a43e63b13922ed7b559d8d500c33685 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Wed, 4 Feb 2026 15:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |     6 +-
 .env.prod                                     |     4 +-
 package.json                                  |     3 +-
 src/api/areavisual/lineEdgeLibrary.js         |    10 +-
 .../overview/components/add-or-updata.vue     |     4 +-
 src/views/areavisual/overview/index.vue       |    48 +-
 src/views/base/dataBoard/index.vue            |   100 -
 src/views/base/equipmentAttr/index.vue        |   214 -
 .../components/BasicDrawer.vue                |   482 -
 .../components/dialogForm.vue                 |   186 -
 src/views/base/equipmentBindGroup/index.vue   |   461 -
 .../base/equipmentBindSection/dialogForm.vue  |   226 -
 src/views/base/equipmentBindSection/index.vue |   442 -
 src/views/base/equipmentFile/index.vue        |   225 -
 .../equipmentGroup/components/BasicDrawer.vue |   481 -
 .../equipmentGroup/components/dialogForm.vue  |   187 -
 src/views/base/equipmentGroup/index.vue       |   466 -
 .../base/equipmentGroupAlarm/dialogForm.vue   |   187 -
 src/views/base/equipmentGroupAlarm/index.vue  |   361 -
 src/views/base/equipmentPlc/add-or-updata.vue |   109 -
 src/views/base/equipmentPlc/index.vue         |   223 -
 .../base/equipmentPlcConnect/TableConfig.vue  |   388 -
 .../equipmentPlcConnect/add-or-updata.vue     |   151 -
 .../components-old/BasicDrawer.vue            |   574 -
 .../components/BasicDrawer.vue                |   668 -
 .../components/basic-add.js                   |   100 -
 src/views/base/equipmentPlcConnect/http.js    |    85 -
 .../base/equipmentPlcConnect/index-old.vue    |   535 -
 src/views/base/equipmentPlcConnect/index.vue  |   561 -
 src/views/base/equipmentPlcParam/index.vue    |   452 -
 src/views/base/equipmentQuantityLog/index.vue |   277 -
 .../base/equipmentQuantityRealtime/index.vue  |   276 -
 src/views/base/equipmentStatusLog/index.vue   |   289 -
 .../base/equipmentStatusRealtime/index.vue    |   296 -
 src/views/base/equipmentTypeFile/index.vue    |   229 -
 src/views/base/material/add-or-updata.vue     |    94 -
 src/views/base/material/index.vue             |   180 -
 .../base/materialPricing/add-or-updata.vue    |   156 -
 .../base/materialPricing/connectTime.vue      |    23 -
 src/views/base/materialPricing/index.vue      |   182 -
 src/views/core/analysis/LineChart.vue         |    94 -
 .../analysis/balanceAnalysis/BarChart.vue     |   211 -
 .../analysis/balanceAnalysis/eq-detail.vue    |   273 -
 .../analysis/balanceAnalysis/index-old.vue    |   296 -
 .../core/analysis/balanceAnalysis/index.vue   |   302 -
 src/views/core/analysis/balanceChart.vue      |   149 -
 .../core/analysis/yieldAnalysis/index.vue     |   273 -
 src/views/core/base/equipment/assets/eq1.jpg  |   Bin 42994 -> 0 bytes
 src/views/core/base/equipment/assets/eq10.jpg |   Bin 50644 -> 0 bytes
 src/views/core/base/equipment/assets/eq2.jpg  |   Bin 79486 -> 0 bytes
 src/views/core/base/equipment/assets/eq3.jpg  |   Bin 72929 -> 0 bytes
 src/views/core/base/equipment/assets/eq4.jpg  |   Bin 41596 -> 0 bytes
 src/views/core/base/equipment/assets/eq5.jpg  |   Bin 62773 -> 0 bytes
 src/views/core/base/equipment/assets/eq6.jpg  |   Bin 38141 -> 0 bytes
 src/views/core/base/equipment/assets/eq7.jpg  |   Bin 70865 -> 0 bytes
 src/views/core/base/equipment/assets/eq8.jpg  |   Bin 55459 -> 0 bytes
 src/views/core/base/equipment/assets/eq9.jpg  |   Bin 45892 -> 0 bytes
 .../equipment/components/AssetsUpload.vue     |   460 -
 .../base/equipment/components/DialogForm.vue  |   313 -
 .../equipment/components/EquipmentDrawer.vue  |   539 -
 .../components/EquipmentInfoForm.vue          |   338 -
 src/views/core/base/equipment/index.vue       |   647 -
 src/views/core/base/equipmentType/index.vue   |   304 -
 src/views/core/base/factory/add-or-updata.vue |    90 -
 src/views/core/base/factory/index.vue         |   185 -
 src/views/core/base/lineBindProcess/index.vue |    99 -
 .../base/lineBindProcess/selectProduct.vue    |    83 -
 .../core/base/lineBindProcessLog/index.vue    |   164 -
 .../base/lineBindProduct/changeStatus.vue     |    53 -
 src/views/core/base/lineBindProduct/index.vue |   106 -
 .../base/lineBindProduct/selectProduct.vue    |    79 -
 .../core/base/lineBindProductLog/index.vue    |   167 -
 src/views/core/base/product/SmallTitle.vue    |    65 -
 src/views/core/base/product/add-or-updata.vue |   447 -
 src/views/core/base/product/attr-add.vue      |   139 -
 src/views/core/base/product/index.vue         |   204 -
 src/views/core/base/product/unitDict.vue      |    15 -
 src/views/core/base/productAttr/index.vue     |   228 -
 .../base/productionLine/add-or-updata.vue     |   181 -
 src/views/core/base/productionLine/index.vue  |   243 -
 .../core/base/productionLineRecDay/index.vue  |   271 -
 .../core/base/productionLineRecSch/index.vue  |   271 -
 .../base/workshopSection/add-or-updata.vue    |   112 -
 src/views/core/base/workshopSection/index.vue |   229 -
 src/views/core/mixins/basic-add.js            |   100 -
 src/views/core/mixins/basic-page.js           |   168 -
 src/views/core/mixins/code-filter.js          |    73 -
 src/views/core/monitoring/auto/index.vue      |   346 -
 .../core/monitoring/components/buttonNav.vue  |   132 -
 src/views/core/monitoring/data/BarChart.vue   |   169 -
 src/views/core/monitoring/data/baseTable.vue  |   273 -
 src/views/core/monitoring/data/index-old.vue  |   314 -
 src/views/core/monitoring/data/index.vue      |   574 -
 src/views/core/monitoring/data24/index.vue    |   217 -
 .../core/monitoring/lineAuto/BarChart.vue     |   272 -
 .../core/monitoring/lineAuto/baseTable.vue    |   273 -
 src/views/core/monitoring/lineAuto/index.vue  |  1362 --
 .../core/monitoring/nextClip/hisData.vue      |   361 -
 src/views/core/monitoring/nextClip/index.vue  |   373 -
 .../core/monitoring/productAuto/BarChart.vue  |   272 -
 .../core/monitoring/productAuto/baseTable.vue |   273 -
 .../core/monitoring/productAuto/index.vue     |  1270 --
 .../monitoring/rawFilmReport/SmallTitle.vue   |    65 -
 .../rawFilmReport/add-or-updata.vue           |   221 -
 .../core/monitoring/rawFilmReport/index.vue   |   281 -
 .../monitoring/sectionStatistics/index.vue    |   363 -
 .../sectionStatisticsSearch/index.vue         |   381 -
 src/views/cost/components/SmallTitle.vue      |    65 -
 src/views/cost/components/add-or-updata.vue   |   442 -
 src/views/cost/components/detailDrawer.vue    |   273 -
 src/views/cost/components/stopInStock.vue     |    65 -
 src/views/cost/components/subSpan1.vue        |    32 -
 src/views/cost/components/subSpan2.vue        |    32 -
 src/views/cost/components/subSpan3.vue        |    57 -
 src/views/cost/components/subSpan4.vue        |    32 -
 src/views/cost/components/typeRule.vue        |    23 -
 src/views/cost/costAnalysis/index.vue         |     0
 .../cost/costStatistics/add-or-updata.vue     |   142 -
 src/views/cost/costStatistics/index.vue       |   404 -
 src/views/cost/costStatistics/typeRule.vue    |    23 -
 .../cost/deep/24hourCostMonitor/index.vue     |   104 -
 .../deep/costDeepEnergy/add-or-updata.vue     |   114 -
 src/views/cost/deep/costDeepEnergy/index.vue  |   436 -
 .../costDeepOthercostHis/add-or-updata.vue    |   115 -
 .../cost/deep/costDeepOthercostHis/index.vue  |   411 -
 .../costDeepOthercostLog/add-or-updata.vue    |   124 -
 .../cost/deep/costDeepOthercostLog/index.vue  |   224 -
 .../costDeepOthercostRule/add-or-updata.vue   |   159 -
 .../cost/deep/costDeepOthercostRule/index.vue |   106 -
 .../deep/costDeepOthercostRule/typeRule.vue   |    31 -
 .../deep/costDeepRatioHis/add-or-updata.vue   |   132 -
 .../cost/deep/costDeepRatioHis/index.vue      |   395 -
 .../deep/costStatistics/add-or-updata.vue     |   160 -
 src/views/cost/deep/costStatistics/index.vue  |   474 -
 .../cost/deep/costStatistics/typeRule.vue     |    23 -
 src/views/cost/index.vue                      |    45 -
 src/views/cost/indexDetail.vue                |   199 -
 .../cost/raw/24hourCostMonitor/index.vue      |   104 -
 .../cost/raw/costEnergy/add-or-updata.vue     |   130 -
 src/views/cost/raw/costEnergy/index.vue       |   435 -
 .../cost/raw/costMaterial/add-or-updata.vue   |   115 -
 .../cost/raw/costMaterial/changeStatus.vue    |    35 -
 src/views/cost/raw/costMaterial/index.vue     |   436 -
 src/views/cost/raw/costMaterial/typeRule.vue  |    23 -
 .../raw/costOriginRatioHis/add-or-updata.vue  |   183 -
 .../cost/raw/costOriginRatioHis/index.vue     |   411 -
 .../raw/costOthercostHis/add-or-updata.vue    |   115 -
 src/views/cost/raw/costOthercostHis/index.vue |   400 -
 .../raw/costOthercostLog/add-or-updata.vue    |   124 -
 src/views/cost/raw/costOthercostLog/index.vue |   224 -
 .../raw/costOthercostRule/add-or-updata.vue   |   159 -
 .../cost/raw/costOthercostRule/index.vue      |   106 -
 .../cost/raw/costOthercostRule/typeRule.vue   |    31 -
 .../cost/raw/costStatistics/add-or-updata.vue |   149 -
 src/views/cost/raw/costStatistics/index.vue   |   474 -
 .../cost/raw/costStatistics/typeRule.vue      |    23 -
 .../contrastAnalysis/components/barChart.vue  |   148 -
 .../contrastAnalysis/components/lineChart.vue |   126 -
 .../components/searchArea.vue                 |   474 -
 .../analysis/contrastAnalysis/index.vue       |   145 -
 .../qoqAnalysis/components/lineChart.vue      |   138 -
 .../qoqAnalysis/components/searchArea.vue     |   232 -
 .../energy/analysis/qoqAnalysis/index.vue     |   132 -
 .../trendAnalysis/components/barChart.vue     |   104 -
 .../trendAnalysis/components/lineChart.vue    |   104 -
 .../trendAnalysis/components/searchArea.vue   |   453 -
 .../energy/analysis/trendAnalysis/index.vue   |   102 -
 .../yoyAnalysis/components/lineChart.vue      |   106 -
 .../yoyAnalysis/components/searchArea.vue     |   205 -
 .../yoyAnalysis/components/subRate.vue        |    18 -
 .../energy/analysis/yoyAnalysis/index.vue     |   143 -
 .../energyPlc/components/energyPlcAdd.vue     |   116 -
 src/views/energy/base/energyPlc/index.vue     |   218 -
 .../components/energyPlcConnectAdd.vue        |   143 -
 .../components/energyPlcParam.vue             |   223 -
 .../components/energyPlcParamAdd.vue          |   134 -
 .../energy/base/energyPlcConnect/index.vue    |   257 -
 .../components/AddTable.vue                   |   141 -
 .../components/energyQuantityManualAdd.vue    |   215 -
 .../base/energyQuantityManual/index.vue       |   332 -
 .../base/energyQuantityRealtime/index.vue     |   207 -
 .../base/energyType/components/InnerTable.vue |   107 -
 .../base/energyType/components/InputArea.vue  |    37 -
 .../energyType/components/TimePickerArea.vue  |    43 -
 .../energyType/components/energyTypeAdd.vue   |   334 -
 src/views/energy/base/energyType/index.vue    |   218 -
 .../components/tableNameConfigUpdate.vue      |    85 -
 .../energy/base/tableNameConfig/index.vue     |   118 -
 .../energyLimit/components/InputArea.vue      |    44 -
 .../energyLimit/components/TimePickerArea.vue |    50 -
 .../energyLimit/components/energyLimitAdd.vue |   360 -
 .../energy/monitoring/energyLimit/index.vue   |   275 -
 .../monitoring/energyOverlimitLog/index.vue   |   268 -
 .../energy/monitoring/energyReport/index.vue  |   184 -
 .../monitoring/energyReportSearch/index.vue   |   182 -
 .../components/energyStatisticsAdd.vue        |   128 -
 .../components/energyStatisticsDet.vue        |   227 -
 .../components/energyStatisticsDetAdd.vue     |   178 -
 .../monitoring/energyStatistics/index.vue     |   245 -
 .../efficiency/components/pieChart.vue        |   288 -
 .../equipment/analysis/efficiency/index.vue   |   629 -
 .../equipment/analysis/exception/index.vue    |   213 -
 .../analysis/quality/components/data.js       |  2323 --
 .../analysis/quality/components/lineChart.vue |   209 -
 .../equipment/analysis/quality/index.vue      |   412 -
 .../timing-diagram/components/gantt.js        |   191 -
 .../output/components/lineChart.vue           |    74 -
 .../equipment/timing-diagram/output/index.vue |   518 -
 .../timing-diagram/output/response.json       |   333 -
 .../equipment/timing-diagram/status/chart.js  |   328 -
 .../equipment/timing-diagram/status/gantt.js  |   302 -
 .../timing-diagram/status/index-old.vue       |   529 -
 .../equipment/timing-diagram/status/index.vue |   483 -
 src/views/group/Calendar/holidayLog.vue       |    83 -
 src/views/group/Calendar/index.vue            |   567 -
 src/views/group/Schedule/SmallTitle.vue       |    65 -
 src/views/group/Schedule/add-group.vue        |   175 -
 src/views/group/Schedule/add-or-updata.vue    |  1076 -
 src/views/group/Schedule/bind-line.vue        |    88 -
 src/views/group/Schedule/detail.vue           |   187 -
 src/views/group/Schedule/edit-class.vue       |   114 -
 src/views/group/Schedule/index.vue            |   552 -
 src/views/group/Schedule/propSpan.vue         |    36 -
 src/views/group/Schedule/propfirstSpan.vue    |    33 -
 src/views/group/Schedule/subSpan.vue          |    33 -
 src/views/group/Schedule/subStatus.vue        |    31 -
 .../groupClasses/components/groupClassAdd.vue |   182 -
 .../groupClasses/components/statusBtn.vue     |    53 -
 src/views/group/base/groupClasses/index.vue   |   293 -
 .../group/base/groupReport/baseTable.vue      |   278 -
 .../group/base/groupReport/gr-detail.vue      |   307 -
 src/views/group/base/groupReport/index.vue    |   546 -
 .../groupTeam/components/groupTeamAdd.vue     |   144 -
 .../base/groupTeam/components/statusBtn.vue   |    54 -
 .../base/groupTeam/components/workerEdit.vue  |   305 -
 .../groupTeam/components/workerOperate.vue    |    41 -
 .../groupTeam/components/workerTeamAdd.vue    |   121 -
 src/views/group/base/groupTeam/index.vue      |   264 -
 .../components/groupUpperLower.vue            |   147 -
 .../group/base/groupTeamScheduling/index.vue  |   550 -
 src/views/group/base/groupWorkLog/index.vue   |   213 -
 .../components/schedulingPlanConfigAdd.vue    |   240 -
 .../group/base/schedulingPlanConfig/index.vue |   230 -
 .../components/schedulingRuleConfigAdd.vue    |   340 -
 .../components/tableSelect.vue                |    44 -
 .../group/base/schedulingRuleConfig/index.vue |   284 -
 src/views/group/deptSelect.vue                |    64 -
 .../group/groupSetting/add-or-updata.vue      |   226 -
 src/views/group/groupSetting/changeStatus.vue |    35 -
 src/views/group/groupSetting/index.vue        |   289 -
 .../group/holidaySetting/add-or-updata.vue    |   382 -
 src/views/group/holidaySetting/holidayLog.vue |   182 -
 src/views/group/holidaySetting/index.vue      |   564 -
 .../monitoring/equipmentAlarmLog/index.vue    |   313 -
 .../equipmentAlarmRealtime/index.vue          |   326 -
 .../monitoring/equipmentFullParams/index.vue  |   289 -
 .../equipmentFullParams/response.js           |   247 -
 .../utils/local-data-manager.js               |    36 -
 .../monitoring/equipmentProcessAmount/data.js |  2323 --
 .../equipmentProcessAmount/graph.vue          |   164 -
 .../equipmentProcessAmount/index.vue          |   573 -
 .../monitoring/equipmentRecentHours/index.vue |   200 -
 .../equipmentStatusAndParams/index.vue        |   301 -
 .../monitoring/equipmentVisualize/index.vue   |   300 -
 .../monitoring/equipmentVisualize/line-pot.js |  1810 --
 src/views/mp/account/index.vue                |   290 -
 src/views/mp/autoReply/index.vue              |   384 -
 .../mp/components/wx-editor/WxEditor.vue      |   230 -
 src/views/mp/components/wx-location/main.vue  |    36 -
 .../mp/components/wx-material-select/main.vue |   247 -
 src/views/mp/components/wx-msg/card.scss      |   101 -
 src/views/mp/components/wx-msg/comment.scss   |    88 -
 src/views/mp/components/wx-msg/main.vue       |   294 -
 src/views/mp/components/wx-music/main.vue     |    52 -
 src/views/mp/components/wx-news/main.vue      |   104 -
 src/views/mp/components/wx-reply/main.vue     |   547 -
 .../mp/components/wx-video-play/main.vue      |    91 -
 .../mp/components/wx-voice-play/main.vue      |    98 -
 src/views/mp/draft/index.vue                  |   700 -
 src/views/mp/freePublish/index.vue            |   395 -
 src/views/mp/material/index.vue               |   440 -
 src/views/mp/menu/assets/demo.png             |   Bin 38335 -> 0 bytes
 src/views/mp/menu/assets/iphone_backImg.png   |   Bin 34272 -> 0 bytes
 src/views/mp/menu/assets/logo.png             |   Bin 6849 -> 0 bytes
 src/views/mp/menu/assets/menu_foot.png        |   Bin 1348 -> 0 bytes
 src/views/mp/menu/assets/menu_head.png        |   Bin 12673 -> 0 bytes
 src/views/mp/menu/index.vue                   |   714 -
 src/views/mp/message/index.vue                |   238 -
 src/views/mp/statistics/index.vue             |   364 -
 src/views/mp/tag/index.vue                    |   243 -
 src/views/mp/user/index.vue                   |   236 -
 .../qualityInspectionBoxBtn/dialogForm.vue    |   238 -
 .../base/qualityInspectionBoxBtn/index.vue    |   329 -
 .../base/qualityInspectionDet/index.vue       |   315 -
 .../base/qualityInspectionType/index.vue      |   355 -
 .../qualityInspectionRecord/dialogForm.vue    |   270 -
 .../qualityInspectionRecord/index.vue         |   442 -
 .../monitoring/qualityRecentHours/index.vue   |   121 -
 .../monitoring/qualityRecentHours/props.json  |    80 -
 .../qualityRecentHours/response.json          |   176 -
 .../components/detailGraph.vue                |    55 -
 .../components/graphs/line.vue                |   286 -
 .../components/graphs/total.vue               |   185 -
 .../components/summaryTable.vue               |    63 -
 .../qualityStatistics/graphPage.vue           |   116 -
 .../monitoring/qualityStatistics/index.vue    |   632 -
 sync_line_ry1_prod.bat                        |    68 -
 sync_line_yy_prod.bat                         |    68 -
 yarn.lock                                     | 18190 ++++++++--------
 309 files changed, 9102 insertions(+), 83833 deletions(-)
 delete mode 100644 src/views/base/dataBoard/index.vue
 delete mode 100644 src/views/base/equipmentAttr/index.vue
 delete mode 100644 src/views/base/equipmentBindGroup/components/BasicDrawer.vue
 delete mode 100644 src/views/base/equipmentBindGroup/components/dialogForm.vue
 delete mode 100644 src/views/base/equipmentBindGroup/index.vue
 delete mode 100644 src/views/base/equipmentBindSection/dialogForm.vue
 delete mode 100644 src/views/base/equipmentBindSection/index.vue
 delete mode 100644 src/views/base/equipmentFile/index.vue
 delete mode 100644 src/views/base/equipmentGroup/components/BasicDrawer.vue
 delete mode 100644 src/views/base/equipmentGroup/components/dialogForm.vue
 delete mode 100644 src/views/base/equipmentGroup/index.vue
 delete mode 100644 src/views/base/equipmentGroupAlarm/dialogForm.vue
 delete mode 100644 src/views/base/equipmentGroupAlarm/index.vue
 delete mode 100644 src/views/base/equipmentPlc/add-or-updata.vue
 delete mode 100644 src/views/base/equipmentPlc/index.vue
 delete mode 100644 src/views/base/equipmentPlcConnect/TableConfig.vue
 delete mode 100644 src/views/base/equipmentPlcConnect/add-or-updata.vue
 delete mode 100644 src/views/base/equipmentPlcConnect/components-old/BasicDrawer.vue
 delete mode 100644 src/views/base/equipmentPlcConnect/components/BasicDrawer.vue
 delete mode 100644 src/views/base/equipmentPlcConnect/components/basic-add.js
 delete mode 100644 src/views/base/equipmentPlcConnect/http.js
 delete mode 100644 src/views/base/equipmentPlcConnect/index-old.vue
 delete mode 100644 src/views/base/equipmentPlcConnect/index.vue
 delete mode 100644 src/views/base/equipmentPlcParam/index.vue
 delete mode 100644 src/views/base/equipmentQuantityLog/index.vue
 delete mode 100644 src/views/base/equipmentQuantityRealtime/index.vue
 delete mode 100644 src/views/base/equipmentStatusLog/index.vue
 delete mode 100644 src/views/base/equipmentStatusRealtime/index.vue
 delete mode 100644 src/views/base/equipmentTypeFile/index.vue
 delete mode 100644 src/views/base/material/add-or-updata.vue
 delete mode 100644 src/views/base/material/index.vue
 delete mode 100644 src/views/base/materialPricing/add-or-updata.vue
 delete mode 100644 src/views/base/materialPricing/connectTime.vue
 delete mode 100644 src/views/base/materialPricing/index.vue
 delete mode 100644 src/views/core/analysis/LineChart.vue
 delete mode 100644 src/views/core/analysis/balanceAnalysis/BarChart.vue
 delete mode 100644 src/views/core/analysis/balanceAnalysis/eq-detail.vue
 delete mode 100644 src/views/core/analysis/balanceAnalysis/index-old.vue
 delete mode 100644 src/views/core/analysis/balanceAnalysis/index.vue
 delete mode 100644 src/views/core/analysis/balanceChart.vue
 delete mode 100644 src/views/core/analysis/yieldAnalysis/index.vue
 delete mode 100644 src/views/core/base/equipment/assets/eq1.jpg
 delete mode 100644 src/views/core/base/equipment/assets/eq10.jpg
 delete mode 100644 src/views/core/base/equipment/assets/eq2.jpg
 delete mode 100644 src/views/core/base/equipment/assets/eq3.jpg
 delete mode 100644 src/views/core/base/equipment/assets/eq4.jpg
 delete mode 100644 src/views/core/base/equipment/assets/eq5.jpg
 delete mode 100644 src/views/core/base/equipment/assets/eq6.jpg
 delete mode 100644 src/views/core/base/equipment/assets/eq7.jpg
 delete mode 100644 src/views/core/base/equipment/assets/eq8.jpg
 delete mode 100644 src/views/core/base/equipment/assets/eq9.jpg
 delete mode 100644 src/views/core/base/equipment/components/AssetsUpload.vue
 delete mode 100644 src/views/core/base/equipment/components/DialogForm.vue
 delete mode 100644 src/views/core/base/equipment/components/EquipmentDrawer.vue
 delete mode 100644 src/views/core/base/equipment/components/EquipmentInfoForm.vue
 delete mode 100644 src/views/core/base/equipment/index.vue
 delete mode 100644 src/views/core/base/equipmentType/index.vue
 delete mode 100644 src/views/core/base/factory/add-or-updata.vue
 delete mode 100644 src/views/core/base/factory/index.vue
 delete mode 100644 src/views/core/base/lineBindProcess/index.vue
 delete mode 100644 src/views/core/base/lineBindProcess/selectProduct.vue
 delete mode 100644 src/views/core/base/lineBindProcessLog/index.vue
 delete mode 100644 src/views/core/base/lineBindProduct/changeStatus.vue
 delete mode 100644 src/views/core/base/lineBindProduct/index.vue
 delete mode 100644 src/views/core/base/lineBindProduct/selectProduct.vue
 delete mode 100644 src/views/core/base/lineBindProductLog/index.vue
 delete mode 100644 src/views/core/base/product/SmallTitle.vue
 delete mode 100644 src/views/core/base/product/add-or-updata.vue
 delete mode 100644 src/views/core/base/product/attr-add.vue
 delete mode 100644 src/views/core/base/product/index.vue
 delete mode 100644 src/views/core/base/product/unitDict.vue
 delete mode 100644 src/views/core/base/productAttr/index.vue
 delete mode 100644 src/views/core/base/productionLine/add-or-updata.vue
 delete mode 100644 src/views/core/base/productionLine/index.vue
 delete mode 100644 src/views/core/base/productionLineRecDay/index.vue
 delete mode 100644 src/views/core/base/productionLineRecSch/index.vue
 delete mode 100644 src/views/core/base/workshopSection/add-or-updata.vue
 delete mode 100644 src/views/core/base/workshopSection/index.vue
 delete mode 100644 src/views/core/mixins/basic-add.js
 delete mode 100644 src/views/core/mixins/basic-page.js
 delete mode 100644 src/views/core/mixins/code-filter.js
 delete mode 100644 src/views/core/monitoring/auto/index.vue
 delete mode 100644 src/views/core/monitoring/components/buttonNav.vue
 delete mode 100644 src/views/core/monitoring/data/BarChart.vue
 delete mode 100644 src/views/core/monitoring/data/baseTable.vue
 delete mode 100644 src/views/core/monitoring/data/index-old.vue
 delete mode 100644 src/views/core/monitoring/data/index.vue
 delete mode 100644 src/views/core/monitoring/data24/index.vue
 delete mode 100644 src/views/core/monitoring/lineAuto/BarChart.vue
 delete mode 100644 src/views/core/monitoring/lineAuto/baseTable.vue
 delete mode 100644 src/views/core/monitoring/lineAuto/index.vue
 delete mode 100644 src/views/core/monitoring/nextClip/hisData.vue
 delete mode 100644 src/views/core/monitoring/nextClip/index.vue
 delete mode 100644 src/views/core/monitoring/productAuto/BarChart.vue
 delete mode 100644 src/views/core/monitoring/productAuto/baseTable.vue
 delete mode 100644 src/views/core/monitoring/productAuto/index.vue
 delete mode 100644 src/views/core/monitoring/rawFilmReport/SmallTitle.vue
 delete mode 100644 src/views/core/monitoring/rawFilmReport/add-or-updata.vue
 delete mode 100644 src/views/core/monitoring/rawFilmReport/index.vue
 delete mode 100644 src/views/core/monitoring/sectionStatistics/index.vue
 delete mode 100644 src/views/core/monitoring/sectionStatisticsSearch/index.vue
 delete mode 100644 src/views/cost/components/SmallTitle.vue
 delete mode 100644 src/views/cost/components/add-or-updata.vue
 delete mode 100644 src/views/cost/components/detailDrawer.vue
 delete mode 100644 src/views/cost/components/stopInStock.vue
 delete mode 100644 src/views/cost/components/subSpan1.vue
 delete mode 100644 src/views/cost/components/subSpan2.vue
 delete mode 100644 src/views/cost/components/subSpan3.vue
 delete mode 100644 src/views/cost/components/subSpan4.vue
 delete mode 100644 src/views/cost/components/typeRule.vue
 delete mode 100644 src/views/cost/costAnalysis/index.vue
 delete mode 100644 src/views/cost/costStatistics/add-or-updata.vue
 delete mode 100644 src/views/cost/costStatistics/index.vue
 delete mode 100644 src/views/cost/costStatistics/typeRule.vue
 delete mode 100644 src/views/cost/deep/24hourCostMonitor/index.vue
 delete mode 100644 src/views/cost/deep/costDeepEnergy/add-or-updata.vue
 delete mode 100644 src/views/cost/deep/costDeepEnergy/index.vue
 delete mode 100644 src/views/cost/deep/costDeepOthercostHis/add-or-updata.vue
 delete mode 100644 src/views/cost/deep/costDeepOthercostHis/index.vue
 delete mode 100644 src/views/cost/deep/costDeepOthercostLog/add-or-updata.vue
 delete mode 100644 src/views/cost/deep/costDeepOthercostLog/index.vue
 delete mode 100644 src/views/cost/deep/costDeepOthercostRule/add-or-updata.vue
 delete mode 100644 src/views/cost/deep/costDeepOthercostRule/index.vue
 delete mode 100644 src/views/cost/deep/costDeepOthercostRule/typeRule.vue
 delete mode 100644 src/views/cost/deep/costDeepRatioHis/add-or-updata.vue
 delete mode 100644 src/views/cost/deep/costDeepRatioHis/index.vue
 delete mode 100644 src/views/cost/deep/costStatistics/add-or-updata.vue
 delete mode 100644 src/views/cost/deep/costStatistics/index.vue
 delete mode 100644 src/views/cost/deep/costStatistics/typeRule.vue
 delete mode 100644 src/views/cost/index.vue
 delete mode 100644 src/views/cost/indexDetail.vue
 delete mode 100644 src/views/cost/raw/24hourCostMonitor/index.vue
 delete mode 100644 src/views/cost/raw/costEnergy/add-or-updata.vue
 delete mode 100644 src/views/cost/raw/costEnergy/index.vue
 delete mode 100644 src/views/cost/raw/costMaterial/add-or-updata.vue
 delete mode 100644 src/views/cost/raw/costMaterial/changeStatus.vue
 delete mode 100644 src/views/cost/raw/costMaterial/index.vue
 delete mode 100644 src/views/cost/raw/costMaterial/typeRule.vue
 delete mode 100644 src/views/cost/raw/costOriginRatioHis/add-or-updata.vue
 delete mode 100644 src/views/cost/raw/costOriginRatioHis/index.vue
 delete mode 100644 src/views/cost/raw/costOthercostHis/add-or-updata.vue
 delete mode 100644 src/views/cost/raw/costOthercostHis/index.vue
 delete mode 100644 src/views/cost/raw/costOthercostLog/add-or-updata.vue
 delete mode 100644 src/views/cost/raw/costOthercostLog/index.vue
 delete mode 100644 src/views/cost/raw/costOthercostRule/add-or-updata.vue
 delete mode 100644 src/views/cost/raw/costOthercostRule/index.vue
 delete mode 100644 src/views/cost/raw/costOthercostRule/typeRule.vue
 delete mode 100644 src/views/cost/raw/costStatistics/add-or-updata.vue
 delete mode 100644 src/views/cost/raw/costStatistics/index.vue
 delete mode 100644 src/views/cost/raw/costStatistics/typeRule.vue
 delete mode 100644 src/views/energy/analysis/contrastAnalysis/components/barChart.vue
 delete mode 100644 src/views/energy/analysis/contrastAnalysis/components/lineChart.vue
 delete mode 100644 src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
 delete mode 100644 src/views/energy/analysis/contrastAnalysis/index.vue
 delete mode 100644 src/views/energy/analysis/qoqAnalysis/components/lineChart.vue
 delete mode 100644 src/views/energy/analysis/qoqAnalysis/components/searchArea.vue
 delete mode 100644 src/views/energy/analysis/qoqAnalysis/index.vue
 delete mode 100644 src/views/energy/analysis/trendAnalysis/components/barChart.vue
 delete mode 100644 src/views/energy/analysis/trendAnalysis/components/lineChart.vue
 delete mode 100644 src/views/energy/analysis/trendAnalysis/components/searchArea.vue
 delete mode 100644 src/views/energy/analysis/trendAnalysis/index.vue
 delete mode 100644 src/views/energy/analysis/yoyAnalysis/components/lineChart.vue
 delete mode 100644 src/views/energy/analysis/yoyAnalysis/components/searchArea.vue
 delete mode 100644 src/views/energy/analysis/yoyAnalysis/components/subRate.vue
 delete mode 100644 src/views/energy/analysis/yoyAnalysis/index.vue
 delete mode 100644 src/views/energy/base/energyPlc/components/energyPlcAdd.vue
 delete mode 100644 src/views/energy/base/energyPlc/index.vue
 delete mode 100644 src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
 delete mode 100644 src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue
 delete mode 100644 src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
 delete mode 100644 src/views/energy/base/energyPlcConnect/index.vue
 delete mode 100644 src/views/energy/base/energyQuantityManual/components/AddTable.vue
 delete mode 100644 src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
 delete mode 100644 src/views/energy/base/energyQuantityManual/index.vue
 delete mode 100644 src/views/energy/base/energyQuantityRealtime/index.vue
 delete mode 100644 src/views/energy/base/energyType/components/InnerTable.vue
 delete mode 100644 src/views/energy/base/energyType/components/InputArea.vue
 delete mode 100644 src/views/energy/base/energyType/components/TimePickerArea.vue
 delete mode 100644 src/views/energy/base/energyType/components/energyTypeAdd.vue
 delete mode 100644 src/views/energy/base/energyType/index.vue
 delete mode 100644 src/views/energy/base/tableNameConfig/components/tableNameConfigUpdate.vue
 delete mode 100644 src/views/energy/base/tableNameConfig/index.vue
 delete mode 100644 src/views/energy/monitoring/energyLimit/components/InputArea.vue
 delete mode 100644 src/views/energy/monitoring/energyLimit/components/TimePickerArea.vue
 delete mode 100644 src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
 delete mode 100644 src/views/energy/monitoring/energyLimit/index.vue
 delete mode 100644 src/views/energy/monitoring/energyOverlimitLog/index.vue
 delete mode 100644 src/views/energy/monitoring/energyReport/index.vue
 delete mode 100644 src/views/energy/monitoring/energyReportSearch/index.vue
 delete mode 100644 src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue
 delete mode 100644 src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue
 delete mode 100644 src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue
 delete mode 100644 src/views/energy/monitoring/energyStatistics/index.vue
 delete mode 100644 src/views/equipment/analysis/efficiency/components/pieChart.vue
 delete mode 100644 src/views/equipment/analysis/efficiency/index.vue
 delete mode 100644 src/views/equipment/analysis/exception/index.vue
 delete mode 100644 src/views/equipment/analysis/quality/components/data.js
 delete mode 100644 src/views/equipment/analysis/quality/components/lineChart.vue
 delete mode 100644 src/views/equipment/analysis/quality/index.vue
 delete mode 100644 src/views/equipment/timing-diagram/components/gantt.js
 delete mode 100644 src/views/equipment/timing-diagram/output/components/lineChart.vue
 delete mode 100644 src/views/equipment/timing-diagram/output/index.vue
 delete mode 100644 src/views/equipment/timing-diagram/output/response.json
 delete mode 100644 src/views/equipment/timing-diagram/status/chart.js
 delete mode 100644 src/views/equipment/timing-diagram/status/gantt.js
 delete mode 100644 src/views/equipment/timing-diagram/status/index-old.vue
 delete mode 100644 src/views/equipment/timing-diagram/status/index.vue
 delete mode 100644 src/views/group/Calendar/holidayLog.vue
 delete mode 100644 src/views/group/Calendar/index.vue
 delete mode 100644 src/views/group/Schedule/SmallTitle.vue
 delete mode 100644 src/views/group/Schedule/add-group.vue
 delete mode 100644 src/views/group/Schedule/add-or-updata.vue
 delete mode 100644 src/views/group/Schedule/bind-line.vue
 delete mode 100644 src/views/group/Schedule/detail.vue
 delete mode 100644 src/views/group/Schedule/edit-class.vue
 delete mode 100644 src/views/group/Schedule/index.vue
 delete mode 100644 src/views/group/Schedule/propSpan.vue
 delete mode 100644 src/views/group/Schedule/propfirstSpan.vue
 delete mode 100644 src/views/group/Schedule/subSpan.vue
 delete mode 100644 src/views/group/Schedule/subStatus.vue
 delete mode 100644 src/views/group/base/groupClasses/components/groupClassAdd.vue
 delete mode 100644 src/views/group/base/groupClasses/components/statusBtn.vue
 delete mode 100644 src/views/group/base/groupClasses/index.vue
 delete mode 100644 src/views/group/base/groupReport/baseTable.vue
 delete mode 100644 src/views/group/base/groupReport/gr-detail.vue
 delete mode 100644 src/views/group/base/groupReport/index.vue
 delete mode 100644 src/views/group/base/groupTeam/components/groupTeamAdd.vue
 delete mode 100644 src/views/group/base/groupTeam/components/statusBtn.vue
 delete mode 100644 src/views/group/base/groupTeam/components/workerEdit.vue
 delete mode 100644 src/views/group/base/groupTeam/components/workerOperate.vue
 delete mode 100644 src/views/group/base/groupTeam/components/workerTeamAdd.vue
 delete mode 100644 src/views/group/base/groupTeam/index.vue
 delete mode 100644 src/views/group/base/groupTeamScheduling/components/groupUpperLower.vue
 delete mode 100644 src/views/group/base/groupTeamScheduling/index.vue
 delete mode 100644 src/views/group/base/groupWorkLog/index.vue
 delete mode 100644 src/views/group/base/schedulingPlanConfig/components/schedulingPlanConfigAdd.vue
 delete mode 100644 src/views/group/base/schedulingPlanConfig/index.vue
 delete mode 100644 src/views/group/base/schedulingRuleConfig/components/schedulingRuleConfigAdd.vue
 delete mode 100644 src/views/group/base/schedulingRuleConfig/components/tableSelect.vue
 delete mode 100644 src/views/group/base/schedulingRuleConfig/index.vue
 delete mode 100644 src/views/group/deptSelect.vue
 delete mode 100644 src/views/group/groupSetting/add-or-updata.vue
 delete mode 100644 src/views/group/groupSetting/changeStatus.vue
 delete mode 100644 src/views/group/groupSetting/index.vue
 delete mode 100644 src/views/group/holidaySetting/add-or-updata.vue
 delete mode 100644 src/views/group/holidaySetting/holidayLog.vue
 delete mode 100644 src/views/group/holidaySetting/index.vue
 delete mode 100644 src/views/monitoring/equipmentAlarmLog/index.vue
 delete mode 100644 src/views/monitoring/equipmentAlarmRealtime/index.vue
 delete mode 100644 src/views/monitoring/equipmentFullParams/index.vue
 delete mode 100644 src/views/monitoring/equipmentFullParams/response.js
 delete mode 100644 src/views/monitoring/equipmentFullParams/utils/local-data-manager.js
 delete mode 100644 src/views/monitoring/equipmentProcessAmount/data.js
 delete mode 100644 src/views/monitoring/equipmentProcessAmount/graph.vue
 delete mode 100644 src/views/monitoring/equipmentProcessAmount/index.vue
 delete mode 100644 src/views/monitoring/equipmentRecentHours/index.vue
 delete mode 100644 src/views/monitoring/equipmentStatusAndParams/index.vue
 delete mode 100644 src/views/monitoring/equipmentVisualize/index.vue
 delete mode 100644 src/views/monitoring/equipmentVisualize/line-pot.js
 delete mode 100644 src/views/mp/account/index.vue
 delete mode 100644 src/views/mp/autoReply/index.vue
 delete mode 100644 src/views/mp/components/wx-editor/WxEditor.vue
 delete mode 100644 src/views/mp/components/wx-location/main.vue
 delete mode 100644 src/views/mp/components/wx-material-select/main.vue
 delete mode 100644 src/views/mp/components/wx-msg/card.scss
 delete mode 100644 src/views/mp/components/wx-msg/comment.scss
 delete mode 100644 src/views/mp/components/wx-msg/main.vue
 delete mode 100644 src/views/mp/components/wx-music/main.vue
 delete mode 100644 src/views/mp/components/wx-news/main.vue
 delete mode 100644 src/views/mp/components/wx-reply/main.vue
 delete mode 100644 src/views/mp/components/wx-video-play/main.vue
 delete mode 100644 src/views/mp/components/wx-voice-play/main.vue
 delete mode 100644 src/views/mp/draft/index.vue
 delete mode 100644 src/views/mp/freePublish/index.vue
 delete mode 100644 src/views/mp/material/index.vue
 delete mode 100644 src/views/mp/menu/assets/demo.png
 delete mode 100644 src/views/mp/menu/assets/iphone_backImg.png
 delete mode 100644 src/views/mp/menu/assets/logo.png
 delete mode 100644 src/views/mp/menu/assets/menu_foot.png
 delete mode 100644 src/views/mp/menu/assets/menu_head.png
 delete mode 100644 src/views/mp/menu/index.vue
 delete mode 100644 src/views/mp/message/index.vue
 delete mode 100644 src/views/mp/statistics/index.vue
 delete mode 100644 src/views/mp/tag/index.vue
 delete mode 100644 src/views/mp/user/index.vue
 delete mode 100644 src/views/quality/base/qualityInspectionBoxBtn/dialogForm.vue
 delete mode 100644 src/views/quality/base/qualityInspectionBoxBtn/index.vue
 delete mode 100644 src/views/quality/base/qualityInspectionDet/index.vue
 delete mode 100644 src/views/quality/base/qualityInspectionType/index.vue
 delete mode 100644 src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
 delete mode 100644 src/views/quality/monitoring/qualityInspectionRecord/index.vue
 delete mode 100644 src/views/quality/monitoring/qualityRecentHours/index.vue
 delete mode 100644 src/views/quality/monitoring/qualityRecentHours/props.json
 delete mode 100644 src/views/quality/monitoring/qualityRecentHours/response.json
 delete mode 100644 src/views/quality/monitoring/qualityStatistics/components/detailGraph.vue
 delete mode 100644 src/views/quality/monitoring/qualityStatistics/components/graphs/line.vue
 delete mode 100644 src/views/quality/monitoring/qualityStatistics/components/graphs/total.vue
 delete mode 100644 src/views/quality/monitoring/qualityStatistics/components/summaryTable.vue
 delete mode 100644 src/views/quality/monitoring/qualityStatistics/graphPage.vue
 delete mode 100644 src/views/quality/monitoring/qualityStatistics/index.vue
 delete mode 100644 sync_line_ry1_prod.bat
 delete mode 100644 sync_line_yy_prod.bat

diff --git a/.env.dev b/.env.dev
index 7f31ab34..1e5dfdbb 100644
--- a/.env.dev
+++ b/.env.dev
@@ -9,12 +9,12 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 智能监控分析系统
+VUE_APP_TITLE = 上上电缆
 
 # 芋道管理系统/开发环境
 
-VUE_APP_BASE_API = 'http://192.168.0.31:48080'
-# VUE_APP_BASE_API = 'http://172.16.32.76:48080'
+# VUE_APP_BASE_API = 'http://192.168.0.31:48080'
+VUE_APP_BASE_API = 'http://172.16.32.236:48080'
 # VUE_APP_BASE_API = 'http://line.kszny.picaiba.com'
 
 # 路由懒加载
diff --git a/.env.prod b/.env.prod
index 5cd7b913..d0c8cee2 100644
--- a/.env.prod
+++ b/.env.prod
@@ -2,14 +2,14 @@
  # @Author: zwq
  # @Date: 2024-03-27 15:49:55
  # @LastEditors: zwq
- # @LastEditTime: 2024-10-30 11:08:47
+ # @LastEditTime: 2025-10-31 09:58:40
  # @Description:
 ###
 # 生产环境配置
 ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 智能监控分析系统
+VUE_APP_TITLE = 上上电缆
 
 # 芋道管理系统/生产环境
 # VUE_APP_BASE_API = '/prod-api'
diff --git a/package.json b/package.json
index 80777fa7..3dd3e190 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "local": "vue-cli-service serve --mode local",
-    "dev": "vue-cli-service serve --mode dev",
+    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode dev",
     "front": "vue-cli-service serve --mode front",
     "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode prod",
     "build:stage": "vue-cli-service build --mode stage",
@@ -45,7 +45,6 @@
     "@jiaminghi/data-view": "^2.10.0",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.27.2",
-    "benz-amr-recorder": "^1.1.5",
     "bpmn-js-token-simulation": "0.10.0",
     "chinese-lunar": "^0.1.4",
     "clipboard": "2.0.8",
diff --git a/src/api/areavisual/lineEdgeLibrary.js b/src/api/areavisual/lineEdgeLibrary.js
index 68697971..5426b544 100644
--- a/src/api/areavisual/lineEdgeLibrary.js
+++ b/src/api/areavisual/lineEdgeLibrary.js
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-11-17 09:25:12
  * @LastEditors: zwq
- * @LastEditTime: 2026-01-14 14:26:15
+ * @LastEditTime: 2026-01-23 13:42:52
  * @Description:
  */
 import request from '@/utils/request'
@@ -39,6 +39,14 @@ export function updateLineEdgeLibrary(data) {
   })
 }
 
+// 更新线边库实时pc --一键清空
+export function AllQKLineEdgeLibrary(data) {
+  return request({
+    url: '/wms/line-edge-library/lane/cancel/pc',
+    method: 'put',
+    data: data
+  })
+}
 // 更新线边库实时pc --清空操作
 export function QKLineEdgeLibrary(data) {
   return request({
diff --git a/src/views/areavisual/overview/components/add-or-updata.vue b/src/views/areavisual/overview/components/add-or-updata.vue
index 2b1c198a..231eab39 100644
--- a/src/views/areavisual/overview/components/add-or-updata.vue
+++ b/src/views/areavisual/overview/components/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2026-01-15 09:16:36
+ * @LastEditTime: 2026-02-03 13:30:54
  * @Description:
 -->
 <template>
@@ -211,6 +211,8 @@ export default {
 					{ required: true, message: '不能为空', trigger: 'change' },
 				],
 				numb: [{ required: true, message: '不能为空', trigger: 'change' }],
+				equipmentId: [{ required: true, message: '不能为空', trigger: 'change' }],
+				suite: [{ required: true, message: '不能为空', trigger: 'change' }],
 			},
 		};
 	},
diff --git a/src/views/areavisual/overview/index.vue b/src/views/areavisual/overview/index.vue
index 8251d467..cc35c458 100644
--- a/src/views/areavisual/overview/index.vue
+++ b/src/views/areavisual/overview/index.vue
@@ -155,18 +155,21 @@
 				:span="20"
 				v-if="changeType === 1"
 				class="overview-container-main">
-					<div class="stat-card">
-						<div class="stat-icon">
-							<i class="el-icon-s-grid" style="color: #fff"></i>
-						</div>
-						<div class="stat-title">库区信息</div>
-						<div class="stat-content">
-							<div class="stat-value">{{ getAreaInfoInfo.regionName }}</div>
-							<div class="stat-label">{{ getAreaInfoInfo.regionCode }}</div>
-						</div>
+				<div class="stat-card">
+					<div class="stat-icon">
+						<i class="el-icon-s-grid" style="color: #fff"></i>
 					</div>
+					<div class="stat-title">库区信息</div>
+					<div class="stat-content">
+						<div class="stat-value">{{ getAreaInfoInfo.regionName }}</div>
+						<div class="stat-label">{{ getAreaInfoInfo.regionCode }}</div>
+					</div>
+				</div>
 				<div class="area-body">
 					<div v-for="item in Object.keys(areaInfo)" :key="item">
+						<el-button size="mini" style="width:189px;" type="primary" @click="clearAll(item)">
+							一键清空
+						</el-button>
 						<div class="potTitle">{{ item }}</div>
 						<div class="potList">
 							<div v-for="sitem in areaInfo[item]" :key="sitem.id">
@@ -194,9 +197,9 @@
 										}}
 										<br />
 										<span
-											v-if="
-												sitem.usableState == 1 &&
-												sitem.lineEdgeLibraryState == 1
+											v-if="sitem.usableState == 3 ||
+												(sitem.usableState == 1 &&
+												sitem.lineEdgeLibraryState == 1)
 											">
 											<span style="font-weight: 600">物料:</span>
 											{{ sitem.materialCode || '' }}
@@ -269,7 +272,7 @@ import {
 	postAllAreaOverview,
 	postAreaInfo,
 } from '@/api/areavisual/overview';
-import { QKLineEdgeLibrary } from '@/api/areavisual/lineEdgeLibrary';
+import { QKLineEdgeLibrary,AllQKLineEdgeLibrary } from '@/api/areavisual/lineEdgeLibrary';
 
 export default {
 	name: 'overview',
@@ -478,6 +481,24 @@ export default {
 			this.handleCancel();
 			this.getAreaInfo(this.getAreaInfoInfo.id);
 		},
+		clearAll(item) {
+			if (this.areaInfo[item].length > 0) {
+				AllQKLineEdgeLibrary({
+					...this.areaInfo[item][0],
+					lineEdgeLibraryState: 0,
+					usableState: 1,
+				}).then(({ data }) => {
+					this.$message({
+						message: data,
+						type: 'success',
+						duration: 1500,
+						onClose: () => {
+							this.getAreaInfo(this.getAreaInfoInfo.id);
+						},
+					});
+				});
+			}
+		},
 	},
 };
 </script>
@@ -569,6 +590,7 @@ export default {
 	letter-spacing: 1px;
 	margin-bottom: 10px;
 	font-size: 16px;
+  padding: 5px;
 }
 .potList {
 	width: 190px;
diff --git a/src/views/base/dataBoard/index.vue b/src/views/base/dataBoard/index.vue
deleted file mode 100644
index 1a014132..00000000
--- a/src/views/base/dataBoard/index.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<!-- 
-    filename: index.vue
-    author: liubin
-    date: 2023-10-11 09:32:04
-    description: 设备看板
--->
-
-<template>
-	<div ref="dataBoard" class="data-board">
-		<el-button type="text" @click="goback" class="go-back--btn">返回</el-button>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'DataBoard',
-	components: {},
-	props: {},
-	data() {
-		return {
-			appMain: null, // dom
-			parentStyle: {
-				margin: '8px 14px 0px 16px',
-				minHeight: 'calc(100vh - 120px - 8px)',
-			}, // object
-			mainFooter: null, // dom
-		};
-	},
-	// mounted() {
-	// 	this.$nextTick(() => {
-	// 		this.modify();
-	// 	});
-	// },
-	// activated() {
-	// 	this.modify();
-	// },
-	// deactivated() {
-	// 	this.recover();
-	// },
-	// beforeDestroy() {
-	// 	this.recover();
-	// },
-	methods: {
-		// modify() {
-		// 	// 在这个页面临时修改下父类的margin，结束时需还原
-		// 	this.appMain = document.querySelector('.app-main');
-		// 	// this.appMain.style.minHeight = 'calc(100vh - 90px)';
-		// 	this.appMain.style.margin = 0;
-		// 	// 在这个页面临时删除 main-footer 元素，结束时需还原
-		// 	// this.mainFooter = document.querySelector('.main-footer').cloneNode(true);
-		// 	// document.querySelector('.main-footer').remove();
-        //     this.$refs.dataBoard.classList.add('data-board');
-		// },
-		// recover() {
-        //     this.$refs.dataBoard.classList.remove('data-board');
-		// 	this.$nextTick(() => {
-		// 		this.appMain.style.margin = this.parentStyle.margin;
-		// 		// this.appMain.style.minHeight = this.parentStyle.minHeight;
-		// 		// this.appMain.insertAdjacentElement('afterend', this.mainFooter);
-		// 	});
-		// },
-		goback() {
-			this.$router.go(-1);
-		}
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.data-board {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background: url('../../../assets/images/DataBoard.png') 100% 100% / contain
-		no-repeat;
-}
-
-.go-back--btn {
-	position: fixed;
-	top: 28px;
-	left: 24px;
-	color: #fff;
-	font-size: 18px;
-	letter-spacing: 6px;
-
-	&:hover {
-		text-decoration: underline;
-	}
-
-	&::after {
-		content: "\2BAA";
-		position: absolute;
-		top: 6px;
-		right: -26px;
-		font-size: 24px;
-	}
-}
-</style>
diff --git a/src/views/base/equipmentAttr/index.vue b/src/views/base/equipmentAttr/index.vue
deleted file mode 100644
index 9696af92..00000000
--- a/src/views/base/equipmentAttr/index.vue
+++ /dev/null
@@ -1,214 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-attr:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-attr:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="设备id" align="center" prop="equipmentId" />
-      <el-table-column label="属性名称" align="center" prop="name" />
-      <el-table-column label="属性值" align="center" prop="value" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:equipment-attr:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-attr:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设备id" prop="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备id" />
-        </el-form-item>
-        <el-form-item label="属性名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入属性名称" />
-        </el-form-item>
-        <el-form-item label="属性值" prop="value">
-          <el-input v-model="form.value" placeholder="请输入属性值" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { createEquipmentAttr, updateEquipmentAttr, deleteEquipmentAttr, getEquipmentAttr, getEquipmentAttrPage, exportEquipmentAttrExcel } from "@/api/base/equipmentAttr";
-
-export default {
-  name: "EquipmentAttr",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 设备属性列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        equipmentId: [{ required: true, message: "设备id不能为空", trigger: "blur" }],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentAttrPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        equipmentId: undefined,
-        name: undefined,
-        value: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加设备属性";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getEquipmentAttr(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改设备属性";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateEquipmentAttr(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentAttr(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id;
-      this.$modal.confirm('是否确认删除设备属性编号为"' + id + '"的数据项?').then(function() {
-          return deleteEquipmentAttr(id);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有设备属性数据项?').then(() => {
-          this.exportLoading = true;
-          return exportEquipmentAttrExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '设备属性.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/base/equipmentBindGroup/components/BasicDrawer.vue b/src/views/base/equipmentBindGroup/components/BasicDrawer.vue
deleted file mode 100644
index cb47e181..00000000
--- a/src/views/base/equipmentBindGroup/components/BasicDrawer.vue
+++ /dev/null
@@ -1,482 +0,0 @@
-<!--
-    filename: EquipmentDrawer.vue
-    author: liubin
-    date: 2023-08-22 14:38:56
-    description:
--->
-
-<template>
-	<el-drawer
-		:visible="visible"
-		:show-close="false"
-		:wrapper-closable="false"
-		class="drawer"
-		custom-class="mes-drawer"
-		size="60%"
-		@closed="$emit('destroy')">
-		<SmallTitle slot="title">
-			{{
-				mode.includes('detail')
-					? '详情'
-					: mode.includes('edit')
-					? '编辑'
-					: '新增'
-			}}
-		</SmallTitle>
-
-		<div class="drawer-body flex">
-			<div class="drawer-body__content">
-				<section v-for="(section, index) in sections" :key="section.key">
-					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
-
-					<div class="form-part" v-if="section.key == 'base'">
-						<el-skeleton v-if="!showForm" animated />
-						<BaseInfoForm
-							key="drawer-dialog-form"
-							v-if="showForm"
-							ref="form"
-							:disabled="true"
-							:dataForm="form"
-							:rows="formRows" />
-					</div>
-
-					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
-						<base-table
-							v-loading="attrListLoading"
-							:table-props="section.props"
-							:page="attrQuery?.params.pageNo || 1"
-							:limit="attrQuery?.params.pageSize || 10"
-							:table-data="list"
-							:add-button-show="mode.includes('detail') ? null : '添加属性'"
-							@emitButtonClick="handleAddAttr"
-							@emitFun="handleEmitFun">
-							<method-btn
-								v-if="section.tableBtn"
-								slot="handleBtn"
-								label="操作"
-								:method-list="tableBtn"
-								@clickBtn="handleTableBtnClick" />
-						</base-table>
-
-						<!-- 分页组件 -->
-						<pagination
-							v-show="total > 0"
-							:total="total"
-							:page.sync="attrQuery.params.pageNo"
-							:limit.sync="attrQuery.params.pageSize"
-							@pagination="getAttrList" />
-					</div>
-				</section>
-			</div>
-
-			<div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
-					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="handleCancel">确定</el-button>
-				<!-- sections的第二项必须是 属性列表  -->
-				<!-- <el-button
-						v-if="sections[1].allowAdd"
-						type="primary"
-						@click="handleAddAttr">
-						添加属性
-					</el-button> -->
-			</div>
-		</div>
-
-		<!-- 属性对话框 -->
-		<base-dialog
-			v-if="sections[1].allowAdd"
-			:dialogTitle="attrTitle"
-			:dialogVisible="attrFormVisible"
-			width="45%"
-			:append-to-body="true"
-			custom-class="baseDialog"
-			@close="closeAttrForm"
-			@cancel="closeAttrForm"
-			@confirm="submitAttrForm">
-			<DialogForm
-				v-if="attrFormVisible"
-				ref="attrForm"
-				:disabled="mode.includes('detail')"
-				v-model="attrForm"
-				:rows="attrRows" />
-		</base-dialog>
-	</el-drawer>
-</template>
-
-<script>
-import BaseInfoForm from '@/components/DialogForm';
-import DialogForm from './dialogForm';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
-
-export default {
-	components: { SmallTitle, DialogForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'dataId'], // dataId 作为一个通用的存放id的字段
-	data() {
-		return {
-			mode: '',
-			visible: false,
-			showForm: false,
-			total: 0,
-			form: {},
-			list: [],
-			attrTitle: '',
-			attrForm: {
-				id: null,
-				equipmentGroupId: '',
-				code: '',
-				type: '',
-				grade: '',
-				alarmCode: '',
-				alarmContent: '',
-				plcParamName: '',
-			},
-			attrFormVisible: false,
-			attrRows: [
-				[
-					{
-						input: true,
-						label: '报警编码', // 自动生成
-						prop: 'code',
-						url: '/base/equipment-group-alarm/getCode',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						select: true,
-						label: '报警类型', // 固定选项
-						prop: 'type',
-						options: [
-							{ label: '布尔型', value: 2 },
-							{ label: '字符型', value: 1 },
-						],
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						select: true,
-						label: '报警级别', // 字典
-						prop: 'grade',
-						options: this.getDictDatas(this.DICT_TYPE.EQU_ALARM_LEVEL),
-					},
-					{
-						input: true,
-						label: '设备报警编码', // 对应到设备实际的报警编码
-						prop: 'alarmCode',
-					},
-				],
-				[
-					{
-						input: true,
-						label: '参数列名', // 在实时数据库的列名
-						prop: 'plcParamName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						input: true,
-						label: '报警内容',
-						prop: 'alarmContent',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-			],
-			attrQuery: {
-				params: {
-					pageNo: 1,
-					pageSize: 10,
-				},
-			}, // 属性列表的请求
-			infoQuery: null, // 基本信息的请求
-			attrFormSubmitting: false,
-			attrListLoading: false,
-		};
-	},
-	computed: {
-		formRows() {
-			return this.sections[0].rows.map((row) => {
-				return row.map((col) => {
-					return {
-						...col,
-						bind: {
-							// 详情 模式下，禁用各种输入
-							// disabled: this.mode == 'detail',
-							disabled: true,
-						},
-					};
-				});
-			});
-		},
-		tableBtn() {
-			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
-		},
-	},
-	mounted() {
-		this.mode = this.defaultMode || 'detail';
-		for (const section of this.sections) {
-			// 请求具体信息
-			if ('url' in section) {
-				const query = {
-					url: section.url,
-					method: section.method || 'get',
-					params: section.queryParams || null,
-					data: section.data || null,
-				};
-				// debugger;
-				this.$axios(query).then(({ data }) => {
-					if (section.key == 'base') {
-						this.form = data;
-						this.showForm = true;
-						this.infoQuery = query;
-					} else if (section.key == 'attrs') {
-						this.attrQuery = query;
-						this.list = data.list;
-						this.total = data.total;
-					}
-				});
-			}
-		}
-	},
-	methods: {
-		handleTableBtnClick({ type, data }) {
-			switch (type) {
-				case 'edit':
-					this.handleEditAttr(data.id);
-					break;
-				case 'delete':
-					this.handleDeleteAttr(data.id);
-					break;
-			}
-		},
-
-		handleEmitFun(val) {
-			console.log('handleEmitFun', val);
-		},
-
-		init() {
-			this.visible = true;
-		},
-
-		async getAttrList() {
-			this.attrListLoading = true;
-			const res = await this.$axios(this.attrQuery);
-			if (res.code == 0) {
-				this.list = res.data.list;
-				this.total = res.data.total;
-			}
-			this.attrListLoading = false;
-		},
-
-		// 保存表单
-		handleSave() {
-			this.$refs['form'][0].validate(async (valid) => {
-				if (valid) {
-					const isEdit = this.mode == 'edit';
-					await this.$axios({
-						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
-						method: isEdit ? 'put' : 'post',
-						data: this.form,
-					});
-					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
-					this.visible = false;
-					this.$emit('refreshDataList');
-				}
-			});
-		},
-
-		handleCancel() {
-			this.visible = false;
-		},
-
-		// 开启编辑
-		toggleEdit() {
-			this.mode = 'edit';
-		},
-
-		// 新增属性
-		handleAddAttr() {
-			if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
-			this.attrForm = {
-				id: null,
-				equipmentGroupId: this.dataId,
-				code: '',
-				type: '',
-				grade: '',
-				alarmCode: '',
-				alarmContent: '',
-				plcParamName: '',
-			};
-			this.attrTitle = '添加设备分组报警';
-			this.attrFormVisible = true;
-		},
-
-		// 编辑属性
-		async handleEditAttr(attrId) {
-			const res = await this.$axios({
-				url: this.sections[1].urlDetail,
-				method: 'get',
-				params: { id: attrId },
-			});
-			if (res.code == 0) {
-				this.attrForm = res.data;
-				this.attrTitle = '编辑设备分组报警';
-				this.attrFormVisible = true;
-			}
-		},
-
-		// 删除属性
-		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该分组报警?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			})
-				.then(async () => {
-					const res = await this.$axios({
-						url: this.sections[1].urlDelete,
-						method: 'delete',
-						params: { id: attrId },
-					});
-					if (res.code == 0) {
-						this.$message({
-							message: '删除成功',
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getAttrList();
-							},
-						});
-					}
-				})
-				.catch(() => {});
-		},
-
-		// 提交属性表
-		async submitAttrForm() {
-			this.$refs['attrForm'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-			});
-			console.log('this.attrform', this.attrForm);
-			const isEdit = this.attrForm.id != null;
-			this.attrFormSubmitting = true;
-			const res = await this.$axios({
-				url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
-				method: isEdit ? 'put' : 'post',
-				data: this.attrForm,
-			});
-
-			if (res.code == 0) {
-				this.closeAttrForm();
-				this.$message({
-					message: `${isEdit ? '更新' : '创建'}成功`,
-					type: 'success',
-					duration: 1500,
-					onClose: () => {
-						this.getAttrList();
-					},
-				});
-			}
-			this.attrFormSubmitting = false;
-		},
-
-		closeAttrForm() {
-			this.attrFormVisible = false;
-		},
-
-		handleClick(raw) {
-			if (raw.type === 'delete') {
-				this.$confirm(`确定删除该报警?`, '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning',
-				})
-					.then(() => {
-						deleteProductAttr(raw.data.id).then(({ data }) => {
-							this.$message({
-								message: '操作成功',
-								type: 'success',
-								duration: 1500,
-								onClose: () => {
-									this.getList();
-								},
-							});
-						});
-					})
-					.catch(() => {});
-			} else {
-				this.addNew(raw.data.id);
-			}
-		},
-	},
-};
-</script>
-
-<style scoped>
-.drawer >>> .el-drawer {
-	border-radius: 8px 0 0 8px;
-}
-
-.drawer >>> .el-drawer__header {
-	margin: 0;
-	padding: 32px 32px 24px;
-	border-bottom: 1px solid #dcdfe6;
-	margin-bottom: 0px;
-}
-
-.small-title::before {
-	content: '';
-	display: inline-block;
-	vertical-align: top;
-	width: 4px;
-	height: 22px;
-	border-radius: 1px;
-	margin-right: 8px;
-	background-color: #0b58ff;
-}
-
-.drawer-body {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-}
-
-.drawer-body__content {
-	flex: 1;
-	/* background: #eee; */
-	padding: 20px 30px;
-	overflow-y: auto;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-</style>
diff --git a/src/views/base/equipmentBindGroup/components/dialogForm.vue b/src/views/base/equipmentBindGroup/components/dialogForm.vue
deleted file mode 100644
index fe7b848b..00000000
--- a/src/views/base/equipmentBindGroup/components/dialogForm.vue
+++ /dev/null
@@ -1,186 +0,0 @@
-<!-- 
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-09-11 15:55:13
-    description: DialogForm for equipmentBindSection only
--->
-
-<template>
-	<el-form
-		ref="form"
-		:model="dataForm"
-		label-width="100px"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="报警编码"
-					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.code"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入工段排序" />
-				</el-form-item>
-				<!-- 				
-				<el-form-item
-					label="报警编码"
-					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.code"
-						placeholder="请选择产线"
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item> -->
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="报警类型"
-					prop="type"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						:disabled="disabled"
-						v-model="dataForm.type"
-						placeholder="请选择报警类型"
-						@change="handleTypeChange">
-						<el-option
-							v-for="opt in [
-								{ label: '布尔型', value: 2 },
-								{ label: '字符型', value: 1 },
-							]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="报警级别"
-					prop="grade"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						:disabled="disabled"
-						v-model="dataForm.grade"
-						placeholder="请选择报警级别"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					v-if="+dataForm.type == 1"
-					label="设备报警编码"
-					prop="alarmCode">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.alarmCode"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入设备报警编码" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="参数列名"
-					prop="plcParamName"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.plcParamName"
-						placeholder="请输入参数列名"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="报警内容"
-					prop="alarmContent"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.alarmContent"
-						placeholder="请输入报警内容"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-export default {
-	name: 'DialogForm',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: {},
-	props: {
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	data() {
-		return {
-			formLoading: true,
-		};
-	},
-	mounted() {
-		this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
-			this.formLoading = false;
-			this.$emit('update', {
-				...this.dataForm,
-				code,
-			});
-		});
-	},
-	methods: {
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.form.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.form.resetFields(args);
-		},
-		async handleTypeChange(id) {
-			this.dataForm.alarmCode = '';
-			this.$emit('update', this.dataForm);
-		},
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-</style>
diff --git a/src/views/base/equipmentBindGroup/index.vue b/src/views/base/equipmentBindGroup/index.vue
deleted file mode 100644
index 94fd6caa..00000000
--- a/src/views/base/equipmentBindGroup/index.vue
+++ /dev/null
@@ -1,461 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="700px"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
-		</base-dialog>
-
-		<!-- 抽屉 详情 -->
-		<BasicDrawer
-			v-if="editVisible"
-			ref="drawer"
-			:default-mode="editMode"
-			:data-id="alarmForm.id"
-			:sections="[
-				{
-					name: '基本信息',
-					key: 'base',
-					rows: drawerBaseInfoRows,
-					url: '/base/equipment-group/get',
-					urlUpdate: '/base/equipment-group/update',
-					urlCreate: '/base/equipment-group/create',
-					queryParams: { id: alarmForm.id },
-				},
-				{
-					name: '属性列表',
-					key: 'attrs',
-					props: drawerListProps,
-					url: '/base/equipment-group-alarm/page',
-					urlCreate: '/base/equipment-group-alarm/create',
-					urlUpdate: '/base/equipment-group-alarm/update',
-					urlDelete: '/base/equipment-group-alarm/delete',
-					urlDetail: '/base/equipment-group-alarm/get',
-					queryParams: {
-						equipmentGroupId: alarmForm.id,
-						pageNo: 1,
-						pageSize: 10,
-					},
-					tableBtn: [
-						this.$auth.hasPermi('base:equipment-group:update')
-							? {
-									type: 'edit',
-									btnName: '修改',
-							  }
-							: undefined,
-						this.$auth.hasPermi('base:equipment-group:delete')
-							? {
-									type: 'delete',
-									btnName: '删除',
-							  }
-							: undefined,
-					].filter((v) => v),
-					allowAdd: true,
-				},
-			]"
-			@refreshDataList="getList"
-			@cancel="editVisible = false"
-			@destroy="editVisible = false" />
-	</div>
-</template>
-
-<script>
-import {
-	createEquipmentBindGroup,
-	updateEquipmentBindGroup,
-	deleteEquipmentBindGroup,
-	getEquipmentBindGroup,
-	getEquipmentBindGroupPage,
-	exportEquipmentBindGroupExcel,
-} from '@/api/base/equipmentBindGroup';
-
-import { getEquipmentGroupPage } from '@/api/base/equipmentGroup';
-import moment from 'moment';
-import { publicFormatter } from '@/utils/dict';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import BasicDrawer from './components/BasicDrawer.vue';
-
-export default {
-	name: 'EquipmentBindGroup',
-	components: { BasicDrawer },
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			searchBarKeys: ['groupId', 'equipmentName'],
-			tableBtn: [
-				this.$auth.hasPermi('base:equipment-bind-group:update')
-					? {
-							type: 'detail',
-							btnName: '查看报警',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-bind-group:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-bind-group:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ prop: 'equipmentName', label: '设备' },
-				{ prop: 'groupName', label: '分组' },
-				// {
-				// 	_action: 'equipment-bind-group-show-alert',
-				// 	label: '分组报警',
-				// 	subcomponent: {
-				// 		props: ['injectData'],
-				// 		render: function (h) {
-				// 			const _this = this;
-				// 			return h(
-				// 				'el-button',
-				// 				{
-				// 					props: { type: 'text' },
-				// 					on: {
-				// 						click: function () {
-				// 							console.log('inejctdata', _this.injectData);
-				// 							_this.$emit('emitData', {
-				// 								action: _this.injectData._action,
-				// 								value: _this.injectData,
-				// 							});
-				// 						},
-				// 					},
-				// 				},
-				// 				'查看报警'
-				// 			);
-				// 		},
-				// 	},
-				// },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '分组',
-					placeholder: '请选择分组',
-					param: 'groupId',
-					filterable: true,
-					selectOptions: [],
-				},
-				{
-					type: 'input',
-					label: '设备',
-					placeholder: '请输入设备',
-					param: 'equipmentName',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment-bind-group:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			rows: [
-				[
-					{
-						select: true,
-						label: '设备',
-						url: '/base/equipment/page?pageNo=1&pageSize=100',
-						prop: 'equipmentId',
-						bind: {
-							filterable: true,
-						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						select: true,
-						label: '报警分组',
-						url: '/base/equipment-group/listAll', // 根据产线获取
-						// depends: '__product_line', // 依赖产线获取数据
-						// depends: 'productionLineId',
-						prop: 'groupId',
-						bind: {
-							filterable: true,
-						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-			],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				equipmentName: null,
-				groupId: null,
-			},
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {},
-			//
-			alarmForm: {
-				id: undefined,
-				equipmentGroupCode: undefined,
-				equipmentGroupName: undefined,
-			},
-			editVisible: false,
-			editMode: '',
-			drawerBaseInfoRows: [
-				[
-					{
-						input: true,
-						label: '设备分组名称',
-						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
-						// }
-					},
-					{
-						input: true,
-						label: '设备分组编码',
-						prop: 'code',
-						// url: '/base/equipment/getCode',
-					},
-				],
-			],
-			drawerListProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ width: 240, prop: 'code', label: '报警编码' },
-				{
-					width: 100,
-					prop: 'type',
-					label: '报警类型',
-					filter: (val) =>
-						val != null ? ['-', '字符型', '布尔型', '-'][val] : '-',
-				},
-				{
-					width: 90,
-					prop: 'grade',
-					label: '报警级别',
-					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
-				},
-				{ width: 180, prop: 'alarmCode', label: '设备报警编码' },
-				{ width: 128, prop: 'plcParamName', label: '参数列名' },
-				{ width: 128, prop: 'alarmContent', label: '报警内容' },
-			],
-		};
-	},
-	created() {
-		this.getList();
-		getEquipmentGroupPage({ pageNo: 1, pageSize: 100 }).then((res) => {
-			this.searchBarFormConfig[0].selectOptions = res.data.list;
-		});
-	},
-	methods: {
-		/** 覆盖 handleEmitFun 的默认实现 */
-		handleEmitFun({ action, value }) {
-			const {
-				groupId: equipmentGroupId,
-				groupName: equipmentGroupName,
-				groupCode: equipmentGroupCode,
-			} = value;
-			switch (action) {
-				case 'equipment-bind-group-show-alert':
-					// this.$router.push({ path: '/equipment/base/equipment-group-alarm' });
-					this.$router.push({
-						name: 'EquipmentGroupAlarm',
-						params: {
-							equipmentGroupId,
-							equipmentGroupCode,
-							equipmentGroupName,
-						},
-					});
-					break;
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			getEquipmentBindGroupPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				equipmentId: undefined,
-				groupId: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备与分组绑定';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentBindGroup(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备与分组绑定';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentBindGroup(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentBindGroup(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		// 查看报警
-		handleDetail(row) {
-			const { equipmentId, equipmentName, groupCode, groupId, groupName, id } =
-				row;
-			// 打开抽屉
-			this.editMode = 'detail';
-			this.alarmForm.id = groupId;
-			this.alarmForm.equipmentGroupCode = groupCode;
-			this.alarmForm.equipmentGroupName = groupName;
-			this.editVisible = true;
-			this.$nextTick(() => {
-				this.$refs['drawer'].init();
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除该分组绑定?')
-				.then(function () {
-					return deleteEquipmentBindGroup(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备与分组绑定数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentBindGroupExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备与分组绑定.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/base/equipmentBindSection/dialogForm.vue b/src/views/base/equipmentBindSection/dialogForm.vue
deleted file mode 100644
index 23a6adf4..00000000
--- a/src/views/base/equipmentBindSection/dialogForm.vue
+++ /dev/null
@@ -1,226 +0,0 @@
-<!--
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-09-11 15:55:13
-    description: DialogForm for equipmentBindSection only
--->
-
-<template>
-	<el-form
-		ref="form"
-		:model="dataForm"
-		label-width="100px"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="产线"
-					prop="productionLineId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.productionLineId"
-						placeholder="请选择产线"
-						filterable
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="工段"
-					prop="workshopSectionId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.workshopSectionId"
-						filterable
-						placeholder="请选择工段"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in worksectionList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="设备"
-					prop="equipmentId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.equipmentId"
-						filterable
-						placeholder="请选择设备"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in equipmentList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item label="工段设备排序" prop="sort">
-					<el-input-number
-						v-model="dataForm.sort"
-						filterable
-						min="0"
-						max="100"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入工段设备排序" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="产线数据类型" prop="lineDataType">
-					<el-select
-						v-model="dataForm.lineDataType"
-						placeholder="请选择产线数据类型"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in [
-								{ label: '无类型', value: 0 },
-								{ label: '进口统计', value: 1 },
-								{ label: '出口统计', value: 2 },
-							]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="工段数据类型" prop="sectionDataType">
-					<el-select
-						v-model="dataForm.sectionDataType"
-						placeholder="请选择工段数据类型"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in [
-								{ label: '无类型', value: 0 },
-								{ label: '进口统计', value: 1 },
-								{ label: '出口统计', value: 2 },
-                { label: '进出口计数', value: 3 },
-							]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-export default {
-	name: 'DialogForm',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: {},
-	props: {
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			formLoading: true,
-			productionLineList: [],
-			equipmentList: [],
-			worksectionList: [],
-			dataFormCache: null,
-		};
-	},
-	mounted() {
-		Promise.all([this.getProductLineList(), this.getEquipmentList()]).then(
-			() => {
-				this.formLoading = false;
-			}
-		);
-	},
-	watch: {
-		'dataForm.productionLineId': {
-			handler: async function (plId) {
-				if (plId) await this.getWorksectionList(plId);
-			},
-			immediate: true,
-		},
-	},
-	methods: {
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.form.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.form.resetFields(args);
-		},
-		async handleProductlineChange(id) {
-			await this.getWorksectionList(id);
-			this.dataForm.workshopSectionId = null;
-			this.$emit('update', this.dataForm);
-		},
-		// getCode
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
-		},
-		// 获取产线列表
-		async getProductLineList() {
-			const response = await this.$axios('/base/production-line/listAll');
-			this.productionLineList = response.data.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-		// 获取设备列表
-		async getEquipmentList() {
-			const response = await this.$axios(
-				'/base/equipment/page?pageNo=1&pageSize=100'
-			);
-			this.equipmentList = response.data.list.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-		// 获取工段列表
-		async getWorksectionList(plId) {
-			const response = await this.$axios(
-				'/base/workshop-section/listByParentId',
-				{
-					params: {
-						id: plId,
-					},
-				}
-			);
-			this.worksectionList = response.data.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-</style>
diff --git a/src/views/base/equipmentBindSection/index.vue b/src/views/base/equipmentBindSection/index.vue
deleted file mode 100644
index b91955b3..00000000
--- a/src/views/base/equipmentBindSection/index.vue
+++ /dev/null
@@ -1,442 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@select-changed="handleSearchBarChanged"
-			@headBtnClick="buttonClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="700px"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	createEquipmentBindSection,
-	updateEquipmentBindSection,
-	deleteEquipmentBindSection,
-	getEquipmentBindSection,
-	getEquipmentBindSectionPage,
-	exportEquipmentBindSectionExcel,
-} from '@/api/base/equipmentBindSection';
-import { getPdList } from '@/api/core/monitoring/auto';
-import { getFactoryPage } from '@/api/core/base/factory';
-import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import DialogForm from './dialogForm.vue';
-export default {
-	name: 'EquipmentBindSection',
-	components: { DialogForm },
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			searchBarKeys: ['factoryId','productionLineId','workshopSectionId', 'equipmentName'],
-			tableBtn: [
-				this.$auth.hasPermi('base:equipment-bind-section:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-bind-section:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ prop: 'factoryName', label: '工厂' },
-				{ prop: 'productionLine', label: '产线' },
-				{ prop: 'workshopSection', label: '工段' },
-				{ prop: 'equipment', label: '设备名称' },
-				{ prop: 'sort', label: '工段中排序' },
-				{
-					prop: 'lineDataType',
-					label: '产线数据类型',
-					filter: (val) =>
-						val != null ? ['无类型', '进口计数', '出口计数'][val] : '-',
-				},
-				{
-					prop: 'sectionDataType',
-					label: '工段数据类型',
-					filter: (val) =>
-						val != null ? ['无类型', '进口计数', '出口计数', '进出口计数'][val] : '-',
-				},
-				// {
-				// 	action: 'show-alert',
-				// 	label: '报警',
-				// 	,
-				// 	subcomponent: {
-				// 		props: ['injectData'],
-				// 		render: function (h) {
-				// 			const _this = this;
-				// 			return h(
-				// 				'el-button',
-				// 				{
-				// 					props: { type: 'text', size: 'mini' },
-				// 					on: {
-				// 						click: function () {
-				// 							console.log('inejctdata', _this.injectData);
-				// 							_this.$emit('emitData', {
-				// 								action: _this.injectData.action,
-				// 								value: _this.injectData.id,
-				// 							});
-				// 						},
-				// 					},
-				// 				},
-				// 				'查看报警'
-				// 			);
-				// 		},
-				// 	},
-				// },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'productionLineId',
-					multiple: true,
-				},
-				{
-					type: 'select',
-					label: '工段',
-					placeholder: '请选择工段',
-					param: 'workshopSectionId',
-					selectOptions: [],
-					filterable: true
-				},
-				{
-					type: 'input',
-					label: '设备',
-					placeholder: '请输入设备',
-					param: 'equipmentName',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment-bind-section:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			rows: [
-				[
-					{
-						select: true,
-						label: '产线',
-						url: '/base/production-line/listAll',
-						// prop: '__product_line', // __开头代表不传递给服务器
-						prop: 'productionLineId', // 编辑接口返回的产线id，所以不能使用上面那种形式
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						select: true,
-						label: '工段',
-						url: '/base/workshop-section/listByParentId', // 根据产线获取
-						// depends: '__product_line', // 依赖产线获取数据
-						depends: 'productionLineId',
-						prop: 'workshopSectionId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						select: true,
-						label: '设备',
-						url: '/base/equipment/page?pageNo=1&pageSize=100',
-						prop: 'equipmentId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						input: true,
-						label: '工段排序',
-						prop: 'sort',
-						// url: '/base/equipment-group/getCode',
-					},
-				],
-				[
-					{
-						select: true,
-						label: '产线数据类型',
-						options: [
-							{ label: '无类型', value: 0 },
-							{ label: '进口计数', value: 1 },
-							{ label: '出口计数', value: 2 },
-						],
-						prop: 'lineDataType',
-					},
-					{
-						select: true,
-						label: '工段数据类型',
-						options: [
-							{ label: '无类型', value: 0 },
-							{ label: '进口计数', value: 1 },
-							{ label: '出口计数', value: 2 },
-							{ label: '进出口计数', value: 3 },
-						],
-						prop: 'sectionDataType',
-					},
-				],
-			],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				workshopSectionId: null,
-				equipmentId: null,
-        equipmentName: null,
-        factoryId: null,
-				productionLineId: [],
-			},
-			// 表单参数
-			form: {},
-		};
-	},
-	created() {
-		this.getList();
-		this.initWorksection();
-		this.getPdLineList();
-	},
-	methods: {
-		/** 准备工段数据 */
-		async initWorksection() {
-			const { code, data } = await this.$axios({
-				url: '/base/workshop-section/listAll',
-				method: 'get',
-			});
-			if (code == 0) {
-				this.searchBarFormConfig[2].selectOptions = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.searchBarFormConfig[1].selectOptions = res.data || [];
-			});
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.searchBarFormConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		handleSearchBarChanged({ param, value }) {
-			this.queryParams.productionLineId = [];
-			this.$refs['search-bar'].formInline.productionLineId = undefined;
-			getPdList(value).then((res) => {
-				this.searchBarFormConfig[1].selectOptions = res.data || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.queryParams.pageNo = 1;
-					this.queryParams.pageSize = 10;
-					this.queryParams.name = val.name;
-					this.queryParams.workshopSectionId = val.workshopSectionId || undefined;
-					this.queryParams.equipmentName = val.equipmentName || undefined;
-					this.queryParams.factoryId = val.factoryId || undefined;
-					this.queryParams.productionLineId = val.productionLineId || [];
-					this.handleQuery();
-					break;
-				case 'add':
-					this.handleAdd();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				case 'reset':
-					this.$refs['search-bar'].resetForm();
-					this.resetQuery();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentBindSectionPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				workshopSectionId: undefined,
-				equipmentId: undefined,
-				sort: undefined,
-				lineDataType: undefined,
-				sectionDataType: undefined,
-				remark: undefined,
-				version: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加工段设备绑定';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentBindSection(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改工段设备绑定';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentBindSection(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentBindSection(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除工段设备绑定设备名称为"' + row.equipment + '"的数据项?')
-				.then(function () {
-					return deleteEquipmentBindSection(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有工段设备绑定数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentBindSectionExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '工段设备绑定.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/base/equipmentFile/index.vue b/src/views/base/equipmentFile/index.vue
deleted file mode 100644
index cb2ebd21..00000000
--- a/src/views/base/equipmentFile/index.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备ID" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-file:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-file:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="设备ID" align="center" prop="equipmentId" />
-      <el-table-column label="文件类型 1.图片 2.设备资料" align="center" prop="fileType">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.EQU_FILE_TYPE" :value="scope.row.fileType" />
-        </template>
-      </el-table-column>
-      <el-table-column label="原始文件名" align="center" prop="fileName" />
-      <el-table-column label="文件url" align="center" prop="fileUrl" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:equipment-file:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-file:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设备ID" prop="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备ID" />
-        </el-form-item>
-        <el-form-item label="文件类型 1.图片 2.设备资料" prop="fileType">
-          <el-select v-model="form.fileType" placeholder="请选择文件类型 1.图片 2.设备资料">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQU_FILE_TYPE)"
-                       :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="原始文件名" prop="fileName">
-          <el-input v-model="form.fileName" placeholder="请输入原始文件名" />
-        </el-form-item>
-        <el-form-item label="文件url" prop="fileUrl">
-          <el-input v-model="form.fileUrl" placeholder="请输入文件url" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { createEquipmentFile, updateEquipmentFile, deleteEquipmentFile, getEquipmentFile, getEquipmentFilePage, exportEquipmentFileExcel } from "@/api/base/equipmentFile";
-
-export default {
-  name: "EquipmentFile",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 设备文件对应列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentFilePage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        equipmentId: undefined,
-        fileType: undefined,
-        fileName: undefined,
-        fileUrl: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加设备文件对应";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getEquipmentFile(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改设备文件对应";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateEquipmentFile(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentFile(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id;
-      this.$modal.confirm('是否确认删除设备文件对应编号为"' + id + '"的数据项?').then(function() {
-          return deleteEquipmentFile(id);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有设备文件对应数据项?').then(() => {
-          this.exportLoading = true;
-          return exportEquipmentFileExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '设备文件对应.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/base/equipmentGroup/components/BasicDrawer.vue b/src/views/base/equipmentGroup/components/BasicDrawer.vue
deleted file mode 100644
index 66c97df8..00000000
--- a/src/views/base/equipmentGroup/components/BasicDrawer.vue
+++ /dev/null
@@ -1,481 +0,0 @@
-<!--
-    filename: EquipmentDrawer.vue
-    author: liubin
-    date: 2023-08-22 14:38:56
-    description:
--->
-
-<template>
-	<el-drawer
-		:visible="visible"
-		:show-close="false"
-		:wrapper-closable="false"
-		class="drawer"
-		custom-class="mes-drawer"
-		size="60%"
-		@closed="$emit('destroy')">
-		<SmallTitle slot="title">
-			{{
-				mode.includes('detail')
-					? '详情'
-					: mode.includes('edit')
-					? '编辑'
-					: '新增'
-			}}
-		</SmallTitle>
-
-		<div class="drawer-body flex">
-			<div class="drawer-body__content">
-				<section v-for="(section, index) in sections" :key="section.key">
-					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
-
-					<div class="form-part" v-if="section.key == 'base'">
-						<el-skeleton v-if="!showForm" animated />
-						<BaseInfoForm
-							key="drawer-dialog-form"
-							v-if="showForm"
-							ref="form"
-							:disabled="mode.includes('detail')"
-							v-model="form"
-							:rows="formRows" />
-					</div>
-
-					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
-						<base-table
-							v-loading="attrListLoading"
-							:table-props="section.props"
-							:page="attrQuery?.params.pageNo || 1"
-							:limit="attrQuery?.params.pageSize || 10"
-							:table-data="list"
-							:add-button-show="mode.includes('detail') ? null : '添加属性'"
-							@emitButtonClick="handleAddAttr"
-							@emitFun="handleEmitFun">
-							<method-btn
-								v-if="section.tableBtn"
-								slot="handleBtn"
-								label="操作"
-								:method-list="tableBtn"
-								@clickBtn="handleTableBtnClick" />
-						</base-table>
-
-						<!-- 分页组件 -->
-						<pagination
-							v-show="total > 0"
-							:total="total"
-							:page.sync="attrQuery.params.pageNo"
-							:limit.sync="attrQuery.params.pageSize"
-							@pagination="getAttrList" />
-					</div>
-				</section>
-			</div>
-
-			<div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
-					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="handleCancel">确定</el-button>
-				<!-- sections的第二项必须是 属性列表  -->
-				<!-- <el-button
-						v-if="sections[1].allowAdd"
-						type="primary"
-						@click="handleAddAttr">
-						添加属性
-					</el-button> -->
-			</div>
-		</div>
-
-		<!-- 属性对话框 -->
-		<base-dialog
-			v-if="sections[1].allowAdd"
-			:dialogTitle="attrTitle"
-			:dialogVisible="attrFormVisible"
-			width="45%"
-			:append-to-body="true"
-			custom-class="baseDialog"
-			@close="closeAttrForm"
-			@cancel="closeAttrForm"
-			@confirm="submitAttrForm">
-			<DialogForm
-				v-if="attrFormVisible"
-				ref="attrForm"
-				:disabled="mode.includes('detail')"
-				v-model="attrForm"
-				:rows="attrRows" />
-		</base-dialog>
-	</el-drawer>
-</template>
-
-<script>
-import BaseInfoForm from '@/components/DialogForm';
-import DialogForm from './dialogForm';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
-
-export default {
-	components: { SmallTitle, DialogForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'dataId'], // dataId 作为一个通用的存放id的字段
-	data() {
-		return {
-			mode: '',
-			visible: false,
-			showForm: false,
-			total: 0,
-			form: {},
-			list: [],
-			attrTitle: '',
-			attrForm: {
-				id: null,
-				equipmentGroupId: '',
-				code: '',
-				type: '',
-				grade: '',
-				alarmCode: '',
-				alarmContent: '',
-				plcParamName: '',
-			},
-			attrFormVisible: false,
-			attrRows: [
-				[
-					{
-						input: true,
-						label: '报警编码', // 自动生成
-						prop: 'code',
-						url: '/base/equipment-group-alarm/getCode',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						select: true,
-						label: '报警类型', // 固定选项
-						prop: 'type',
-						options: [
-							{ label: '布尔型', value: 2 },
-							{ label: '字符型', value: 1 },
-						],
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						select: true,
-						label: '报警级别', // 字典
-						prop: 'grade',
-						options: this.getDictDatas(this.DICT_TYPE.EQU_ALARM_LEVEL),
-					},
-					{
-						input: true,
-						label: '设备报警编码', // 对应到设备实际的报警编码
-						prop: 'alarmCode',
-					},
-				],
-				[
-					{
-						input: true,
-						label: '参数列名', // 在实时数据库的列名
-						prop: 'plcParamName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						input: true,
-						label: '报警内容',
-						prop: 'alarmContent',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-			],
-			attrQuery: {
-				params: {
-					pageNo: 1,
-					pageSize: 10,
-				},
-			}, // 属性列表的请求
-			infoQuery: null, // 基本信息的请求
-			attrFormSubmitting: false,
-			attrListLoading: false,
-		};
-	},
-	computed: {
-		formRows() {
-			return this.sections[0].rows.map((row) => {
-				return row.map((col) => {
-					return {
-						...col,
-						bind: {
-							// 详情 模式下，禁用各种输入
-							// disabled: this.mode == 'detail',
-							disabled: true
-						},
-					};
-				});
-			});
-		},
-		tableBtn() {
-			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
-		},
-	},
-	mounted() {
-		this.mode = this.defaultMode || 'detail';
-		for (const section of this.sections) {
-			// 请求具体信息
-			if ('url' in section) {
-				const query = {
-					url: section.url,
-					method: section.method || 'get',
-					params: section.queryParams || null,
-					data: section.data || null,
-				};
-				// debugger;
-				this.$axios(query).then(({ data }) => {
-					if (section.key == 'base') {
-						this.form = data;
-						this.showForm = true;
-						this.infoQuery = query;
-					} else if (section.key == 'attrs') {
-						this.attrQuery = query;
-						this.list = data.list;
-						this.total = data.total;
-					}
-				});
-			}
-		}
-	},
-	methods: {
-		handleTableBtnClick({ type, data }) {
-			switch (type) {
-				case 'edit':
-					this.handleEditAttr(data.id);
-					break;
-				case 'delete':
-					this.handleDeleteAttr(data.id);
-					break;
-			}
-		},
-
-		handleEmitFun(val) {
-			console.log('handleEmitFun', val);
-		},
-
-		init() {
-			this.visible = true;
-		},
-
-		async getAttrList() {
-			this.attrListLoading = true;
-			const res = await this.$axios(this.attrQuery);
-			if (res.code == 0) {
-				this.list = res.data.list;
-				this.total = res.data.total;
-			}
-			this.attrListLoading = false;
-		},
-
-		// 保存表单
-		handleSave() {
-			this.$refs['form'][0].validate(async (valid) => {
-				if (valid) {
-					const isEdit = this.mode == 'edit';
-					await this.$axios({
-						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
-						method: isEdit ? 'put' : 'post',
-						data: this.form,
-					});
-					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
-					this.visible = false;
-					this.$emit('refreshDataList');
-				}
-			});
-		},
-
-		handleCancel() {
-			this.visible = false;
-		},
-
-		// 开启编辑
-		toggleEdit() {
-			this.mode = 'edit';
-		},
-
-		// 新增属性
-		handleAddAttr() {
-			if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
-			this.attrForm = {
-				id: null,
-				equipmentGroupId: this.dataId,
-				code: '',
-				type: '',
-				grade: '',
-				alarmCode: '',
-				alarmContent: '',
-				plcParamName: '',
-			};
-			this.attrTitle = '添加设备分组报警';
-			this.attrFormVisible = true;
-		},
-
-		// 编辑属性
-		async handleEditAttr(attrId) {
-			const res = await this.$axios({
-				url: this.sections[1].urlDetail,
-				method: 'get',
-				params: { id: attrId },
-			});
-			if (res.code == 0) {
-				this.attrForm = res.data;
-				this.attrTitle = '编辑设备分组报警';
-				this.attrFormVisible = true;
-			}
-		},
-
-		// 删除属性
-		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该分组报警?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			})
-				.then(async () => {
-					const res = await this.$axios({
-						url: this.sections[1].urlDelete,
-						method: 'delete',
-						params: { id: attrId },
-					});
-					if (res.code == 0) {
-						this.$message({
-							message: '删除成功',
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getAttrList();
-							},
-						});
-					}
-				})
-				.catch(() => {});
-		},
-
-		// 提交属性表
-		async submitAttrForm() {
-			this.$refs['attrForm'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-			});
-			const isEdit = this.attrForm.id != null;
-			this.attrFormSubmitting = true;
-			const res = await this.$axios({
-				url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
-				method: isEdit ? 'put' : 'post',
-				data: this.attrForm,
-			});
-
-			if (res.code == 0) {
-				this.closeAttrForm();
-				this.$message({
-					message: `${isEdit ? '更新' : '创建'}成功`,
-					type: 'success',
-					duration: 1500,
-					onClose: () => {
-						this.getAttrList();
-					},
-				});
-			}
-			this.attrFormSubmitting = false;
-		},
-
-		closeAttrForm() {
-			this.attrFormVisible = false;
-		},
-
-		handleClick(raw) {
-			if (raw.type === 'delete') {
-				this.$confirm(`确定删除该报警?`, '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning',
-				})
-					.then(() => {
-						deleteProductAttr(raw.data.id).then(({ data }) => {
-							this.$message({
-								message: '操作成功',
-								type: 'success',
-								duration: 1500,
-								onClose: () => {
-									this.getList();
-								},
-							});
-						});
-					})
-					.catch(() => {});
-			} else {
-				this.addNew(raw.data.id);
-			}
-		},
-	},
-};
-</script>
-
-<style scoped>
-.drawer >>> .el-drawer {
-	border-radius: 8px 0 0 8px;
-}
-
-.drawer >>> .el-drawer__header {
-	margin: 0;
-	padding: 32px 32px 24px;
-	border-bottom: 1px solid #dcdfe6;
-	margin-bottom: 0px;
-}
-
-.small-title::before {
-	content: '';
-	display: inline-block;
-	vertical-align: top;
-	width: 4px;
-	height: 22px;
-	border-radius: 1px;
-	margin-right: 8px;
-	background-color: #0b58ff;
-}
-
-.drawer-body {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-}
-
-.drawer-body__content {
-	flex: 1;
-	/* background: #eee; */
-	padding: 20px 30px;
-	overflow-y: auto;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-</style>
diff --git a/src/views/base/equipmentGroup/components/dialogForm.vue b/src/views/base/equipmentGroup/components/dialogForm.vue
deleted file mode 100644
index 519b435e..00000000
--- a/src/views/base/equipmentGroup/components/dialogForm.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<!-- 
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-09-11 15:55:13
-    description: DialogForm for equipmentBindSection only
--->
-
-<template>
-	<el-form
-		ref="form"
-		:model="dataForm"
-		label-width="100px"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="报警编码"
-					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.code"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入工段排序" />
-				</el-form-item>
-				<!-- 				
-				<el-form-item
-					label="报警编码"
-					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.code"
-						placeholder="请选择产线"
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item> -->
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="报警类型"
-					prop="type"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						:disabled="disabled"
-						v-model="dataForm.type"
-						placeholder="请选择报警类型"
-						@change="handleTypeChange">
-						<el-option
-							v-for="opt in [
-								{ label: '布尔型', value: 2 },
-								{ label: '字符型', value: 1 },
-							]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="报警级别"
-					prop="grade"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						:disabled="disabled"
-						v-model="dataForm.grade"
-						placeholder="请选择报警级别"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					v-if="+dataForm.type == 1"
-					label="设备报警编码"
-					prop="alarmCode">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.alarmCode"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入设备报警编码" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="参数列名"
-					prop="plcParamName"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.plcParamName"
-						placeholder="请输入参数列名"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="报警内容"
-					prop="alarmContent"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.alarmContent"
-						placeholder="请输入报警内容"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-export default {
-	name: 'DialogForm',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: {},
-	props: {
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	data() {
-		return {
-			formLoading: true,
-		};
-	},
-	mounted() {
-		this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
-			this.formLoading = false;
-			this.$emit('update', {
-				...this.dataForm,
-				code,
-			});
-		});
-	},
-	methods: {
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.form.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.form.resetFields(args);
-		},
-		async handleTypeChange(id) {
-			// debugger;
-			this.dataForm.alarmCode = '';
-			this.$emit('update', this.dataForm);
-		},
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-</style>
diff --git a/src/views/base/equipmentGroup/index.vue b/src/views/base/equipmentGroup/index.vue
deleted file mode 100644
index fb06472d..00000000
--- a/src/views/base/equipmentGroup/index.vue
+++ /dev/null
@@ -1,466 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="500px"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows"/>
-		</base-dialog>
-
-		<!-- 抽屉 详情 -->
-		<BasicDrawer
-			v-if="editVisible"
-			ref="drawer"
-			:default-mode="editMode"
-			:data-id="alarmForm.id"
-			:sections="[
-				{
-					name: '基本信息',
-					key: 'base',
-					rows: drawerBaseInfoRows,
-					url: '/base/equipment-group/get',
-					urlUpdate: '/base/equipment-group/update',
-					urlCreate: '/base/equipment-group/create',
-					queryParams: { id: alarmForm.id },
-				},
-				{
-					name: '属性列表',
-					key: 'attrs',
-					props: drawerListProps,
-					url: '/base/equipment-group-alarm/page',
-					urlCreate: '/base/equipment-group-alarm/create',
-					urlUpdate: '/base/equipment-group-alarm/update',
-					urlDelete: '/base/equipment-group-alarm/delete',
-					urlDetail: '/base/equipment-group-alarm/get',
-					queryParams: {
-						equipmentGroupId: alarmForm.id,
-						pageNo: 1,
-						pageSize: 10,
-					},
-					tableBtn: [
-						this.$auth.hasPermi('base:equipment-group:update')
-							? {
-									type: 'edit',
-									btnName: '修改',
-							  }
-							: undefined,
-						this.$auth.hasPermi('base:equipment-group:delete')
-							? {
-									type: 'delete',
-									btnName: '删除',
-							  }
-							: undefined,
-					].filter((v) => v),
-					allowAdd: true,
-				},
-			]"
-			@refreshDataList="getList"
-			@cancel="editVisible = false"
-			@destroy="editVisible = false" />
-	</div>
-</template>
-
-<script>
-import {
-	createEquipmentGroup,
-	updateEquipmentGroup,
-	deleteEquipmentGroup,
-	getEquipmentGroup,
-	getEquipmentGroupPage,
-	exportEquipmentGroupExcel,
-} from '@/api/base/equipmentGroup';
-import moment from 'moment';
-import { publicFormatter } from '@/utils/dict';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-// import { getAccessToken } from '@/utils/auth';
-import BasicDrawer from './components/BasicDrawer.vue';
-
-export default {
-	name: 'EquipmentGroup',
-	mixins: [basicPageMixin],
-	components: { BasicDrawer },
-	data() {
-		return {
-			editVisible: false,
-			editMode: '',
-			searchBarKeys: ['name', 'code'],
-			tableBtn: [
-				this.$auth.hasPermi('base:equipment-group:update')
-					? {
-							type: 'detail',
-							btnName: '查看报警',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-group:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-group:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ prop: 'name', label: '设备分组名称' },
-				{ prop: 'code', label: '设备分组编码' },
-				{ prop: 'remark', label: '备注' },
-				// {
-				// 	_action: 'equipment-group-show-alert',
-				// 	label: '报警',
-				// 	subcomponent: {
-				// 		props: ['injectData'],
-				// 		render: function (h) {
-				// 			const _this = this;
-				// 			return h(
-				// 				'el-button',
-				// 				{
-				// 					props: { type: 'text' },
-				// 					on: {
-				// 						click: function () {
-				// 							console.log('inejctdata', _this.injectData);
-				// 							_this.$emit('emitData', {
-				// 								action: _this.injectData._action,
-				// 								// value: _this.injectData.id,
-				// 								value: _this.injectData,
-				// 							});
-				// 						},
-				// 					},
-				// 				},
-				// 				'查看报警'
-				// 			);
-				// 		},
-				// 	},
-				// },
-			],
-			drawerBaseInfoRows: [
-				[
-					{
-						input: true,
-						label: '设备分组名称',
-						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
-						// }
-					},
-					{
-						input: true,
-						label: '设备分组编码',
-						prop: 'code',
-						// url: '/base/equipment/getCode',
-					}
-				]
-			],
-			drawerListProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ width: 240, prop: 'code', label: '报警编码' },
-				{
-					width: 100,
-					prop: 'type',
-					label: '报警类型',
-					filter: (val) =>
-						val != null ? ['-', '字符型', '布尔型', '-'][val] : '-',
-				},
-				{
-					width: 90,
-					prop: 'grade',
-					label: '报警级别',
-					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
-				},
-				{ width: 180, prop: 'alarmCode', label: '设备报警编码' },
-				{ width: 128, prop: 'plcParamName', label: '参数列名' },
-				{ width: 128, prop: 'alarmContent', label: '报警内容' },
-			],
-			alarmForm: {
-				id: undefined,
-				equipmentGroupCode: undefined,
-				equipmentGroupName: undefined,
-			},
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '分组名称',
-					placeholder: '请输入设备分组名称',
-					param: 'name',
-				},
-				{
-					type: 'input',
-					label: '分组编码',
-					placeholder: '请输入设备分组编码',
-					param: 'code',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment-group:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '分组名称',
-						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: true, // some condition, like detail mode...
-						// }
-					},
-				],
-				[
-					{
-						input: true,
-						label: '分组编码',
-						prop: 'code',
-						url: '/base/equipment-group/getCode',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '备注',
-						prop: 'remark',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							placeholder: '请输入备注',
-						},
-					},
-				],
-			],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				code: null,
-				name: null,
-			},
-			// 表单参数
-			form: {},
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** 覆盖 handleEmitFun 的默认实现 */
-		handleEmitFun({ action, value }) {
-			const {
-				id: equipmentGroupId,
-				name: equipmentGroupName,
-				code: equipmentGroupCode,
-			} = value;
-			switch (action) {
-				case 'equipment-group-show-alert':
-					// this.$router.push({ path: '/equipment/base/equipment-group-alarm' });
-					this.$router.push({
-						name: 'EquipmentGroupAlarm',
-						params: {
-							equipmentGroupId,
-							equipmentGroupCode,
-							equipmentGroupName,
-						},
-					});
-					break;
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentGroupPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				code: undefined,
-				name: undefined,
-				remark: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备分组（用于同类型不同厂家的设备区分）';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentGroup(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备分组（用于同类型不同厂家的设备区分）';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentGroup(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentGroup(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		// 查看报警
-		handleDetail(row) {
-			// debugger;
-			const { id, code, name, createTime } = row;
-			// 打开抽屉
-			this.editMode = 'detail';
-			this.alarmForm.id = id;
-			this.alarmForm.equipmentGroupCode = code;
-			this.alarmForm.equipmentGroupName = name;
-			this.editVisible = true;
-			this.$nextTick(() => {
-				this.$refs['drawer'].init();
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除设备分组 "' + row.name + '"?')
-				.then(function () {
-					return deleteEquipmentGroup(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm(
-					'是否确认导出所有设备分组（用于同类型不同厂家的设备区分）数据项?'
-				)
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentGroupExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(
-						response,
-						'设备分组（用于同类型不同厂家的设备区分）.xls'
-					);
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/base/equipmentGroupAlarm/dialogForm.vue b/src/views/base/equipmentGroupAlarm/dialogForm.vue
deleted file mode 100644
index 329186da..00000000
--- a/src/views/base/equipmentGroupAlarm/dialogForm.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<!-- 
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-09-11 15:55:13
-    description: DialogForm for equipmentBindSection only
--->
-
-<template>
-	<el-form
-		ref="form"
-		:model="dataForm"
-		label-width="100px"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="报警编码"
-					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.code"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入工段排序" />
-				</el-form-item>
-				<!-- 				
-						<el-form-item
-						label="报警编码"
-						prop="code"
-						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-						<el-select
-						v-model="dataForm.code"
-						placeholder="请选择产线"
-						@change="handleProductlineChange">
-						<el-option
-						v-for="opt in productionLineList"
-						:key="opt.value"
-						:label="opt.label"
-						:value="opt.value" />
-					</el-select>
-				</el-form-item> -->
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="报警类型"
-					prop="type"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.type"
-						:disabled="disabled"
-						placeholder="请选择报警类型"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in [
-								{ label: '布尔型', value: 2 },
-								{ label: '字符型', value: 1 },
-							]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="报警级别"
-					prop="grade"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						:disabled="disabled"
-						v-model="dataForm.grade"
-						placeholder="请选择报警级别"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					v-if="+dataForm.type == 1"
-					label="设备报警编码"
-					prop="alarmCode">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.alarmCode"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入设备报警编码" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="参数列名"
-					prop="plcParamName"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.plcParamName"
-						placeholder="请输入参数列名"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="报警内容"
-					prop="alarmContent"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.alarmContent"
-						placeholder="请输入报警内容"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-export default {
-	name: 'DialogForm',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: {},
-	props: {
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	data() {
-		return {
-			formLoading: true,
-		};
-	},
-	mounted() {
-		this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
-			this.formLoading = false;
-			this.$emit('update', {
-				...this.dataForm,
-				code,
-			});
-		});
-	},
-	methods: {
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.form.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.form.resetFields(args);
-		},
-		async handleProductlineChange(id) {
-			await this.getWorksectionList(id);
-			this.dataForm.workshopSectionId = null;
-			this.$emit('update', this.dataForm);
-		},
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-</style>
diff --git a/src/views/base/equipmentGroupAlarm/index.vue b/src/views/base/equipmentGroupAlarm/index.vue
deleted file mode 100644
index 2ebd7853..00000000
--- a/src/views/base/equipmentGroupAlarm/index.vue
+++ /dev/null
@@ -1,361 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="736px"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	createEquipmentGroupAlarm,
-	updateEquipmentGroupAlarm,
-	deleteEquipmentGroupAlarm,
-	getEquipmentGroupAlarm,
-	getEquipmentGroupAlarmPage,
-	exportEquipmentGroupAlarmExcel,
-} from '@/api/base/equipmentGroupAlarm';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import moment from 'moment';
-import { publicFormatter } from '@/utils/dict';
-import DialogForm from './dialogForm.vue';
-
-export default {
-	name: 'EquipmentGroupAlarm',
-	components: { DialogForm },
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			searchBarKeys: [''],
-			tableBtn: [
-				this.$auth.hasPermi('base:equipment-group-alarm:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-group-alarm:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{  width: 240, prop: 'code', label: '报警编码' },
-				{
-					prop: 'type',
-					label: '报警类型',
-					filter: (val) =>
-						val != null ? ['-', '字符型', '布尔型', '-'][val] : '-',
-				},
-				{
-					prop: 'grade',
-					label: '报警级别',
-					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
-				},
-				{ prop: 'alarmCode', label: '设备报警编码' },
-				{ prop: 'plcParamName', label: '参数列名' },
-				{ prop: 'alarmContent', label: '报警内容' },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '设备分组编码',
-					width: '220',
-					placeholder: '/',
-					param: 'equipmentGroupCode',
-					defaultSelect: null,
-					disabled: true,
-				},
-				{
-					type: 'input',
-					label: '设备分组名称',
-					placeholder: '/',
-					param: 'equipmentGroupName',
-					defaultSelect: null,
-					disabled: true,
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment-group-alarm:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '报警编码', // 自动生成
-						prop: 'code',
-						url: '/base/equipment-group-alarm/getCode',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						select: true,
-						label: '报警类型', // 固定选项
-						prop: 'type',
-						options: [
-							{ label: '布尔型', value: 2 },
-							{ label: '字符型', value: 1 },
-						],
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						select: true,
-						label: '报警级别', // 字典
-						prop: 'grade',
-						options: this.getDictDatas(this.DICT_TYPE.EQU_ALARM_LEVEL),
-					},
-					{
-						input: true,
-						label: '设备报警编码', // 对应到设备实际的报警编码
-						prop: 'alarmCode',
-					},
-				],
-				[
-					{
-						input: true,
-						label: '参数列名', // 在实时数据库的列名
-						prop: 'plcParamName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						input: true,
-						label: '报警内容',
-						prop: 'alarmContent',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-			],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				equipmentGroupId: null,
-			},
-			// 表单参数
-			form: {
-				id: null,
-				equipmentGroupId: null,
-				code: null,
-				type: null,
-				grade: null,
-				alarmCode: null,
-				alarmContent: null,
-				plcParamName: null,
-			},
-			// // 表单校验
-			// rules: {
-			//   equipmentGroupId: [{ required: true, message: "设备分组ID，关联base_equipment_group不能为空", trigger: "blur" }],
-			//   type: [{ required: true, message: "报警类型:1.字符型，2.布尔型不能为空", trigger: "change" }],
-			//   alarmContent: [{ required: true, message: "报警内容 该条报警具体的解释不能为空", trigger: "blur" }],
-			//   plcParamName: [{ required: true, message: "关联编码，对应到plc_param_name的编码，用于链接数采不能为空", trigger: "blur" }],
-			// }
-		};
-	},
-	// watch: {
-	//   $route(value) {
-	//     console.log('new route info', value)
-	//   }
-	// },
-	// created() {
-	// 	this.getList();
-	// },
-	activated() {
-		// 设置顶部搜索栏信息
-		const { equipmentGroupName, equipmentGroupCode, equipmentGroupId } =
-			this.$route.params;
-		this.setSearchBarFormValue('equipmentGroupName', equipmentGroupName);
-		this.setSearchBarFormValue('equipmentGroupCode', equipmentGroupCode);
-		this.queryParams.equipmentGroupId = equipmentGroupId;
-		// if (!equipmentGroupId) this.getList(); // 拦截
-		this.getList();
-	},
-	deactivated() {
-		this.setSearchBarFormValue('equipmentGroupName', null);
-		this.setSearchBarFormValue('equipmentGroupCode', null);
-		this.queryParams.equipmentGroupId = null;
-	},
-	methods: {
-		/** 设置 searchBarForm 的默认值 - 用得比较少 */
-		setSearchBarFormValue(param, value) {
-			this.searchBarFormConfig.forEach((config) => {
-				if (config.param == param) {
-					config.defaultSelect = value;
-				}
-			});
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentGroupAlarmPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: null,
-				equipmentGroupId: null,
-				code: null,
-				type: null,
-				grade: null,
-				alarmCode: null,
-				alarmContent: null,
-				plcParamName: null,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			if (this.queryParams.equipmentGroupId == null)
-				return this.$message.warning('没有检测到设备分组信息');
-			this.reset();
-			this.open = true;
-			this.title = '添加设备分组报警明细';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentGroupAlarm(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备分组报警明细';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentGroupAlarm({
-						...this.form,
-						equipmentGroupId: this.queryParams.equipmentGroupId,
-					}).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentGroupAlarm({
-					...this.form,
-					equipmentGroupId: this.queryParams.equipmentGroupId,
-				}).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除该报警?')
-				.then(function () {
-					return deleteEquipmentGroupAlarm(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备分组报警明细数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentGroupAlarmExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备分组报警明细.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/base/equipmentPlc/add-or-updata.vue b/src/views/base/equipmentPlc/add-or-updata.vue
deleted file mode 100644
index e35a4937..00000000
--- a/src/views/base/equipmentPlc/add-or-updata.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-26 16:37:29
- * @Description:
--->
-<template>
-	<el-row :gutter="20">
-		<el-form
-			:model="dataForm"
-			:rules="dataRule"
-			ref="dataForm"
-			@keyup.enter.native="dataFormSubmit()"
-			label-width="80px">
-			<el-col :span="12">
-				<el-form-item label="关联表名" prop="plcTableName">
-					<el-input
-						v-model="dataForm.plcTableName"
-						clearable
-						placeholder="请输入关联表名" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="编码" prop="code">
-					<el-input
-						v-model="dataForm.code"
-						clearable
-						placeholder="请输入编码" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="标识" prop="name">
-					<el-input
-						v-model="dataForm.name"
-						clearable
-						placeholder="请输入标识" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="英文名" prop="enName">
-					<el-input
-						v-model="dataForm.enName"
-						clearable
-						placeholder="请输入英文名" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="是否采集" prop="collection">
-					<el-switch
-						v-model="dataForm.collection"
-						:active-value="1"
-						:inactive-value="0"></el-switch>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="描述" prop="description">
-					<el-input
-						v-model="dataForm.description"
-						clearable
-						placeholder="请输入描述" />
-				</el-form-item>
-			</el-col>
-		</el-form>
-	</el-row>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-
-import {
-	createEquipmentPlc,
-	updateEquipmentPlc,
-	getEquipmentPlc,
-	getCode,
-} from '@/api/base/equipmentPlc';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				isGetCode: true,
-				codeURL: getCode,
-				createURL: createEquipmentPlc,
-				updateURL: updateEquipmentPlc,
-				infoURL: getEquipmentPlc,
-			},
-			dataForm: {
-				id: undefined,
-				plcTableName: undefined,
-				code: undefined,
-				name: undefined,
-				enName: undefined,
-				collection: 1,
-				description: undefined,
-			},
-			dataRule: {
-				plcTableName: [
-					{ required: true, message: '关联表名不能为空', trigger: 'blur' },
-				],
-				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
-				name: [{ required: true, message: '标识不能为空', trigger: 'blur' }],
-			},
-		};
-	},
-	methods: {},
-};
-</script>
diff --git a/src/views/base/equipmentPlc/index.vue b/src/views/base/equipmentPlc/index.vue
deleted file mode 100644
index 939d9c05..00000000
--- a/src/views/base/equipmentPlc/index.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { parseTime } from '@/filter/code-filter';
-import {
-	deleteEquipmentPlc,
-	getEquipmentPlcPage,
-	exportEquipmentPlcExcel,
-	updateEquipmentPlc,
-} from '@/api/base/equipmentPlc';
-
-const switchBtn = {
-	name: 'SwitchBtn',
-	props: ['injectData'],
-	data() {
-		return {};
-	},
-	computed: {
-		active() {
-			return +this.injectData[this.injectData.prop] == 1 ? true : false;
-		},
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'el-switch',
-			{
-				props: {
-					value: this.active,
-				},
-				on: {
-					change: (newVal) => {
-						this.$emit('emitData', {
-							action: 'update-collect',
-							payload: {
-								...this.injectData,
-								collection: newVal ? 1 : 0,
-							},
-						});
-					},
-				},
-			},
-			null
-		);
-	},
-};
-const tableProps = [
-	{ prop: 'code', label: '编码', width: 220 },
-	{ prop: 'plcTableName', label: '关联表名' },
-	{ prop: 'name', label: '标识名称' },
-	{ prop: 'enName', label: '英文名称' },
-	{
-		prop: 'collection',
-		label: '是否采集',
-		subcomponent: switchBtn,
-	},
-	{ prop: 'description', label: '描述' },
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getEquipmentPlcPage,
-				deleteURL: deleteEquipmentPlc,
-				exportURL: exportEquipmentPlcExcel,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi(`base:equipment-plc:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`base:equipment-plc:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
-					label: '表名',
-					placeholder: '请输入表名',
-					param: 'plcTableName',
-				},
-				{
-					type: 'input',
-					label: '标识',
-					placeholder: '请输入标识',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:factory:create') ? 'button' : '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {},
-	methods: {
-		/** 覆盖 handleEmitFun 的默认实现 */
-		handleEmitFun({ action, payload }) {
-      console.log(payload)
-			switch (action) {
-				case 'update-collect':
-					updateEquipmentPlc(payload).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.getDataList();
-					});
-					break;
-			}
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name;
-					this.listQuery.plcTableName = val.plcTableName;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/base/equipmentPlcConnect/TableConfig.vue b/src/views/base/equipmentPlcConnect/TableConfig.vue
deleted file mode 100644
index 012647a1..00000000
--- a/src/views/base/equipmentPlcConnect/TableConfig.vue
+++ /dev/null
@@ -1,388 +0,0 @@
-<!-- 
-    filename: TableConfig.vue
-    author: liubin
-    date: 2023-10-30 10:09:03
-    description: 
--->
-
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			ref="pageTable"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="700px"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	createEquipmentPlc,
-	updateEquipmentPlc,
-	deleteEquipmentPlc,
-	getEquipmentPlc,
-	getEquipmentPlcPage,
-	exportEquipmentPlcExcel,
-} from '@/api/base/equipmentPlc';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-
-const switchBtn = {
-	name: 'SwitchBtn',
-	props: ['injectData'],
-	data() {
-		return {};
-	},
-	computed: {
-		active() {
-			return +this.injectData[this.injectData.prop] == 1 ? true : false;
-		},
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'el-switch',
-			{
-				props: {
-					value: this.active,
-				},
-				on: {
-					change: (newVal) => {
-						this.$emit('emitData', {
-							action: 'update-collect',
-							payload: {
-								...this.injectData,
-								collection: newVal ? 1 : 0,
-							},
-						});
-					},
-				},
-			},
-			null
-		);
-	},
-};
-
-export default {
-	name: 'EquipmentPlc',
-	mixins: [basicPageMixin, tableHeightMixin],
-	components: {},
-	data() {
-		return {
-			tableKey: Math.random(),
-			searchBarKeys: ['name', 'plcTableName'],
-			tableBtn: [
-				this.$auth.hasPermiAnd([
-					'base:equipment-plc:update',
-					'base:equipment-plc:query'
-					])
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-plc:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				// {
-				// 	prop: 'createTime',
-				// 	label: '添加时间',
-				// 	fixed: true,
-				// 	width: 180,
-				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				// },
-				{ prop: 'code', label: '编码', width: 180, showOverflowtooltip: true },
-				{ prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
-				{ prop: 'name', label: '标识名称', width: 150, showOverflowtooltip: true },
-				{ prop: 'enName', label: '英文名称', width: 150, showOverflowtooltip: true },
-				{
-					prop: 'collection',
-					label: '是否采集',
-					subcomponent: switchBtn,
-				},
-				{ prop: 'description', label: '描述', minWidth: 150, showOverflowtooltip: true },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '表名',
-					placeholder: '请输入表名',
-					param: 'plcTableName',
-				},
-				{
-					type: 'input',
-					label: '标识',
-					placeholder: '请输入标识',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment-plc:create')
-						?  'separate' : '',
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment-plc:create')
-						? 'button' : '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-				// {
-				// 	type: this.$auth.hasPermi('equipment:realtime-table-config:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '关联表名',
-						prop: 'plcTableName',
-						rules: [{ required: true, message: '关联表名不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: true, // some condition, like detail mode...
-						// }
-					},
-					{
-						input: true,
-						label: '编码',
-						prop: 'code',
-						url: '/base/energy-plc/getCode',
-						rules: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '标识',
-						prop: 'name',
-						rules: [{ required: true, message: '标识不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: true, // some condition, like detail mode...
-						// }
-					},
-					{
-						input: true,
-						label: '英文名',
-						prop: 'enName',
-					},
-				],
-				[
-					{
-						switch: true,
-						label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
-						prop: 'collection',
-						bind: {
-              'active-value': 1,
-							'inactive-value': 0,
-              value: 1,
-						},
-					},
-				],
-				[
-					{
-						textarea: true,
-						label: '描述',
-						prop: 'description',
-						bind: {
-							placeholder: '请输入备注',
-						},
-					},
-				],
-			],
-			// 是否显示弹出
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				plcTableName: null,
-				name: null,
-			},
-			// 表单参数
-			form: {},
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** 覆盖 handleEmitFun 的默认实现 */
-		handleEmitFun({ action, payload }) {
-			switch (action) {
-				case 'update-collect':
-					this.reset();
-					const tempForm = {};
-					Object.keys(this.form).forEach((key) => {
-						tempForm[key] = payload[key];
-					});
-					updateEquipmentPlc(tempForm).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					break;
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentPlcPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-				// this.tableKey = Math.random(); // method 1
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				plcTableName: undefined,
-				code: undefined,
-				name: undefined,
-				enName: undefined,
-				description: undefined,
-				collection: 1,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加实时数据采集配置';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentPlc(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改实时数据采集配置';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentPlc(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentPlc(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除该配置?')
-				.then(function () {
-					return deleteEquipmentPlc(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有实时数据采集配置数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentPlcExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '实时数据采集配置.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/base/equipmentPlcConnect/add-or-updata.vue b/src/views/base/equipmentPlcConnect/add-or-updata.vue
deleted file mode 100644
index e257954b..00000000
--- a/src/views/base/equipmentPlcConnect/add-or-updata.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-25 16:11:14
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px">
-		<el-form-item label="设备" prop="equipmentId">
-			<el-cascader
-				placeholder="请选择设备"
-				v-model="dataForm.equipmentId"
-				:options="plLineList"
-				:props="{value: 'id', label: 'name', children: 'children'}"
-				style="width: 100%"
-				filterable />
-		</el-form-item>
-		<el-form-item label="关联表名" prop="plcId">
-			<el-select
-				v-model="dataForm.plcId"
-				filterable
-				placeholder="请选择关联表"
-				style="width: 100%">
-				<el-option
-					v-for="dict in plcList"
-					:key="dict.id"
-					:label="dict.plcTableName"
-					:value="dict.id" />
-			</el-select>
-		</el-form-item>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from './components/basic-add';
-import { createEquipmentPlcConnect, updateEquipmentPlcConnect } from '@/api/base/equipmentPlcConnect';
-import { getplcAllList, getTree } from "@/api/base/equipmentConfig";
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				createURL: createEquipmentPlcConnect,
-				updateURL: updateEquipmentPlcConnect,
-			},
-			dataForm: {
-        id: undefined,
-        equipmentId: undefined,
-        plcId: undefined
-			},
-			plcList: [],
-			plLineList: [],
-			dataRule: {
-        equipmentId: [{ required: true, message: "设备不能为空", trigger: "blur" }],
-				plcId: [{ required: true, message: "关联表名不能为空", trigger: "blur" }]
-      },
-			options: [{
-          value: 'zhinan',
-          label: '指南',
-          children: [{
-            value: 'shejiyuanze',
-            label: '设计原则',
-            children: [{
-              value: 'yizhi',
-              label: '一致'
-            }, {
-              value: 'fankui',
-              label: '反馈'
-            }, {
-              value: 'xiaolv',
-              label: '效率'
-            }, {
-              value: 'kekong',
-              label: '可控'
-            }]
-          }, {
-            value: 'daohang',
-            label: '导航'
-          }]
-        }]
-		};
-	},
-	created() {
-		this.getDict()
-	},
-	methods: {
-		init() {
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields()
-			})
-		},
-		async getDict() {
-			// 关联表名列表
-			const res = await getplcAllList();
-			this.plcList = res.data;
-			// 树形结构
-			const res1 = await getTree();
-			this.plLineList = res1.data;
-			// const res1 = await getCorePLList();
-			// this.plLineList = res1.data;
-			// this.plLineList.forEach(item => {
-			// 	listByParentId({ id: item.id }).then(resp => {
-			// 		if (resp.data.length > 0) {
-			// 			// item.children = resp.data
-			// 			this.$set(item, 'children', resp.data)
-			// 			// this.$forceUpdate()
-			// 		}
-			// 	})
-			// })
-		},
-		// 表单提交
-    dataFormSubmit() {
-      this.$refs["dataForm"].validate((valid) => {
-        if (!valid) {
-          return false;
-        }
-        // 修改的提交
-        if (this.dataForm.id) {
-          updateEquipmentPlcConnect({
-						id: this.dataForm.id,
-						equipmentId: this.dataForm.equipmentId[this.dataForm.equipmentId.length],
-						plcId: this.dataForm.plcId
-					}).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.visible = false;
-            this.$emit("refreshDataList");
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentPlcConnect({
-						id: this.dataForm.id,
-						equipmentId: this.dataForm.equipmentId[this.dataForm.equipmentId.length - 1],
-						plcId: this.dataForm.plcId
-					}).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.visible = false;
-          this.$emit("refreshDataList");
-        });
-      });
-    }
-	}
-};
-</script>
diff --git a/src/views/base/equipmentPlcConnect/components-old/BasicDrawer.vue b/src/views/base/equipmentPlcConnect/components-old/BasicDrawer.vue
deleted file mode 100644
index af9968b3..00000000
--- a/src/views/base/equipmentPlcConnect/components-old/BasicDrawer.vue
+++ /dev/null
@@ -1,574 +0,0 @@
-<!--
-    filename: EquipmentDrawer.vue
-    author: liubin
-    date: 2023-08-22 14:38:56
-    description:
--->
-
-<template>
-	<el-drawer
-		:visible="visible"
-		:show-close="false"
-		:wrapper-closable="false"
-		class="drawer"
-		custom-class="mes-drawer"
-		size="60%"
-		@closed="$emit('destroy')">
-		<SmallTitle slot="title">
-			{{
-				mode.includes('detail')
-					? '详情'
-					: mode.includes('edit')
-					? '编辑'
-					: '新增'
-			}}
-		</SmallTitle>
-
-		<div class="drawer-body flex">
-			<div class="drawer-body__content">
-				<section v-for="(section, index) in sections" :key="section.key">
-					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
-
-					<div class="form-part" v-if="section.key == 'base'">
-						<el-skeleton v-if="!showForm" animated />
-						<BaseInfoForm
-							key="drawer-dialog-form"
-							v-if="showForm"
-							ref="form"
-							:disabled="mode.includes('detail')"
-							v-model="form"
-							:rows="formRows" />
-					</div>
-
-					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
-						<base-table
-							v-loading="attrListLoading"
-							:table-props="section.props"
-							:page="attrQuery?.params.pageNo || 1"
-							:limit="attrQuery?.params.pageSize || 10"
-							:table-data="list"
-							:add-button-show="mode.includes('detail') ? null : '添加属性'"
-							@emitButtonClick="handleAddAttr"
-							@emitFun="handleEmitFun">
-							<method-btn
-								v-if="section.tableBtn"
-								slot="handleBtn"
-								label="操作"
-								:method-list="tableBtn"
-								@clickBtn="handleTableBtnClick" />
-						</base-table>
-
-						<!-- 分页组件 -->
-						<pagination
-							v-show="total > 0"
-							:total="total"
-							:page.sync="attrQuery.params.pageNo"
-							:limit.sync="attrQuery.params.pageSize"
-							@pagination="getAttrList" />
-					</div>
-				</section>
-			</div>
-
-			<div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
-					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="handleCancel">确定</el-button>
-				<!-- sections的第二项必须是 属性列表  -->
-				<!-- <el-button
-						v-if="sections[1].allowAdd"
-						type="primary"
-						@click="handleAddAttr">
-						添加属性
-					</el-button> -->
-			</div>
-		</div>
-
-		<!-- 属性对话框 -->
-		<base-dialog
-			v-if="sections[1].allowAdd"
-			:dialogTitle="attrTitle"
-			:dialogVisible="attrFormVisible"
-			width="45%"
-			:append-to-body="true"
-			custom-class="baseDialog"
-			@close="closeAttrForm"
-			@cancel="closeAttrForm"
-			@confirm="submitAttrForm">
-			<DialogForm
-				v-if="attrFormVisible"
-				ref="attrForm"
-				:disabled="mode.includes('detail')"
-				v-model="attrForm"
-				:rows="attrRows" />
-		</base-dialog>
-	</el-drawer>
-</template>
-
-<script>
-import BaseInfoForm from '@/components/DialogForm';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
-
-export default {
-	components: { SmallTitle, DialogForm: BaseInfoForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'infoData'],
-	data() {
-		return {
-			mode: '',
-			visible: false,
-			showForm: false,
-			total: 0,
-			form: {},
-			list: [],
-			attrTitle: '',
-			attrForm: {
-				id: null,
-				name: '',
-				plcParamName: '',
-				unit: '',
-				collection: 1,
-				minValue: '',
-				maxValue: '',
-				defaultValue: '',
-				description: '',
-				remark: '',
-				alarmContent: '',
-				equipmentParamType: '',
-				productionParamType: '',
-			},
-			attrFormVisible: false,
-			attrRows: [
-				[
-					{
-						input: true,
-						label: '参数列名',
-						prop: 'plcParamName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						input: true,
-						label: '参数名称',
-						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						select: true,
-						label: '单位',
-						prop: 'unit',
-						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						switch: true,
-						label: '是否采集',
-						prop: 'collection',
-						bind: {
-							'active-value': 1,
-							'inactive-value': 0,
-						},
-					},
-				],
-				[
-					{
-						select: true,
-						label: '设备参数类型',
-						prop: 'equipmentParamType',
-						options: [
-							{ label: '一般参数', value: 1 },
-							{ label: '工艺参数', value: 2 },
-							{ label: '报警参数', value: 3 },
-						],
-						rules: [
-							{
-								required: true,
-								message: '设备参数类型不能为空',
-								trigger: 'blur',
-							},
-						],
-					},
-					{
-						select: true,
-						label: '生产参数类型',
-						prop: 'productionParamType',
-						options: [
-							// { label: '进片数量', value: 1 },
-							// { label: '出片数量', value: 2 },
-							// { label: '破损数量', value: 3 },
-							// { label: '无类型', value: 4 },
-							{ label: '进口计数', value: 1 },
-							{ label: '出口计数', value: 2 },
-							{ label: '损耗计数', value: 3 },
-							{ label: '无类型', value: 4 },
-						],
-						rules: [
-							{
-								required: true,
-								message: '生产参数类型不能为空',
-								trigger: 'blur',
-							},
-						],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '最小值',
-						prop: 'minValue',
-						rules: [
-							{
-								type: 'number',
-								message: '请输入正确的数字',
-								trigger: 'change',
-								transform: (val) => Number(val),
-							},
-						],
-					},
-					{
-						input: true,
-						label: '最大值',
-						prop: 'maxValue',
-						rules: [
-							{
-								required: false,
-							},
-							{
-								type: 'number',
-								message: '请输入正确的数字',
-								trigger: 'change',
-								transform: (val) => Number(val),
-							},
-						],
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '标准值',
-						prop: 'defaultValue',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						input: true,
-						label: '描述',
-						prop: 'description',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '备注',
-						prop: 'remark',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-			],
-			attrQuery: {
-				params: {
-					pageNo: 1,
-					pageSize: 10,
-				},
-			}, // 属性列表的请求
-			infoQuery: null, // 基本信息的请求
-			attrFormSubmitting: false,
-			attrListLoading: false,
-		};
-	},
-	computed: {
-		formRows() {
-			return this.sections[0].rows.map((row) => {
-				return row.map((col) => {
-					return {
-						...col,
-						bind: {
-							// 详情 模式下，禁用各种输入
-							// disabled: this.mode == 'detail',
-							disabled: true,
-						},
-					};
-				});
-			});
-		},
-		tableBtn() {
-			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
-		},
-	},
-	mounted() {
-		this.mode = this.defaultMode || 'detail';
-		for (const section of this.sections) {
-			// 请求具体信息
-			if ('url' in section) {
-				const query = {
-					url: section.url,
-					method: section.method || 'get',
-					params: section.queryParams || null,
-					data: section.data || null,
-				};
-				// debugger;
-				this.$axios(query).then(({ data }) => {
-					if (section.key == 'base') {
-						this.form = data;
-						this.showForm = true;
-						this.infoQuery = query;
-					} else if (section.key == 'attrs') {
-						this.attrQuery = query;
-						this.list = data.list;
-						this.total = data.total;
-					}
-				});
-			} else if (section.key == 'base') {
-				this.form = this.infoData;
-				this.showForm = true;
-			}
-		}
-	},
-	methods: {
-		handleTableBtnClick({ type, data }) {
-			switch (type) {
-				case 'edit':
-					this.handleEditAttr(data.id);
-					break;
-				case 'delete':
-					this.handleDeleteAttr(data.id);
-					break;
-			}
-		},
-
-		handleEmitFun(val) {
-			console.log('handleEmitFun', val);
-		},
-
-		init() {
-			this.visible = true;
-		},
-
-		async getAttrList() {
-			this.attrListLoading = true;
-			const res = await this.$axios(this.attrQuery);
-			if (res.code == 0) {
-				this.list = res.data.list;
-				this.total = res.data.total;
-			}
-			this.attrListLoading = false;
-		},
-
-		// 保存表单
-		handleSave() {
-			this.$refs['form'][0].validate(async (valid) => {
-				if (valid) {
-					const isEdit = this.mode == 'edit';
-					await this.$axios({
-						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
-						method: isEdit ? 'put' : 'post',
-						data: this.form,
-					});
-					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
-					this.visible = false;
-					this.$emit('refreshDataList');
-				}
-			});
-		},
-
-		handleCancel() {
-			this.visible = false;
-		},
-
-		// 开启编辑
-		toggleEdit() {
-			this.mode = 'edit';
-		},
-
-		// 新增属性
-		handleAddAttr() {
-			this.attrForm = {
-				id: null,
-				name: '',
-				plcParamName: '',
-				unit: '',
-				collection: 1,
-				minValue: '',
-				maxValue: '',
-				defaultValue: '',
-				description: '',
-				remark: '',
-				alarmContent: '',
-			};
-			this.attrTitle = '添加设备绑定信息';
-			this.attrFormVisible = true;
-		},
-
-		// 编辑属性
-		async handleEditAttr(attrId) {
-			const res = await this.$axios({
-				url: this.sections[1].urlDetail,
-				method: 'get',
-				params: { id: attrId },
-			});
-			if (res.code == 0) {
-				this.attrForm = res.data;
-				this.attrTitle = '编辑设备绑定信息';
-				this.attrFormVisible = true;
-			}
-		},
-
-		// 删除属性
-		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该分组报警?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			})
-				.then(async () => {
-					const res = await this.$axios({
-						url: this.sections[1].urlDelete,
-						method: 'delete',
-						params: { id: attrId },
-					});
-					if (res.code == 0) {
-						this.$message({
-							message: '删除成功',
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getAttrList();
-							},
-						});
-					}
-				})
-				.catch(() => {});
-		},
-
-		// 提交属性表
-		async submitAttrForm() {
-			this.$refs['attrForm'].validate((valid) => {
-				if (!valid) {
-          return false;
-				}
-			});
-			const isEdit = this.attrForm.id != null;
-			this.attrFormSubmitting = true;
-			const res = await this.$axios({
-				url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
-				method: isEdit ? 'put' : 'post',
-				data: {
-					...this.attrForm,
-					connectId: this.infoData.id
-				},
-			});
-
-			if (res.code == 0) {
-				this.closeAttrForm();
-				this.$message({
-					message: `${isEdit ? '更新' : '创建'}成功`,
-					type: 'success',
-					duration: 1500,
-					onClose: () => {
-						this.getAttrList();
-					},
-				});
-			}
-			this.attrFormSubmitting = false;
-		},
-
-		closeAttrForm() {
-			this.attrFormVisible = false;
-		},
-
-		handleClick(raw) {
-			if (raw.type === 'delete') {
-				this.$confirm(`确定删除该报警?`, '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning',
-				})
-					.then(() => {
-						deleteProductAttr(raw.data.id).then(({ data }) => {
-							this.$message({
-								message: '操作成功',
-								type: 'success',
-								duration: 1500,
-								onClose: () => {
-									this.getList();
-								},
-							});
-						});
-					})
-					.catch(() => {});
-			} else {
-				this.addNew(raw.data.id);
-			}
-		},
-	},
-};
-</script>
-
-<style scoped>
-.drawer >>> .el-drawer {
-	border-radius: 8px 0 0 8px;
-}
-
-.drawer >>> .el-drawer__header {
-	margin: 0;
-	padding: 32px 32px 24px;
-	border-bottom: 1px solid #dcdfe6;
-	margin-bottom: 0px;
-}
-
-.small-title::before {
-	content: '';
-	display: inline-block;
-	vertical-align: top;
-	width: 4px;
-	height: 22px;
-	border-radius: 1px;
-	margin-right: 8px;
-	background-color: #0b58ff;
-}
-
-.drawer-body {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-}
-
-.drawer-body__content {
-	flex: 1;
-	/* background: #eee; */
-	padding: 20px 30px;
-	overflow-y: auto;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-</style>
diff --git a/src/views/base/equipmentPlcConnect/components/BasicDrawer.vue b/src/views/base/equipmentPlcConnect/components/BasicDrawer.vue
deleted file mode 100644
index 96c80f6f..00000000
--- a/src/views/base/equipmentPlcConnect/components/BasicDrawer.vue
+++ /dev/null
@@ -1,668 +0,0 @@
-<!--
-    filename: EquipmentDrawer.vue
-    author: liubin
-    date: 2023-08-22 14:38:56
-    description:
--->
-
-<template>
-	<el-drawer
-		:visible="visible"
-		:show-close="false"
-		:wrapper-closable="false"
-		class="drawer"
-		custom-class="mes-drawer"
-		:size="size || '50%'"
-		@closed="$emit('destroy')">
-		<SmallTitle slot="title">
-			{{
-				mode.includes('detail')
-					? '详情'
-					: mode.includes('edit')
-					? '编辑'
-					: '新增'
-			}}
-		</SmallTitle>
-
-		<div class="drawer-body flex">
-			<div class="drawer-body__content">
-				<section v-for="(section, index) in sections" :key="section.key">
-					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
-
-					<div
-						class="form-part"
-						v-if="section.key == 'base'"
-						style="border-bottom: 1px solid #dfdfdf; margin-bottom: 24px">
-						<el-skeleton v-if="!showForm" animated />
-						<!-- <BaseInfoForm
-							key="drawer-dialog-form"
-							v-if="showForm"
-							ref="form"
-							:disabled="mode.includes('detail')"
-							v-model="form"
-							:rows="formRows" /> -->
-
-						<!-- if  -->
-						<el-row v-if="mode.includes('detail')" style="margin-bottom: 24px">
-							<el-col :span="8">
-								<div
-									class="title"
-									style="font-weight: 700; font-size: 16px; margin: 8px 0">
-									设备名
-								</div>
-								<div class="value" style="font-size: 14px">
-									{{ form.equipmentName }}
-								</div>
-							</el-col>
-							<el-col :span="8">
-								<div
-									class="title"
-									style="font-weight: 700; font-size: 16px; margin: 8px 0">
-									关联表名
-								</div>
-								<div class="value" style="font-size: 14px">
-									{{ form.plcName }}
-								</div>
-							</el-col>
-						</el-row>
-						<!-- else  -->
-						<el-row v-else style="margin-bottom: 24px" :gutter="20">
-							<el-form ref="form" :model="form">
-								<el-col :span="8">
-									<el-form-item
-										class="title"
-										label="设备名"
-										style="font-size: 16px; margin: 8px 0">
-										<el-select
-											v-model="form.equipmentId"
-											filterable
-											clearable
-											placeholder="请选择设备">
-											<el-option
-												v-for="eq in eqList"
-												:key="eq.id"
-												:label="eq.name"
-												:value="eq.id"></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-								<el-col :span="8">
-									<el-form-item
-										class="title"
-										label="设备关联表名"
-										style="font-size: 16px; margin: 8px 0">
-										<el-select
-											v-model="form.plcId"
-											filterable
-											clearable
-											placeholder="请选择关联表">
-											<el-option
-												v-for="plc in plcList"
-												:key="plc.id"
-												:label="plc.plcTableName"
-												:value="plc.id"></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-form>
-						</el-row>
-					</div>
-
-					<div
-						v-if="section.key == 'attrs'"
-						style="position: relative; margin-top: 12px">
-						<div
-							v-if="!mode.includes('detail')"
-							style="position: absolute; top: -40px; right: 0">
-							<el-button @click="handleAddAttr" type="text">
-								<i class="el-icon-plus"></i>
-								添加参数
-							</el-button>
-						</div>
-						<base-table
-							v-loading="attrListLoading"
-							:table-props="section.props"
-							:page="attrQuery?.params.pageNo || 1"
-							:limit="attrQuery?.params.pageSize || 10"
-							:table-data="list"
-							@emitFun="handleEmitFun">
-							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
-							@emitButtonClick="handleAddAttr" -->
-							<method-btn
-								v-if="section.tableBtn && !mode.includes('detail')"
-								slot="handleBtn"
-								label="操作"
-								:method-list="tableBtn"
-								@clickBtn="handleTableBtnClick" />
-						</base-table>
-
-						<!-- 分页组件 -->
-						<pagination
-							v-show="total > 0"
-							:total="total"
-							:page.sync="attrQuery.params.pageNo"
-							:limit.sync="attrQuery.params.pageSize"
-							@pagination="getAttrList" />
-					</div>
-				</section>
-			</div>
-
-			<div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button
-					type="primary"
-					v-if="!mode.includes('detail')"
-					@click="handleSave">
-					保存
-				</el-button>
-			</div>
-		</div>
-
-		<!-- 属性对话框 -->
-		<base-dialog
-			v-if="sections[1].allowAdd"
-			:dialogTitle="attrTitle"
-			:dialogVisible="attrFormVisible"
-			width="45%"
-			:append-to-body="true"
-			custom-class="baseDialog"
-			@close="closeAttrForm"
-			@cancel="closeAttrForm"
-			@confirm="submitAttrForm">
-			<!-- :disabled="mode.includes('detail')" -->
-			<DialogForm
-				v-if="attrFormVisible"
-				ref="attrForm"
-				v-model="attrForm"
-				:rows="attrRows" />
-		</base-dialog>
-	</el-drawer>
-</template>
-
-<script>
-import BaseInfoForm from '@/components/DialogForm';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
-
-export default {
-	components: { SmallTitle, DialogForm: BaseInfoForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'infoData', 'size'],
-	data() {
-		return {
-			mode: '',
-			visible: false,
-			showForm: false,
-			total: 0,
-			form: {},
-			list: [],
-			eqList: [],
-			plcList: [],
-			attrTitle: '',
-			attrForm: {
-				id: null,
-				name: '',
-				plcParamName: '',
-				unit: '',
-				collection: 1,
-				minValue: '',
-				maxValue: '',
-				defaultValue: '',
-				description: '',
-				remark: '',
-				alarmContent: '',
-			},
-			attrFormVisible: false,
-			attrRows: [
-				[
-					{
-						input: true,
-						label: '参数列名',
-						prop: 'plcParamName',
-						rules: [
-							{ required: true, message: '参数列名不能为空', trigger: 'blur' },
-						],
-					},
-					{
-						input: true,
-						label: '参数名称',
-						prop: 'name',
-						rules: [
-							{ required: true, message: '参数名称不能为空', trigger: 'blur' },
-						],
-					},
-				],
-				[
-					{
-						select: true,
-						label: '单位',
-						prop: 'unit',
-						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
-					},
-					{
-						switch: true,
-						label: '是否采集',
-						prop: 'collection',
-						bind: {
-							'active-value': 1,
-							'inactive-value': 0,
-						},
-					},
-				],
-				[
-					{
-						select: true,
-						label: '设备参数类型',
-						prop: 'equipmentParamType',
-						options: [
-							{ label: '一般参数', value: 1 },
-							{ label: '工艺参数', value: 2 },
-							{ label: '报警参数', value: 3 },
-						],
-						rules: [
-							{
-								required: true,
-								message: '设备参数类型不能为空',
-								trigger: 'blur',
-							},
-						],
-					},
-					{
-						select: true,
-						label: '生产参数类型',
-						prop: 'productionParamType',
-						options: [
-							// { label: '进片数量', value: 1 },
-							// { label: '出片数量', value: 2 },
-							// { label: '破损数量', value: 3 },
-							// { label: '无类型', value: 4 },
-							{ label: '进口计数', value: 1 },
-							{ label: '出口计数', value: 2 },
-							{ label: '损耗计数', value: 3 },
-							{ label: '无类型', value: 4 },
-						],
-						rules: [
-							{
-								required: true,
-								message: '生产参数类型不能为空',
-								trigger: 'blur',
-							},
-						],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '最小值',
-						prop: 'minValue',
-						rules: [
-							{
-								type: 'number',
-								message: '请输入正确的数字',
-								trigger: 'change',
-								transform: (val) => Number(val),
-							},
-						],
-					},
-					{
-						input: true,
-						label: '最大值',
-						prop: 'maxValue',
-						rules: [
-							{
-								required: false,
-							},
-							{
-								type: 'number',
-								message: '请输入正确的数字',
-								trigger: 'change',
-								transform: (val) => Number(val),
-							},
-						],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '标准值',
-						prop: 'defaultValue',
-					},
-					{
-						input: true,
-						label: '描述',
-						prop: 'description',
-					},
-				],
-				[
-					{
-						input: true,
-						label: '备注',
-						prop: 'remark',
-					},
-				],
-			],
-			attrQuery: {
-				params: {
-					pageNo: 1,
-					pageSize: 10,
-				},
-			}, // 属性列表的请求
-			infoQuery: null, // 基本信息的请求
-			attrFormSubmitting: false,
-			attrListLoading: false,
-			shouldRefreshPageView: false,
-		};
-	},
-	computed: {
-		formRows() {
-			return this.sections[0].rows.map((row) => {
-				return row.map((col) => {
-					return {
-						...col,
-						bind: {
-							// 详情 模式下，禁用各种输入
-							// disabled: this.mode == 'detail',
-							disabled: true,
-						},
-					};
-				});
-			});
-		},
-		tableBtn() {
-			return this.sections[1].tableBtn;
-			// return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
-		},
-	},
-	mounted() {
-		this.shouldRefreshPageView = false;
-		this.mode = this.defaultMode || 'detail';
-
-		if (this.mode != 'detail') {
-			this.$axios('/base/equipment/listAll').then(({ code, data }) => {
-				this.eqList = data;
-			});
-			this.$axios({
-				url: '/base/equipment-plc/listAll',
-			}).then(({ code, data }) => {
-				this.plcList = data;
-			});
-		}
-		for (const section of this.sections) {
-			// 请求具体信息
-			if ('url' in section) {
-				const query = {
-					url: section.url,
-					method: section.method || 'get',
-					params: section.queryParams || null,
-					data: section.data || null,
-				};
-				// debugger;
-				this.$axios(query).then(({ data }) => {
-					if (section.key == 'base') {
-						this.form = data;
-						this.showForm = true;
-						this.infoQuery = query;
-					} else if (section.key == 'attrs') {
-						this.attrQuery = query;
-						this.list = data.list;
-						this.total = data.total;
-					}
-				});
-			} else if (section.key == 'base') {
-				this.form = this.infoData;
-				this.showForm = true;
-			}
-		}
-	},
-	methods: {
-		handleTableBtnClick({ type, data }) {
-			switch (type) {
-				case 'edit':
-					this.handleEditAttr(data.id);
-					break;
-				case 'delete':
-					this.handleDeleteAttr(data.id);
-					break;
-			}
-		},
-
-		handleEmitFun(val) {
-			console.log('handleEmitFun', val);
-		},
-
-		init() {
-			this.visible = true;
-		},
-
-		async getAttrList() {
-			this.attrListLoading = true;
-			const res = await this.$axios(this.attrQuery);
-			if (res.code == 0) {
-				this.list = res.data.list;
-				this.total = res.data.total;
-			}
-			this.attrListLoading = false;
-		},
-
-		// 保存表单
-		handleSave() {
-			this.$refs['form'][0].validate(async (valid) => {
-				if (valid) {
-					const isEdit = !this.mode.includes('detail');
-					await this.$axios({
-						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
-						method: isEdit ? 'put' : 'post',
-						data: this.form,
-					});
-					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
-					this.visible = false;
-					this.$emit('refreshDataList');
-				}
-			});
-		},
-
-		handleCancel() {
-			if (this.shouldRefreshPageView) {
-				this.$emit('refreshDataList');
-			}
-			this.visible = false;
-		},
-
-		// 开启编辑
-		toggleEdit() {
-			this.mode = 'edit';
-		},
-
-		// 新增属性
-		handleAddAttr() {
-			this.attrForm = {
-				id: null,
-				name: '',
-				plcParamName: '',
-				unit: '',
-				collection: 1,
-				minValue: '',
-				maxValue: '',
-				defaultValue: '',
-				description: '',
-				remark: '',
-				equipmentParamType: '',
-				productionParamType: '',
-				alarmContent: '',
-			};
-			this.attrTitle = '添加参数绑定信息';
-			this.attrFormVisible = true;
-		},
-
-		// 编辑属性
-		async handleEditAttr(attrId) {
-			const res = await this.$axios({
-				url: this.sections[1].urlDetail,
-				method: 'get',
-				params: { id: attrId },
-			});
-			if (res.code == 0) {
-				this.attrForm = res.data;
-				this.attrTitle = '编辑参数绑定信息';
-				this.attrFormVisible = true;
-			}
-		},
-
-		// 删除属性
-		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该参数?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			})
-				.then(async () => {
-					const res = await this.$axios({
-						url: this.sections[1].urlDelete,
-						method: 'delete',
-						params: { id: attrId },
-					});
-					if (res.code == 0) {
-						this.shouldRefreshPageView = true;
-						this.$message({
-							message: '删除成功',
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getAttrList();
-							},
-						});
-					}
-				})
-				.catch(() => {});
-		},
-
-		// 提交属性表
-		submitAttrForm() {
-			this.$refs['attrForm'].validate(async (valid) => {
-				if (!valid) {
-					return;
-				}
-
-				const isEdit = this.attrForm.id != null;
-				this.attrFormSubmitting = true;
-				const res = await this.$axios({
-					url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
-					method: isEdit ? 'put' : 'post',
-					data: {
-						...this.attrForm,
-						connectId: this.infoData.id,
-					},
-				});
-
-				if (res.code == 0) {
-					this.closeAttrForm();
-					this.$message({
-						message: `${isEdit ? '更新' : '创建'}成功`,
-						type: 'success',
-						duration: 1500,
-						onClose: () => {
-							this.getAttrList();
-							this.shouldRefreshPageView = true;
-						},
-					});
-				}
-				this.attrFormSubmitting = false;
-			});
-		},
-
-		closeAttrForm() {
-			this.attrFormVisible = false;
-		},
-
-		handleClick(raw) {
-			if (raw.type === 'delete') {
-				this.$confirm(`确定删除该参数?`, '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning',
-				})
-					.then(() => {
-						deleteProductAttr(raw.data.id).then(({ data }) => {
-							this.$message({
-								message: '操作成功',
-								type: 'success',
-								duration: 1500,
-								onClose: () => {
-									this.getList();
-								},
-							});
-						});
-					})
-					.catch(() => {});
-			} else {
-				this.addNew(raw.data.id);
-			}
-		},
-	},
-};
-</script>
-
-<style scoped>
-.drawer >>> .el-drawer {
-	border-radius: 8px 0 0 8px;
-}
-
-.drawer >>> .el-drawer__header {
-	margin: 0;
-	padding: 32px 32px 24px;
-	border-bottom: 1px solid #dcdfe6;
-	margin-bottom: 0px;
-}
-
-.small-title::before {
-	content: '';
-	display: inline-block;
-	vertical-align: top;
-	width: 4px;
-	height: 22px;
-	border-radius: 1px;
-	margin-right: 8px;
-	background-color: #0b58ff;
-}
-
-.drawer-body {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-}
-
-.drawer-body__content {
-	flex: 1;
-	/* background: #eee; */
-	padding: 20px 30px;
-	overflow-y: auto;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-</style>
diff --git a/src/views/base/equipmentPlcConnect/components/basic-add.js b/src/views/base/equipmentPlcConnect/components/basic-add.js
deleted file mode 100644
index 2f725af8..00000000
--- a/src/views/base/equipmentPlcConnect/components/basic-add.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * @Author: zwq
- * @Date: 2022-08-24 11:19:43
- * @LastEditors: zhp
- * @LastEditTime: 2023-12-13 15:52:53
- * @Description:
- */
-export default {
-  data() {
-    /* eslint-disable */
-    return {
-      urlOptions: {
-        createURL: '',
-        updateURL: '',
-        infoURL: '',
-        codeURL: '',
-        getOption: false,
-        isGetCode: false,
-        optionArrUrl: [],
-        optionArr: {}
-      },
-      visible: false,
-      setData: false
-    }
-  },
-  created() {
-  },
-  activated() {
-  },
-  methods: {
-    init(id) {
-      this.dataForm.id = id || "";
-      this.visible = true;
-      if (this.urlOptions.getOption) {
-        this.getArr()
-      }
-      this.$nextTick(() => {
-        this.$refs["dataForm"].resetFields();
-        if (this.dataForm.id) {
-          this.urlOptions.infoURL(id).then(response => {
-            this.dataForm = response.data
-            if (this.setData) {
-              this.setDataForm()
-            }
-          });
-        } else {
-          if (this.urlOptions.isGetCode) {
-            this.getCode()
-          }
-				}
-      });
-    },
-		getCode() {
-			this.urlOptions.codeURL()
-				.then(({ data: res }) => {
-					this.dataForm.code = res;
-				})
-				.catch(() => {});
-		},
-    getArr() {
-      const params = {
-        pageSize: 100,
-        pageNo: 1,
-      }
-      this.urlOptions.optionArrUrl.forEach((item, index) => {
-        item(params).then(({ data: res }) => {
-          this.$set(this.urlOptions.optionArr, `arr${index}`, res.list)
-        })
-          .catch(() => {
-          });
-      });
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs["dataForm"].validate((valid) => {
-        if (!valid) {
-          return false;
-        }
-        // 修改的提交
-        if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.visible = false;
-            this.$emit("refreshDataList");
-          });
-          return;
-        }
-        // 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.visible = false;
-          this.$emit("refreshDataList");
-        });
-      });
-    },
-    formClear() {
-      this.$refs.dataForm.resetFields()
-    }
-  }
-}
diff --git a/src/views/base/equipmentPlcConnect/http.js b/src/views/base/equipmentPlcConnect/http.js
deleted file mode 100644
index b87d0ed7..00000000
--- a/src/views/base/equipmentPlcConnect/http.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-09-11 16:18:44
- * @LastEditTime: 2023-09-12 14:25:01
- * @LastEditors: zhp
- * @Description:  
- */
-import Mock from 'mockjs';
-
-const baseURL = 'http://192.168.1.188:48080/admin-api';
-
-Mock.setup({
-	timeout: 200,
-});
-
-// @database
-const list = Mock.mock({
-	'data|1-10': [
-		{
-			'id|+1': 1,
-			productionLine: (options) => {
-				// console.log('otpsion', options.context.currentContext);
-				return `EQ${options.context.currentContext.id}`;
-			},
-			workshopSection: ({ context: { currentContext } }) =>
-				`EQ${currentContext.id}_WS${Mock.Random.integer(1, 10)}`,
-			equipmentName: ({ context: { currentContext } }) =>
-				`设备${currentContext.id}`,
-			equipmentCode: ({ context: { currentContext } }) =>
-				`${currentContext.equipmentName}_Code`,
-			plcCode: ({ context: { currentContext } }) =>
-				`PLC_TABLE_CODE_${currentContext.id}`,
-			plcTableName: ({ context: { currentContext } }) =>
-				`PLC_TABLE_${currentContext.id}`,
-			plcName: ({ context: { currentContext } }) => `PLC_${currentContext.id}`,
-			'bindingParameters|1-10': 1,
-		},
-	],
-});
-
-// @page
-Mock.mock(
-	RegExp(baseURL + '/base/equipment-plc-connect/page' + '.*'),
-	'get',
-	(options) => {
-		console.log('[Mock url]', options.url, list);
-		return {
-			code: 0,
-			data: {
-				list: list.data,
-				total: list.data.length,
-			},
-		};
-	}
-);
-
-// @create
-Mock.mock(baseURL + '/base/equipment-plc-connect/create', 'post', (options) => {
-	console.log('options', options);
-	const { url, type, body } = options;
-	const newItem = JSON.parse(body);
-	list.data.push(newItem);
-	return {
-		code: 0,
-		data: null,
-		msg: 'success',
-	};
-});
-
-// @update
-Mock.mock(
-	baseURL + '/admin-api/base/equipment-plc-connect/update',
-	'put',
-	(options) => {
-		const { url, type, body } = options;
-		const { id } = JSON.parse(body);
-		const newItem = list.data.find((item) => item.id == id);
-		newItem = { ...newItem, ...JSON.parse(body) };
-		return {
-			code: 0,
-			msg: 'success',
-			data: null,
-		};
-	}
-);
diff --git a/src/views/base/equipmentPlcConnect/index-old.vue b/src/views/base/equipmentPlcConnect/index-old.vue
deleted file mode 100644
index d8ba38b5..00000000
--- a/src/views/base/equipmentPlcConnect/index-old.vue
+++ /dev/null
@@ -1,535 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="700px"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
-		</base-dialog>
-
-		<!-- 抽屉 详情 -->
-		<BasicDrawer
-			v-if="editVisible"
-			ref="drawer"
-			:default-mode="editMode"
-			:info-data="alarmForm"
-			:sections="[
-				{
-					name: '基本信息',
-					key: 'base',
-					rows: drawerBaseInfoRows,
-				},
-				{
-					name: '属性列表',
-					key: 'attrs',
-					props: drawerListProps,
-					url: '/base/equipment-plc-param/page',
-					urlCreate: '/base/equipment-plc-param/create',
-					urlUpdate: '/base/equipment-plc-param/update',
-					urlDelete: '/base/equipment-plc-param/delete',
-					urlDetail: '/base/equipment-plc-param/get',
-					queryParams: {
-						connectId: alarmForm.id,
-						pageNo: 1,
-						pageSize: 10,
-					},
-					tableBtn: [
-						this.$auth.hasPermi('base:equipment-plc-param:update')
-							? {
-									type: 'edit',
-									btnName: '修改',
-							  }
-							: undefined,
-						this.$auth.hasPermi('base:equipment-plc-param:delete')
-							? {
-									type: 'delete',
-									btnName: '删除',
-							  }
-							: undefined,
-					].filter((v) => v),
-					allowAdd: true,
-				},
-			]"
-			@refreshDataList="getList"
-			@cancel="editVisible = false"
-			@destroy="editVisible = false" />
-	</div>
-</template>
-
-<script>
-import {
-	createEquipmentPlcConnect,
-	updateEquipmentPlcConnect,
-	deleteEquipmentPlcConnect,
-	getEquipmentPlcConnect,
-	getEquipmentPlcConnectPage,
-	exportEquipmentPlcConnectExcel,
-} from '@/api/base/equipmentPlcConnect';
-import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-// import './http';
-import BasicDrawer from './components/BasicDrawer.vue';
-import { publicFormatter } from '@/utils/dict';
-
-export default {
-	name: 'EquipmentPlcConnect',
-	mixins: [basicPageMixin],
-	components: { BasicDrawer },
-	data() {
-		return {
-			searchBarKeys: ['equipmentId', 'plcId'],
-			// tableBtn: [
-			// 	this.$auth.hasPermi('base:equipment-plc:update')
-			// 		? {
-			// 				type: 'edit',
-			// 				btnName: '修改',
-			// 		  }
-			// 		: undefined,
-			// 	this.$auth.hasPermi('base:equipment-plc:delete')
-			// 		? {
-			// 				type: 'delete',
-			// 				btnName: '删除',
-			// 		  }
-			// 		: undefined,
-			// ].filter((v) => v),
-			tableBtn: [
-				{
-					type: 'detail',
-					btnName: '参数绑定',
-				},
-				{
-					type: 'edit',
-					btnName: '修改',
-				},
-				// {
-				// 	type: 'params-bind',
-				// 	btnName: '参数绑定',
-				// },
-				{
-					type: 'delete',
-					btnName: '删除',
-				},
-			],
-			tableProps: [
-				// {
-				// 	prop: 'createTime',
-				// 	label: '添加时间',
-				// 	fixed: true,
-				// 	width: 180,
-				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				// },
-				{ prop: 'productionLine', label: '产线' },
-				{ prop: 'workshopSection', label: '工段' },
-				{ prop: 'equipmentName', label: '设备名' },
-				{ prop: 'equipmentCode', label: '设备编码' },
-				{ prop: 'plcCode', label: '关联表编码' },
-				{ prop: 'plcTableName', label: '关联表名' },
-				{ prop: 'plcName', label: '标识名称' },
-				{ prop: 'bindingParameters', label: '绑定参数数量' },
-				// {
-				// 	_action: 'params-bind',
-				// 	label: '查看绑定',
-				// 	subcomponent: {
-				// 		props: ['injectData'],
-				// 		render: function (h) {
-				// 			const _this = this;
-				// 			return h(
-				// 				'el-button',
-				// 				{
-				// 					props: { type: 'text' },
-				// 					on: {
-				// 						click: function () {
-				// 							console.log('inejctdata', _this.injectData);
-				// 							_this.$emit('emitData', {
-				// 								action: _this.injectData._action,
-				// 								payload: _this.injectData,
-				// 							});
-				// 						},
-				// 					},
-				// 				},
-				// 				'查看绑定'
-				// 			);
-				// 		},
-				// 	},
-				// },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '设备名',
-					placeholder: '请选择设备',
-					param: 'equipmentId',
-					selectOptions: [],
-				},
-				{
-					type: 'select',
-					label: '编码',
-					placeholder: '请选择编码',
-					param: 'plcId',
-					selectOptions: [],
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:equipment-plc:create')
-					// 	? 'button'
-					// 	: '',
-					type: 'button',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:equipment-plc:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			rows: [
-				[
-					{
-						select: true,
-						label: '关联表名',
-						prop: 'plcId',
-						labelKey: `plcTableName`,
-						url: '/base/equipment-plc/listAll',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							filterable: true,
-						},
-					},
-				],
-				[
-					{
-						select: true,
-						label: '设备',
-						prop: 'equipmentId',
-						url: '/base/equipment/page?pageNo=1&pageSize=99',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							filterable: true,
-						},
-					},
-				],
-			],
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				plcId: null,
-				equipmentId: null,
-			},
-			// 表单参数
-			form: {},
-			// 查看绑定配置
-			editVisible: false,
-			editMode: '',
-			drawerBaseInfoRows: [
-				[
-					{
-						input: true,
-						label: '设备名',
-						prop: 'equipmentName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
-						// }
-					},
-					{
-						input: true,
-						label: '关联表名',
-						prop: 'plcTableName',
-						// url: '/base/equipment/getCode',
-					},
-				],
-			],
-			drawerListProps: [
-				{ prop: 'plcParamName', label: '参数列名' },
-				{ prop: 'name', label: '参数名称' },
-				{
-					prop: 'unit',
-					label: '单位',
-					filter: publicFormatter('unit_dict'),
-				},
-				{
-					prop: 'equipmentParamType',
-					label: '设备参数类型',
-					filter: (val) =>
-						val != null
-							? ['', '一般参数', '工艺参数', '报警参数', ''][val]
-							: '-',
-				},
-				{
-					prop: 'productionParamType',
-					label: '生产参数类型',
-					filter: (val) =>
-						val != null
-							? // ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
-							  ['', '进口计数', '出口计数', '损耗计数', '无类型', ''][val]
-							: '-',
-				},
-				{
-					prop: 'collection',
-					label: '是否采集',
-					filter: (val) => (val != null ? ['否', '是'][val] : '-'),
-				},
-				{ prop: 'minValue', label: '最小值' },
-				{ prop: 'maxValue', label: '最大值' },
-				{ prop: 'defaultValue', label: '标准值' },
-				{ prop: 'description', label: '描述' },
-				{ prop: 'remark', label: '备注' },
-			],
-			alarmForm: {
-				id: undefined,
-				equipmentName: undefined,
-				plcTableName: undefined,
-			},
-		};
-	},
-	created() {
-		this.getList();
-		this.initSearchOptions();
-	},
-	methods: {
-		async getEquipmentOptions() {
-			const res = await this.$axios({
-				url: '/base/equipment/listAll',
-				method: 'get',
-			});
-			return res.data;
-		},
-
-		async getPlcOptions() {
-			const res = await this.$axios({
-				url: '/base/equipment-plc/listAll',
-				method: 'get',
-			});
-			return res.data;
-		},
-
-		/** 初始化查询条件 */
-		async initSearchOptions() {
-			Promise.all([this.getEquipmentOptions(), this.getPlcOptions()]).then(
-				([eqList, plcList]) => {
-					this.searchBarFormConfig[0].selectOptions = eqList.map((item) => {
-						return {
-							name: item.name,
-							id: item.id,
-						};
-					});
-					this.searchBarFormConfig[1].selectOptions = plcList.map((item) => {
-						return {
-							name: item.name,
-							id: item.id,
-						};
-					});
-				}
-			);
-		},
-		/** 覆盖 handleEmitFun 的默认实现 */
-		handleEmitFun({ action, payload }) {
-			switch (action) {
-				case 'params-bind':
-					this.reset();
-					const {
-						id,
-						equipmentName,
-						equipmentId,
-						plcId,
-						plcName,
-						plcTableName,
-					} = payload;
-					// console.log('Cha看绑定参数弹窗', id, equipmentName, plcTableName);
-					this.$router.push({
-						name: 'EquipmentPlcParam',
-						params: {
-							id,
-							equipmentName,
-							plcTableName,
-						},
-					});
-					break;
-			}
-		},
-
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentPlcConnectPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				plcId: undefined,
-				equipmentId: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备与实时采集关系表（一对多）';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentPlcConnect(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备与实时采集关系表（一对多）';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentPlcConnect(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentPlcConnect(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-
-		// 查看报警
-		handleDetail(row) {
-			// debugger;
-			const {
-				id,
-				bindingParameters,
-				equipmentCode,
-				equipmentId,
-				equipmentName,
-				plcCode,
-				plcId,
-				plcName,
-				plcTableName,
-				productionLine,
-				workshopSection,
-			} = row;
-			// 打开抽屉
-			this.editMode = 'detail';
-			this.alarmForm.id = id;
-			this.alarmForm.plcTableName = plcTableName; // 关联表名
-			this.alarmForm.equipmentName = equipmentName;
-			this.editVisible = true;
-			this.$nextTick(() => {
-				this.$refs['drawer'].init();
-			});
-		},
-
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否删除该配置?')
-				.then(function () {
-					return deleteEquipmentPlcConnect(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备与实时采集关系表（一对多）数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentPlcConnectExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备与实时采集关系表（一对多）.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/base/equipmentPlcConnect/index.vue b/src/views/base/equipmentPlcConnect/index.vue
deleted file mode 100644
index 1005a221..00000000
--- a/src/views/base/equipmentPlcConnect/index.vue
+++ /dev/null
@@ -1,561 +0,0 @@
-<!--
-    filename: CollectionConfig.vue
-    author: liubin
-    date: 2023-10-30 10:09:03
-    description:
--->
-
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="30%"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<!-- <DialogForm v-if="open" ref="form" v-model="form" :rows="rows" /> -->
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit" />
-		</base-dialog>
-
-		<!-- 抽屉 详情 -->
-		<BasicDrawer
-			v-if="editVisible"
-			ref="drawer"
-			size="45%"
-			:default-mode="editMode"
-			:info-data="alarmForm"
-			:sections="[
-				{
-					name: '基本信息',
-					key: 'base',
-					rows: drawerBaseInfoRows,
-					url: '/base/equipment-plc-connect/get',
-					urlUpdate: '/base/equipment-plc-connect/update',
-					urlCreate: '/base/equipment-plc-connect/create',
-					queryParams: { id: alarmForm.id },
-				},
-				{
-					name: '采集参数',
-					key: 'attrs',
-					props: drawerListProps,
-					url: '/base/equipment-plc-param/page',
-					urlCreate: '/base/equipment-plc-param/create',
-					urlUpdate: '/base/equipment-plc-param/update',
-					urlDelete: '/base/equipment-plc-param/delete',
-					urlDetail: '/base/equipment-plc-param/get',
-					queryParams: {
-						connectId: alarmForm.id,
-						pageNo: 1,
-						pageSize: 10,
-					},
-					tableBtn: [
-						{
-							type: 'edit',
-							btnName: '修改',
-						},
-						{
-							type: 'delete',
-							btnName: '删除',
-						},
-						// this.$auth.hasPermi('equipment:collection-config-param:update')
-						// 	? {
-						// 			type: 'edit',
-						// 			btnName: '修改',
-						// 	  }
-						// 	: undefined,
-						// this.$auth.hasPermi('equipment:collection-config-param:delete')
-						// 	? {
-						// 			type: 'delete',
-						// 			btnName: '删除',
-						// 	  }
-						// 	: undefined,
-					].filter((v) => v),
-					allowAdd: true,
-				},
-			]"
-			@refreshDataList="getList"
-			@cancel="editVisible = false"
-			@destroy="editVisible = false" />
-	</div>
-</template>
-
-<script>
-import {
-	createEquipmentPlcConnect,
-	updateEquipmentPlcConnect,
-	deleteEquipmentPlcConnect,
-	getEquipmentPlcConnect,
-	getEquipmentPlcConnectPage,
-	exportEquipmentPlcConnectExcel,
-} from '@/api/base/equipmentPlcConnect';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-// import './http';
-import BasicDrawer from './components/BasicDrawer.vue';
-import { publicFormatter } from '@/utils/dict';
-import AddOrUpdate from './add-or-updata';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-
-export default {
-	name: 'EquipmentPlcConnect',
-	mixins: [basicPageMixin, tableHeightMixin],
-	components: { BasicDrawer, AddOrUpdate },
-	data() {
-		return {
-			searchBarKeys: ['equipmentId', 'plcId'],
-			// tableBtn: [
-			// ].filter((v) => v),
-			tableBtn: [
-				this.$auth.hasPermiAnd([
-					'base:equipment-plc-connect:query',
-					'base:equipment-plc-param:query'
-				])
-				? {
-						type: 'detail',
-						btnName: '参数绑定',
-					} : undefined,
-				this.$auth.hasPermiAnd([
-						'base:equipment-plc-connect:update',
-						'base:equipment-plc-connect:query',
-						'base:equipment-plc-param:create',
-						'base:equipment-plc-param:update',
-						'base:equipment-plc-param:delete',
-						'base:equipment-plc-param:query'
-					])
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-plc-connect:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{ prop: 'productionLine', label: '产线', minWidth: 120, showOverflowtooltip: true },
-				{ prop: 'workshopSection', label: '工段', minWidth: 120, showOverflowtooltip: true },
-				{ prop: 'equipmentName', label: '设备名', minWidth: 120, showOverflowtooltip: true },
-				{ prop: 'equipmentCode', label: '设备编码', minWidth: 200, showOverflowtooltip: true },
-				{ prop: 'plcCode', label: '关联表编码', minWidth: 220, showOverflowtooltip: true },
-				{ prop: 'plcTableName', label: '关联表名', minWidth: 150, showOverflowtooltip: true },
-				{ prop: 'plcName', label: '标识名称', minWidth: 150, showOverflowtooltip: true },
-				{ prop: 'bindingParameters', label: '绑定参数数量', minWidth: 120, showOverflowtooltip: true },
-				// {
-				// 	_action: 'params-bind',
-				// 	label: '查看绑定',
-				// 	subcomponent: {
-				// 		props: ['injectData'],
-				// 		render: function (h) {
-				// 			const _this = this;
-				// 			return h(
-				// 				'el-button',
-				// 				{
-				// 					props: { type: 'text' },
-				// 					on: {
-				// 						click: function () {
-				// 							console.log('inejctdata', _this.injectData);
-				// 							_this.$emit('emitData', {
-				// 								action: _this.injectData._action,
-				// 								payload: _this.injectData,
-				// 							});
-				// 						},
-				// 					},
-				// 				},
-				// 				'查看绑定'
-				// 			);
-				// 		},
-				// 	},
-				// },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '设备名',
-					placeholder: '请选择设备',
-					param: 'equipmentId',
-					selectOptions: [],
-					filterable: true,
-				},
-				{
-					type: 'select',
-					label: '关联表编码',
-					placeholder: '请选择关联表编码',
-					param: 'plcId',
-					selectOptions: [],
-					filterable: true,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment-plc-connect:create')
-						? 'separate' : '',
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment-plc-connect:create')
-						? 'button'
-						: '',
-					// type: 'button',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-				// {
-				// 	type: this.$auth.hasPermi('equipment:collection-config:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			rows: [
-				[
-					{
-						select: true,
-						label: '关联表名',
-						prop: 'plcId',
-						labelKey: `plcTableName`,
-						url: '/base/equipment-plc/listAll',
-						rules: [
-							{ required: true, message: '关联表名不能为空', trigger: 'blur' },
-						],
-						bind: {
-							filterable: true,
-						},
-					},
-				],
-				[
-					{
-						select: true,
-						label: '设备',
-						prop: 'equipmentId',
-						url: '/base/core-equipment/page?pageNo=1&pageSize=99',
-						rules: [
-							{ required: true, message: '设备不能为空', trigger: 'blur' },
-						],
-						bind: {
-							filterable: true,
-						},
-					},
-				],
-			],
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				plcId: null,
-				equipmentId: null,
-			},
-			// 表单参数
-			form: {},
-			// 查看绑定配置
-			editVisible: false,
-			editMode: '',
-			drawerBaseInfoRows: [
-				[
-					{
-						input: true,
-						label: '设备名',
-						prop: 'equipmentName',
-						rules: [
-							{ required: true, message: '设备名不能为空', trigger: 'blur' },
-						],
-						// bind: {
-						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
-						// }
-					},
-					{
-						input: true,
-						label: '关联表名',
-						prop: 'plcTableName',
-						// url: '/base/core-equipment/getCode',
-					},
-				],
-			],
-			drawerListProps: [
-				{ prop: 'plcParamName', label: '参数列名' },
-				{ prop: 'name', label: '参数名称' },
-				{
-					prop: 'unit',
-					label: '单位',
-					filter: publicFormatter('unit_dict'),
-				},
-				{
-					prop: 'equipmentParamType',
-					label: '设备参数类型',
-					filter: (val) =>
-						val != null
-							? ['', '一般参数', '工艺参数', '报警参数', ''][val]
-							: '-',
-				},
-				{
-					prop: 'productionParamType',
-					label: '生产参数类型',
-					filter: (val) =>
-						val != null
-							? // ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
-							  ['', '进口计数', '出口计数', '损耗计数', '无类型', ''][val]
-							: '-',
-				},
-				{
-					prop: 'collection',
-					label: '是否采集',
-					filter: (val) => (val != null ? ['否', '是'][val] : '-'),
-				},
-				{ prop: 'minValue', label: '最小值' },
-				{ prop: 'maxValue', label: '最大值' },
-				{ prop: 'defaultValue', label: '标准值' },
-				{ prop: 'description', label: '描述' },
-				{ prop: 'remark', label: '备注' },
-			],
-			alarmForm: {
-				id: undefined,
-				equipmentName: undefined,
-				plcTableName: undefined,
-			},
-		};
-	},
-	created() {
-		this.getList();
-		this.initSearchOptions();
-	},
-	methods: {
-		successSubmit() {
-      this.cancel()
-      this.getList()
-    },
-		async getEquipmentOptions() {
-			const res = await this.$axios({
-				url: '/base/equipment/listAll',
-				method: 'get',
-			});
-			return res.data;
-		},
-		async getPlcOptions() {
-			const res = await this.$axios({
-				url: '/base/equipment-plc/listAll',
-				method: 'get',
-			});
-			return res.data;
-		},
-
-		/** 初始化查询条件 */
-		async initSearchOptions() {
-			Promise.all([this.getEquipmentOptions(), this.getPlcOptions()]).then(
-				([eqList, plcList]) => {
-					this.searchBarFormConfig[0].selectOptions = eqList.map((item) => {
-						return {
-							name: item.name,
-							id: item.id,
-						};
-					});
-					this.searchBarFormConfig[1].selectOptions = plcList.map((item) => {
-						return {
-							name: item.code,
-							id: item.id,
-						};
-					});
-				}
-			);
-		},
-		/** 覆盖 handleEmitFun 的默认实现 */
-		handleEmitFun({ action, payload }) {
-			switch (action) {
-				case 'params-bind':
-					this.reset();
-					const {
-						id,
-						equipmentName,
-						equipmentId,
-						plcId,
-						plcName,
-						plcTableName,
-					} = payload;
-					// console.log('Cha看绑定参数弹窗', id, equipmentName, plcTableName);
-					this.$router.push({
-						name: 'EquipmentPlcParam',
-						params: {
-							id,
-							equipmentName,
-							plcTableName,
-						},
-					});
-					break;
-			}
-		},
-
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentPlcConnectPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				plcId: undefined,
-				equipmentId: undefined,
-			};
-			this.resetForm('form');
-		},
-		handleTableBtnClick({ data, type }) {
-			switch (type) {
-				case 'edit':
-					this.handleDetail(data, 'edit');
-					break;
-				case 'delete':
-					this.handleDelete(data);
-					break;
-				case 'detail':
-					this.handleDetail(data);
-					break;
-			}
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备采集配置';
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init()
-			})
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentPlcConnect(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备采集配置';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs.addOrUpdate.dataFormSubmit()
-		},
-
-		// 查看报警
-		handleDetail(row, mode = 'detail') {
-			// debugger;
-			const {
-				id,
-				bindingParameters,
-				equipmentCode,
-				equipmentId,
-				equipmentName,
-				plcCode,
-				plcId,
-				plcName,
-				plcTableName,
-				productionLine,
-				workshopSection,
-			} = row;
-			// 打开抽屉
-			this.editMode = mode;
-			this.alarmForm.id = id;
-			this.alarmForm.plcTableName = plcTableName; // 关联表名
-			this.alarmForm.equipmentName = equipmentName;
-			this.editVisible = true;
-			this.$nextTick(() => {
-				this.$refs['drawer'].init();
-			});
-		},
-
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否删除该配置?')
-				.then(function () {
-					return deleteEquipmentPlcConnect(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备与实时采集关系表（一对多）数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentPlcConnectExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备与实时采集关系表（一对多）.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/base/equipmentPlcParam/index.vue b/src/views/base/equipmentPlcParam/index.vue
deleted file mode 100644
index f59fdee3..00000000
--- a/src/views/base/equipmentPlcParam/index.vue
+++ /dev/null
@@ -1,452 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="700px"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	createEquipmentPlcParam,
-	updateEquipmentPlcParam,
-	deleteEquipmentPlcParam,
-	getEquipmentPlcParam,
-	getEquipmentPlcParamPage,
-	exportEquipmentPlcParamExcel,
-} from '@/api/base/equipmentPlcParam';
-import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import { publicFormatter } from '@/utils/dict';
-
-export default {
-	name: 'EquipmentPlcParam',
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			tableProps: [
-				// {
-				// 	prop: 'createTime',
-				// 	label: '添加时间',
-				// 	fixed: true,
-				// 	width: 180,
-				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				// },
-				{ prop: 'plcParamName', label: '参数列名' },
-				{ prop: 'name', label: '参数名称' },
-				{
-					prop: 'unit',
-					label: '单位',
-					filter: publicFormatter('unit_dict'),
-				},
-				{
-					prop: 'collection',
-					label: '是否采集',
-					filter: (val) => (val != null ? ['否', '是'][val] : '-'),
-				},
-				{ prop: 'minValue', label: '最小值' },
-				{ prop: 'maxValue', label: '最大值' },
-				{ prop: 'defaultValue', label: '标准值' },
-				{ prop: 'description', label: '描述' },
-				{ prop: 'remark', label: '备注' },
-				// {
-				// 	_action: 'params-bind',
-				// 	label: '查看绑定',
-				// 	,
-				// 	subcomponent: {
-				// 		props: ['injectData'],
-				// 		render: function (h) {
-				// 			const _this = this;
-				// 			return h(
-				// 				'el-button',
-				// 				{
-				// 					props: { type: 'text' },
-				// 					on: {
-				// 						click: function () {
-				// 							console.log('inejctdata', _this.injectData);
-				// 							_this.$emit('emitData', {
-				// 								action: _this.injectData._action,
-				// 								payload: _this.injectData,
-				// 							});
-				// 						},
-				// 					},
-				// 				},
-				// 				'查看绑定'
-				// 			);
-				// 		},
-				// 	},
-				// },
-			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '参数列名',
-						prop: 'plcParamName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						input: true,
-						label: '参数名称',
-						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						select: true,
-						label: '单位',
-						prop: 'unit',
-						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						switch: true,
-						label: '是否采集',
-						prop: 'collection',
-						bind: {
-							'active-value': 1,
-							'inactive-value': 0,
-						},
-					},
-				],
-				[
-					{
-						input: true,
-						label: '最小值',
-						prop: 'minValue',
-						rules: [
-							{
-								type: 'number',
-								message: '请输入正确的数字',
-								trigger: 'change',
-								transform: (val) => Number(val),
-							},
-						],
-					},
-					{
-						input: true,
-						label: '最大值',
-						prop: 'maxValue',
-						rules: [
-							{
-								required: false,
-							},
-							{
-								type: 'number',
-								message: '请输入正确的数字',
-								trigger: 'change',
-								transform: (val) => Number(val),
-							},
-						],
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '标准值',
-						prop: 'defaultValue',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						input: true,
-						label: '描述',
-						prop: 'description',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '备注',
-						prop: 'remark',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-			],
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				connectId: null,
-			},
-			// 表单参数
-			form: {},
-			connectId: null,
-			equipmentName: '',
-			plcTableName: '',
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '设备名',
-					disabled: true,
-					param: 'equipmentName',
-					defaultSelect: '',
-				},
-				{
-					type: 'input',
-					label: '关联表名',
-					disabled: true,
-					param: 'plcName',
-					defaultSelect: '',
-				},
-				{
-					type:
-						this.$auth.hasPermi('base:equipment-plc-param:create') &&
-						!this.isDetailPage
-							? 'button'
-							: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-			],
-		};
-	},
-	computed: {
-		isDetailPage() {
-			return this.$route.params.detail === true;
-		},
-		tableBtn() {
-			return [
-				this.$auth.hasPermi('base:equipment-plc-param:update') &&
-				!this.isDetailPage
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-plc-param:delete') &&
-				!this.isDetailPage
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v);
-		},
-		// searchBarFormConfig() {
-		// 	console.log(
-		// 		'ers',
-		// 		JSON.stringify({ eid: this.equipmentName, plc: this.plcTableName })
-		// 	);
-		// 	return [
-		// 		{
-		// 			type: 'input',
-		// 			label: '设备名',
-		// 			disabled: true,
-		// 			param: 'equipmentName',
-		// 			defaultSelect: this.equipmentName,
-		// 		},
-		// 		{
-		// 			type: 'input',
-		// 			label: '关联表名',
-		// 			disabled: true,
-		// 			param: 'plcName',
-		// 			defaultSelect: this.plcTableName,
-		// 		},
-		// 		{
-		// 			type:
-		// 				this.$auth.hasPermi('base:equipment-plc-param:create') &&
-		// 				!this.isDetailPage
-		// 					? 'button'
-		// 					: '',
-		// 			btnName: '新增',
-		// 			name: 'add',
-		// 			plain: true,
-		// 			color: 'success',
-		// 		},
-		// 	];
-		// },
-	},
-	activated() {
-		console.log('activated,,,');
-		// 设置顶部搜索栏信息
-		const { equipmentName, id: connectId, plcTableName } = this.$route.params;
-		// this.equipmentName = equipmentName;
-		// this.plcTableName = plcTableName;
-		this.setSearchBarFormValue('equipmentName', equipmentName);
-		this.setSearchBarFormValue('plcName', plcTableName);
-		this.queryParams.connectId = connectId;
-		// if (!equipmentGroupId) this.getList(); // 拦截
-		this.getList();
-	},
-	deactivated() {
-		console.log('deactivated,,,');
-		this.setSearchBarFormValue('equipmentName', '');
-		this.setSearchBarFormValue('plcName', '');
-		// this.equipmentName = null;
-		// this.plcTableName = null;
-		this.queryParams.connectId = null;
-	},
-	methods: {
-		/** 设置 searchBarForm 的默认值 - 用得比较少 */
-		setSearchBarFormValue(param, value) {
-			this.searchBarFormConfig.forEach((config) => {
-				if (config.param == param) {
-					config.defaultSelect = value;
-				}
-			});
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentPlcParamPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				connectId: undefined,
-				plcParamName: undefined,
-				name: undefined,
-				unit: undefined,
-				minValue: null,
-				maxValue: null,
-				defaultValue: undefined,
-				collection: undefined,
-				description: undefined,
-				remark: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备数采详情';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentPlcParam(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备数采详情';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentPlcParam({
-						...this.form,
-						connectId: this.queryParams.connectId,
-					}).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentPlcParam({
-					...this.form,
-					connectId: this.queryParams.connectId,
-				}).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除"' + row.name + '"的参数绑定?')
-				.then(function () {
-					return deleteEquipmentPlcParam(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备数采详情数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentPlcParamExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备数采详情.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/base/equipmentQuantityLog/index.vue b/src/views/base/equipmentQuantityLog/index.vue
deleted file mode 100644
index b8d5208e..00000000
--- a/src/views/base/equipmentQuantityLog/index.vue
+++ /dev/null
@@ -1,277 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentName">
-        <el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="进入设备的数量" prop="inQuantity">
-        <el-input v-model="queryParams.inQuantity" placeholder="请输入进入设备的数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="离开设备的数量，若plc只记录一个生产数量，也写入该字段" prop="outQuantity">
-        <el-input v-model="queryParams.outQuantity" placeholder="请输入离开设备的数量，若plc只记录一个生产数量，也写入该字段" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="正常生产量" prop="okQuantity">
-        <el-input v-model="queryParams.okQuantity" placeholder="请输入正常生产量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="设备上报的报废数量" prop="nokQuantity">
-        <el-input v-model="queryParams.nokQuantity" placeholder="请输入设备上报的报废数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="生产数量的记录时间" prop="recordTime">
-        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="版本号" prop="version">
-        <el-input v-model="queryParams.version" placeholder="请输入版本号" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-quantity-log:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-quantity-log:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="设备id" align="center" prop="equipmentId" />
-      <el-table-column label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column label="进入设备的数量" align="center" prop="inQuantity" />
-      <el-table-column label="离开设备的数量，若plc只记录一个生产数量，也写入该字段" align="center" prop="outQuantity" />
-      <el-table-column label="正常生产量" align="center" prop="okQuantity" />
-      <el-table-column label="设备上报的报废数量" align="center" prop="nokQuantity" />
-      <el-table-column label="生产数量的记录时间" align="center" prop="recordTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recordTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:equipment-quantity-log:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-quantity-log:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设备id" prop="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备id" />
-        </el-form-item>
-        <el-form-item label="设备名称" prop="equipmentName">
-          <el-input v-model="form.equipmentName" placeholder="请输入设备名称" />
-        </el-form-item>
-        <el-form-item label="进入设备的数量" prop="inQuantity">
-          <el-input v-model="form.inQuantity" placeholder="请输入进入设备的数量" />
-        </el-form-item>
-        <el-form-item label="离开设备的数量，若plc只记录一个生产数量，也写入该字段" prop="outQuantity">
-          <el-input v-model="form.outQuantity" placeholder="请输入离开设备的数量，若plc只记录一个生产数量，也写入该字段" />
-        </el-form-item>
-        <el-form-item label="正常生产量" prop="okQuantity">
-          <el-input v-model="form.okQuantity" placeholder="请输入正常生产量" />
-        </el-form-item>
-        <el-form-item label="设备上报的报废数量" prop="nokQuantity">
-          <el-input v-model="form.nokQuantity" placeholder="请输入设备上报的报废数量" />
-        </el-form-item>
-        <el-form-item label="生产数量的记录时间" prop="recordTime">
-          <el-date-picker clearable v-model="form.recordTime" type="date" value-format="timestamp" placeholder="选择生产数量的记录时间" />
-        </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" placeholder="请输入版本号" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { createEquipmentQuantityLog, updateEquipmentQuantityLog, deleteEquipmentQuantityLog, getEquipmentQuantityLog, getEquipmentQuantityLogPage, exportEquipmentQuantityLogExcel } from "@/api/base/equipmentQuantityLog";
-
-export default {
-  name: "EquipmentQuantityLog",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 后端用 设备生产数量统计表（按一定时间段写入）列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentId: null,
-        equipmentName: null,
-        inQuantity: null,
-        outQuantity: null,
-        okQuantity: null,
-        nokQuantity: null,
-        recordTime: [],
-        version: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        equipmentName: [{ required: true, message: "设备名称不能为空", trigger: "blur" }],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentQuantityLogPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        equipmentId: undefined,
-        equipmentName: undefined,
-        inQuantity: undefined,
-        outQuantity: undefined,
-        okQuantity: undefined,
-        nokQuantity: undefined,
-        recordTime: undefined,
-        version: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加后端用 设备生产数量统计表（按一定时间段写入）";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getEquipmentQuantityLog(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改后端用 设备生产数量统计表（按一定时间段写入）";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateEquipmentQuantityLog(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentQuantityLog(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id;
-      this.$modal.confirm('是否确认删除后端用 设备生产数量统计表（按一定时间段写入）编号为"' + id + '"的数据项?').then(function() {
-          return deleteEquipmentQuantityLog(id);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有后端用 设备生产数量统计表（按一定时间段写入）数据项?').then(() => {
-          this.exportLoading = true;
-          return exportEquipmentQuantityLogExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '后端用 设备生产数量统计表（按一定时间段写入）.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/base/equipmentQuantityRealtime/index.vue b/src/views/base/equipmentQuantityRealtime/index.vue
deleted file mode 100644
index 6d85dbbe..00000000
--- a/src/views/base/equipmentQuantityRealtime/index.vue
+++ /dev/null
@@ -1,276 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentName">
-        <el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="进入设备的基板数量" prop="inQuantity">
-        <el-input v-model="queryParams.inQuantity" placeholder="请输入进入设备的基板数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="离开设备的基板数量，若plc只记录一个生产数量，也写入该字段" prop="outQuantity">
-        <el-input v-model="queryParams.outQuantity" placeholder="请输入离开设备的基板数量，若plc只记录一个生产数量，也写入该字段" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="正常生产量" prop="okQuantity">
-        <el-input v-model="queryParams.okQuantity" placeholder="请输入正常生产量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="设备上报的报废数量" prop="nokQuantity">
-        <el-input v-model="queryParams.nokQuantity" placeholder="请输入设备上报的报废数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="记录时间" prop="recordTime">
-        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="版本号" prop="version">
-        <el-input v-model="queryParams.version" placeholder="请输入版本号" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-quantity-realtime:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-quantity-realtime:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="设备id" align="center" prop="equipmentId" />
-      <el-table-column label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column label="进入设备的基板数量" align="center" prop="inQuantity" />
-      <el-table-column label="离开设备的基板数量，若plc只记录一个生产数量，也写入该字段" align="center" prop="outQuantity" />
-      <el-table-column label="正常生产量" align="center" prop="okQuantity" />
-      <el-table-column label="设备上报的报废数量" align="center" prop="nokQuantity" />
-      <el-table-column label="记录时间" align="center" prop="recordTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recordTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:equipment-quantity-realtime:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-quantity-realtime:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设备id" prop="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备id" />
-        </el-form-item>
-        <el-form-item label="设备名称" prop="equipmentName">
-          <el-input v-model="form.equipmentName" placeholder="请输入设备名称" />
-        </el-form-item>
-        <el-form-item label="进入设备的基板数量" prop="inQuantity">
-          <el-input v-model="form.inQuantity" placeholder="请输入进入设备的基板数量" />
-        </el-form-item>
-        <el-form-item label="离开设备的基板数量，若plc只记录一个生产数量，也写入该字段" prop="outQuantity">
-          <el-input v-model="form.outQuantity" placeholder="请输入离开设备的基板数量，若plc只记录一个生产数量，也写入该字段" />
-        </el-form-item>
-        <el-form-item label="正常生产量" prop="okQuantity">
-          <el-input v-model="form.okQuantity" placeholder="请输入正常生产量" />
-        </el-form-item>
-        <el-form-item label="设备上报的报废数量" prop="nokQuantity">
-          <el-input v-model="form.nokQuantity" placeholder="请输入设备上报的报废数量" />
-        </el-form-item>
-        <el-form-item label="记录时间" prop="recordTime">
-          <el-date-picker clearable v-model="form.recordTime" type="date" value-format="timestamp" placeholder="选择记录时间" />
-        </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" placeholder="请输入版本号" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { createEquipmentQuantityRealtime, updateEquipmentQuantityRealtime, deleteEquipmentQuantityRealtime, getEquipmentQuantityRealtime, getEquipmentQuantityRealtimePage, exportEquipmentQuantityRealtimeExcel } from "@/api/base/equipmentQuantityRealtime";
-
-export default {
-  name: "EquipmentQuantityRealtime",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 后端用 设备生产数量实时列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentId: null,
-        equipmentName: null,
-        inQuantity: null,
-        outQuantity: null,
-        okQuantity: null,
-        nokQuantity: null,
-        recordTime: [],
-        version: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentQuantityRealtimePage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        equipmentId: undefined,
-        equipmentName: undefined,
-        inQuantity: undefined,
-        outQuantity: undefined,
-        okQuantity: undefined,
-        nokQuantity: undefined,
-        recordTime: undefined,
-        version: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加后端用 设备生产数量实时";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getEquipmentQuantityRealtime(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改后端用 设备生产数量实时";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateEquipmentQuantityRealtime(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentQuantityRealtime(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id;
-      this.$modal.confirm('是否确认删除后端用 设备生产数量实时编号为"' + id + '"的数据项?').then(function() {
-          return deleteEquipmentQuantityRealtime(id);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有后端用 设备生产数量实时数据项?').then(() => {
-          this.exportLoading = true;
-          return exportEquipmentQuantityRealtimeExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '后端用 设备生产数量实时.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/base/equipmentStatusLog/index.vue b/src/views/base/equipmentStatusLog/index.vue
deleted file mode 100644
index 5aa1b79a..00000000
--- a/src/views/base/equipmentStatusLog/index.vue
+++ /dev/null
@@ -1,289 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentName">
-        <el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="plc id" prop="plcId">
-        <el-input v-model="queryParams.plcId" placeholder="请输入plc id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="plc" prop="plc">
-        <el-input v-model="queryParams.plc" placeholder="请输入plc" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="状态，0正常 1计划停机 2故障" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态，0正常 1计划停机 2故障" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="记录时间" prop="recordTime">
-        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="持续时间（分钟），状态变动时记录并更新" prop="duration">
-        <el-input v-model="queryParams.duration" placeholder="请输入持续时间（分钟），状态变动时记录并更新" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="版本号" prop="version">
-        <el-input v-model="queryParams.version" placeholder="请输入版本号" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-status-log:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-status-log:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="设备id" align="center" prop="equipmentId" />
-      <el-table-column label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column label="plc id" align="center" prop="plcId" />
-      <el-table-column label="plc" align="center" prop="plc" />
-      <el-table-column label="状态，0正常 1计划停机 2故障" align="center" prop="status" />
-      <el-table-column label="记录时间" align="center" prop="recordTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recordTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="持续时间（分钟），状态变动时记录并更新" align="center" prop="duration" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:equipment-status-log:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-status-log:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设备id" prop="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备id" />
-        </el-form-item>
-        <el-form-item label="设备名称" prop="equipmentName">
-          <el-input v-model="form.equipmentName" placeholder="请输入设备名称" />
-        </el-form-item>
-        <el-form-item label="plc id" prop="plcId">
-          <el-input v-model="form.plcId" placeholder="请输入plc id" />
-        </el-form-item>
-        <el-form-item label="plc" prop="plc">
-          <el-input v-model="form.plc" placeholder="请输入plc" />
-        </el-form-item>
-        <el-form-item label="状态，0正常 1计划停机 2故障" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="记录时间" prop="recordTime">
-          <el-date-picker clearable v-model="form.recordTime" type="date" value-format="timestamp" placeholder="选择记录时间" />
-        </el-form-item>
-        <el-form-item label="持续时间（分钟），状态变动时记录并更新" prop="duration">
-          <el-input v-model="form.duration" placeholder="请输入持续时间（分钟），状态变动时记录并更新" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" placeholder="请输入版本号" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { createEquipmentStatusLog, updateEquipmentStatusLog, deleteEquipmentStatusLog, getEquipmentStatusLog, getEquipmentStatusLogPage, exportEquipmentStatusLogExcel } from "@/api/base/equipmentStatusLog";
-
-export default {
-  name: "EquipmentStatusLog",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 后端用 设备工作状态列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentId: null,
-        equipmentName: null,
-        plcId: null,
-        plc: null,
-        status: null,
-        recordTime: [],
-        duration: null,
-        remark: null,
-        version: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentStatusLogPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        equipmentId: undefined,
-        equipmentName: undefined,
-        plcId: undefined,
-        plc: undefined,
-        status: undefined,
-        recordTime: undefined,
-        duration: undefined,
-        remark: undefined,
-        version: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加后端用 设备工作状态";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getEquipmentStatusLog(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改后端用 设备工作状态";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateEquipmentStatusLog(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentStatusLog(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id;
-      this.$modal.confirm('是否确认删除后端用 设备工作状态编号为"' + id + '"的数据项?').then(function() {
-          return deleteEquipmentStatusLog(id);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有后端用 设备工作状态数据项?').then(() => {
-          this.exportLoading = true;
-          return exportEquipmentStatusLogExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '后端用 设备工作状态.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/base/equipmentStatusRealtime/index.vue b/src/views/base/equipmentStatusRealtime/index.vue
deleted file mode 100644
index 64b6e43f..00000000
--- a/src/views/base/equipmentStatusRealtime/index.vue
+++ /dev/null
@@ -1,296 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentName">
-        <el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="状态，0正常 1计划停机 2故障" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态，0正常 1计划停机 2故障" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否运行中" prop="run">
-        <el-select v-model="queryParams.run" placeholder="请选择是否运行中" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否发生运行错误" prop="error">
-        <el-select v-model="queryParams.error" placeholder="请选择是否发生运行错误" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="记录时间" prop="recordTime">
-        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="版本号" prop="version">
-        <el-input v-model="queryParams.version" placeholder="请输入版本号" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-status-realtime:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-status-realtime:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="设备id" align="center" prop="equipmentId" />
-      <el-table-column label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column label="状态，0正常 1计划停机 2故障" align="center" prop="status" />
-      <el-table-column label="是否运行中" align="center" prop="run" />
-      <el-table-column label="是否发生运行错误" align="center" prop="error" />
-      <el-table-column label="描述" align="center" prop="description" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="记录时间" align="center" prop="recordTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recordTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:equipment-status-realtime:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-status-realtime:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设备id" prop="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备id" />
-        </el-form-item>
-        <el-form-item label="设备名称" prop="equipmentName">
-          <el-input v-model="form.equipmentName" placeholder="请输入设备名称" />
-        </el-form-item>
-        <el-form-item label="状态，0正常 1计划停机 2故障" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="是否运行中" prop="run">
-          <el-radio-group v-model="form.run">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="是否发生运行错误" prop="error">
-          <el-radio-group v-model="form.error">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="描述">
-          <editor v-model="form.description" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="记录时间" prop="recordTime">
-          <el-date-picker clearable v-model="form.recordTime" type="date" value-format="timestamp" placeholder="选择记录时间" />
-        </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" placeholder="请输入版本号" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { createEquipmentStatusRealtime, updateEquipmentStatusRealtime, deleteEquipmentStatusRealtime, getEquipmentStatusRealtime, getEquipmentStatusRealtimePage, exportEquipmentStatusRealtimeExcel } from "@/api/base/equipmentStatusRealtime";
-import Editor from '@/components/Editor';
-
-export default {
-  name: "EquipmentStatusRealtime",
-  components: {
-    Editor
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 后端用 设备状态实时列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentId: null,
-        equipmentName: null,
-        status: null,
-        run: null,
-        error: null,
-        description: null,
-        remark: null,
-        recordTime: [],
-        version: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentStatusRealtimePage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        equipmentId: undefined,
-        equipmentName: undefined,
-        status: undefined,
-        run: undefined,
-        error: undefined,
-        description: undefined,
-        remark: undefined,
-        recordTime: undefined,
-        version: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加后端用 设备状态实时";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getEquipmentStatusRealtime(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改后端用 设备状态实时";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateEquipmentStatusRealtime(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentStatusRealtime(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id;
-      this.$modal.confirm('是否确认删除后端用 设备状态实时编号为"' + id + '"的数据项?').then(function() {
-          return deleteEquipmentStatusRealtime(id);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有后端用 设备状态实时数据项?').then(() => {
-          this.exportLoading = true;
-          return exportEquipmentStatusRealtimeExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '后端用 设备状态实时.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/base/equipmentTypeFile/index.vue b/src/views/base/equipmentTypeFile/index.vue
deleted file mode 100644
index e148348e..00000000
--- a/src/views/base/equipmentTypeFile/index.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备类型ID" prop="equipmentTypeId">
-        <el-input v-model="queryParams.equipmentTypeId" placeholder="请输入设备类型ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="原始名称" prop="fileName">
-        <el-input v-model="queryParams.fileName" placeholder="请输入原始名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="下载地址" prop="fileUrl">
-        <el-input v-model="queryParams.fileUrl" placeholder="请输入下载地址" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-type-file:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-type-file:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="设备类型ID" align="center" prop="equipmentTypeId" />
-      <el-table-column label="原始名称" align="center" prop="fileName" />
-      <el-table-column label="下载地址" align="center" prop="fileUrl" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:equipment-type-file:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-type-file:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设备类型ID" prop="equipmentTypeId">
-          <el-input v-model="form.equipmentTypeId" placeholder="请输入设备类型ID" />
-        </el-form-item>
-        <el-form-item label="原始名称" prop="fileName">
-          <el-input v-model="form.fileName" placeholder="请输入原始名称" />
-        </el-form-item>
-        <el-form-item label="下载地址" prop="fileUrl">
-          <el-input v-model="form.fileUrl" placeholder="请输入下载地址" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { createEquipmentTypeFile, updateEquipmentTypeFile, deleteEquipmentTypeFile, getEquipmentTypeFile, getEquipmentTypeFilePage, exportEquipmentTypeFileExcel } from "@/api/base/equipmentTypeFile";
-
-export default {
-  name: "EquipmentTypeFile",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 设备类型文件关联列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentTypeId: null,
-        fileName: null,
-        fileUrl: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        equipmentTypeId: [{ required: true, message: "设备类型ID不能为空", trigger: "blur" }],
-        fileName: [{ required: true, message: "原始名称不能为空", trigger: "blur" }],
-        fileUrl: [{ required: true, message: "下载地址不能为空", trigger: "blur" }],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentTypeFilePage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        equipmentTypeId: undefined,
-        fileName: undefined,
-        fileUrl: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加设备类型文件关联";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getEquipmentTypeFile(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改设备类型文件关联";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateEquipmentTypeFile(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentTypeFile(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id;
-      this.$modal.confirm('是否确认删除设备类型文件关联编号为"' + id + '"的数据项?').then(function() {
-          return deleteEquipmentTypeFile(id);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有设备类型文件关联数据项?').then(() => {
-          this.exportLoading = true;
-          return exportEquipmentTypeFileExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '设备类型文件关联.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/base/material/add-or-updata.vue b/src/views/base/material/add-or-updata.vue
deleted file mode 100644
index 60cdde54..00000000
--- a/src/views/base/material/add-or-updata.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 13:52:10
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-10 09:30:06
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		v-if="visible"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px"
-		label-position="top">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="原料名称" prop="name">
-					<el-input v-model="dataForm.name" clearable
-						placeholder="请输入原料名称" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="原料等级" prop="level">
-					<el-input v-model="dataForm.level" clearable
-						placeholder="请输入原料等级" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="原料编码" prop="code">
-					<el-input v-model="dataForm.code" readonly />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="单位" prop="unit">
-					<el-select
-						v-model="dataForm.unit"
-						filterable
-						clearable
-						:style="{ width: '100%' }"
-						placeholder="请选择单位">
-						<el-option
-							v-for="item in urlOptions.dictArr.dict0"
-							:key="item.id"
-							:label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import {
-	createMaterial,
-	updateMaterial,
-	getMaterial,
-  getCode
-} from '@/api/base/material';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				createURL: createMaterial,
-				updateURL: updateMaterial,
-				infoURL: getMaterial,
-        codeURL: getCode, //获取code接口（返回结果为dataForm.code字段）
-        dictNameList: ['unit_dict'], //数据字典name数组
-			},
-			dataForm: {
-				id: undefined,
-				code: '',
-				name: '',
-				unit: '',
-				level: '',
-			},
-			dataRule: {
-				name: [
-					{ required: true, message: '原料不能为空', trigger: 'blur' },
-				],
-				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
-			},
-		};
-	},
-	created() {},
-	methods: {
-	},
-};
-</script>
diff --git a/src/views/base/material/index.vue b/src/views/base/material/index.vue
deleted file mode 100644
index edcbbd8f..00000000
--- a/src/views/base/material/index.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-
-		<!-- 列表 -->
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="90"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="40%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { parseTime } from '@/filter/code-filter';
-import { publicFormatter } from "@/utils/dict";
-import {
-	deleteMaterial,
-	getMaterialPage,
-} from '@/api/base/material';
-
-const tableProps = [
-  {
-    prop: 'createTime',
-    label: '添加时间',
-    filter: parseTime,
-    minWidth: 150
-  },
-	{
-		prop: 'name',
-		label: '原料名称',
-	},
-	{
-		prop: 'code',
-		label: '原料编码',
-		width: 180,
-	},
-	{
-		prop: 'unit',
-		label: '单位',
-		filter: publicFormatter('unit_dict'),
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getMaterialPage,
-				deleteURL: deleteMaterial,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi(`base:material:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`base:material:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableData: [],
-			formConfig: [
-				{
-          type: 'input',
-          label: '原料名称',
-          placeholder: '原料名称',
-          param: 'name'
-				},
-				{
-          type: 'input',
-          label: '原料编码',
-          placeholder: '原料编码',
-          param: 'code'
-				},
-				{
-					type: this.$auth.hasPermi('base:material:query')
-						? 'button'
-						: '',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type:
-						this.$auth.hasPermi('base:material:create') &&
-						this.$auth.hasPermi('base:material:query')
-							? 'separate'
-							: '',
-				},
-				{
-					type: this.$auth.hasPermi('base:material:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name;
-					this.listQuery.code = val.code;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 20,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/base/materialPricing/add-or-updata.vue b/src/views/base/materialPricing/add-or-updata.vue
deleted file mode 100644
index 4cda5a5d..00000000
--- a/src/views/base/materialPricing/add-or-updata.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 13:52:10
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-11 09:05:16
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		v-if="visible"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px"
-		label-position="top">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="原料名称" prop="materialId">
-					<el-select
-						v-model="dataForm.materialId"
-						filterable
-						@change="setCode"
-						:style="{ width: '100%' }"
-						placeholder="请选择原料名称">
-						<el-option
-							v-for="item in MaterialList"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="原料编码" prop="code">
-					<el-input v-model="dataForm.code" clearable readonly />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="生效开始时间" prop="startTime">
-					<el-date-picker
-						v-model="dataForm.startTime"
-						type="date"
-						value-format="timestamp"
-						:style="{ width: '100%' }"
-						placeholder="选择开始时间"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="生效结束时间" prop="endTime">
-					<el-date-picker
-						v-model="dataForm.endTime"
-						type="date"
-						value-format="timestamp"
-						:style="{ width: '100%' }"
-						placeholder="选择结束时间"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="单价" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 75%"
-						v-model="dataForm.price"
-						clearable
-						placeholder="请输入允许留存时间" />
-					{{ unit }}
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="dataForm.remark"
-						clearable
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import {
-	createMaterialPricing,
-	updateMaterialPricing,
-	getMaterialPricing,
-} from '@/api/base/materialPricing';
-import { getMaterialPage } from '@/api/base/material';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				createURL: createMaterialPricing,
-				updateURL: updateMaterialPricing,
-				infoURL: getMaterialPricing,
-				optionArrUrl: [getMaterialPage], //需要获取下拉框的方法数组
-				dictNameList: ['unit_dict'], //数据字典name数组
-			},
-			dataForm: {
-				id: null,
-				code: '',
-				materialId: '',
-				price: '',
-				startTime: new Date().getTime(),
-				endTime: null,
-				remark: '',
-			},
-			setData: true,
-			MaterialList: [],
-			unit: '元/吨',
-			dataRule: {
-				materialId: [
-					{ required: true, message: '原料不能为空', trigger: 'blur' },
-				],
-				price: [{ required: true, message: '单价不能为空', trigger: 'blur' }],
-				startTime: [
-					{
-						required: true,
-						message: '生效开始时间不能为空',
-						trigger: 'change',
-					},
-				],
-			},
-		};
-	},
-	created() {},
-	methods: {
-		getArr() {
-			getMaterialPage({ pageSize: 100, pageNo: 1 }).then((response) => {
-				this.MaterialList = response.data.list;
-			});
-		},
-		setDataForm() {
-			if (this.MaterialList.length > 0) {
-				this.setCode();
-			} else {
-				setTimeout(this.setCode(), 1000);
-			}
-		},
-		setCode() {
-			this.MaterialList.forEach((item) => {
-				if (item.id === this.dataForm.materialId) {
-					this.dataForm.code = item.code;
-					this.unit =
-						'元/' +
-						this.urlOptions.dictArr.dict0.find((d) => d.value === item.unit)
-							.label;
-				}
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/base/materialPricing/connectTime.vue b/src/views/base/materialPricing/connectTime.vue
deleted file mode 100644
index a22daaaa..00000000
--- a/src/views/base/materialPricing/connectTime.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-12-05 13:45:59
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-10 15:20:11
- * @Description
--->
-<template>
-	<div>
-		<span>{{ parseTime(injectData.startTime,'{y}年{m}月{d}日') + '-' + (parseTime(injectData.endTime)?parseTime(injectData.endTime,'{y}年{m}月{d}日'):'永久') }}</span>
-	</div>
-</template>
-<script>
-export default {
-	name: '',
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-};
-</script>
diff --git a/src/views/base/materialPricing/index.vue b/src/views/base/materialPricing/index.vue
deleted file mode 100644
index 006fc943..00000000
--- a/src/views/base/materialPricing/index.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-
-		<!-- 列表 -->
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="90"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="40%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import connectTime from './connectTime';
-import basicPage from '@/mixins/basic-page';
-import { parseTime } from '@/filter/code-filter';
-import {
-	deleteMaterialPricing,
-	getMaterialPricingPage,
-} from '@/api/base/materialPricing';
-import { getMaterialPage } from '@/api/base/material';
-
-const tableProps = [
-	{
-		prop: 'name',
-		label: '原料名称',
-	},
-	{
-		prop: 'code',
-		label: '原料编码',
-		width: 180,
-	},
-	{
-		prop: 'price',
-		label: '单价(元/吨)',
-		align: 'right',
-	},
-	{
-		prop: 'createTime',
-		label: '生效时间',
-		width: 235,
-		subcomponent: connectTime,
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getMaterialPricingPage,
-				deleteURL: deleteMaterialPricing,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi(`base:material-pricing:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`base:material-pricing:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '原料名称',
-					selectOptions: [],
-					param: 'name',
-					filterable: true,
-				},
-				{
-					type: this.$auth.hasPermi('base:material-pricing:query')
-						? 'button'
-						: '',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type:
-						this.$auth.hasPermi('base:material-pricing:create') &&
-						this.$auth.hasPermi('base:material-pricing:query')
-							? 'separate'
-							: '',
-				},
-				{
-					type: this.$auth.hasPermi('base:material-pricing:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {
-		getMaterialPage({ pageSize: 100, pageNo: 1 }).then((response) => {
-			this.formConfig[0].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.materialId = val.name;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 20,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/core/analysis/LineChart.vue b/src/views/core/analysis/LineChart.vue
deleted file mode 100644
index 5fb4a056..00000000
--- a/src/views/core/analysis/LineChart.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2023-09-13 09:02:25
- * @LastEditTime: 2023-10-16 14:56:58
- * @LastEditors: DY
- * @Description:
--->
-<template>
-  <div :class="className" :style="{height:height,width:width}" />
-</template>
-
-<script>
-import * as echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
-// import resize from './mixins/resize'
-
-export default {
-  // mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
-    },
-    width: {
-      type: String,
-      default: '100%'
-    },
-    height: {
-      type: String,
-      default: '350px'
-    },
-    // autoResize: {
-    //   type: Boolean,
-    //   default: true
-    // }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  // watch: {
-  //   chartData: {
-  //     deep: true,
-  //     handler(val) {
-  //       this.setOptions(val)
-  //     }
-  //   }
-  // },
-  mounted() {
-    // this.$nextTick(() => {
-    //   this.initChart()
-    // })
-  },
-  // beforeDestroy() {
-  //   if (!this.chart) {
-  //     return
-  //   }
-  //   this.chart.dispose()
-  //   this.chart = null
-  // },
-  methods: {
-    initChart(xData, yData,lineName) {
-      console.log( '打印结果', xData,yData, lineName);
-      this.chart = echarts.init(this.$el, 'macarons')
-      this.setOptions(xData, yData, lineName)
-    },
-    setOptions(xData, yData, lineName) {
-      console.log('da', lineName)
-      let seriesData = []
-        lineName.forEach((item,index) => {
-          seriesData.push({
-            name: item,
-            data: yData[index],
-            type: 'line',
-          })
-        })
-      this.chart.setOption({
-        xAxis: {
-          type: 'category',
-          data: xData
-        },
-        legend: {
-          data:lineName
-        },
-        yAxis: {
-          type: 'value'
-        },
-        series: seriesData
-      }, true)
-    }
-  }
-}
-</script>
diff --git a/src/views/core/analysis/balanceAnalysis/BarChart.vue b/src/views/core/analysis/balanceAnalysis/BarChart.vue
deleted file mode 100644
index 987288bf..00000000
--- a/src/views/core/analysis/balanceAnalysis/BarChart.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-	<div
-		ref="lineChart"
-		:id="id"
-		:class="className"
-		:style="{ height: height, width: width, marginLeft: '10px' }" />
-</template>
-
-<script>
-import * as echarts from 'echarts';
-require('echarts/theme/macarons'); // echarts theme
-import resize from '@/utils/chartMixins/resize';
-import { parseTime } from '../../mixins/code-filter';
-
-const animationDuration = 1000;
-export default {
-	name: 'lineChart',
-	mixins: [resize],
-	props: {
-		id: {
-			type: String,
-			default: 'chart',
-		},
-		className: {
-			type: String,
-			default: 'chart',
-		},
-		title: {
-			type: String,
-			default: '',
-		},
-		width: {
-			type: String,
-			default: '100%',
-		},
-		height: {
-			type: String,
-			default: '300px',
-		},
-		barData: {
-			type: Object,
-			default: () => {},
-		},
-	},
-	data() {
-		return {
-			chart: null,
-		};
-	},
-	mounted() {
-		if (!this.chart) {
-			this.chart = echarts.init(this.$refs.lineChart);
-			this.$nextTick(() => {
-				this.initChart();
-			});
-		}
-	},
-	beforeDestroy() {
-		if (!this.chart) {
-			return;
-		}
-		this.chart.dispose();
-		this.chart = null;
-	},
-	watch: {
-		barData: {
-			handler() {
-				if (this.chart) {
-					this.$nextTick(() => {
-						this.initChart();
-					});
-				} else {
-					this.$nextTick(() => {
-						this.chart = echarts.init(this.$refs.lineChart);
-						this.initChart();
-					});
-				}
-			},
-			deep: true,
-			immediate: true,
-		},
-	},
-  methods: {
-    getUniqueTimes() {
-      const { edgeCt, temperCt, downCt } = this.barData;
-      // 合并所有包含时间的数组
-      const allTimeEntries = [...(edgeCt || []), ...(temperCt || []), ...(downCt || [])];
-      // 提取时间戳并去重（使用 Set）
-      const uniqueTimes = [...new Set(allTimeEntries.map(item => item.recordTime))];
-      // 按时间戳排序（确保时间顺序正确）
-      return uniqueTimes.sort((a, b) => a - b);
-    },
-    initChart() {
-      const uniqueTimes = this.getUniqueTimes();
-			const _this = this;
-			this.chart.setOption({
-				title: {
-					text: this.title
-						? '{space|}{tip|}{space|}{value|' + this.title + '}'
-						: '',
-					textStyle: {
-						rich: {
-							tip: {
-								width: 6,
-								height: 6,
-								borderRadius: 50,
-								backgroundColor: '#288AFF',
-							},
-							space: {
-								width: 8,
-							},
-							value: {
-								fontSize: 14,
-								color: 'black',
-							},
-						},
-					},
-				},
-				color: ['#288AFF', '#8EF0AB', '#FFDC94'],
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'cross',
-						crossStyle: {
-							color: '#999',
-						},
-					},
-				},
-				legend: {
-					data: ['磨边节拍', '钢化节拍', '下片节拍'],
-				},
-				grid: {
-					containLabel: true,
-				},
-				xAxis: {
-					type: 'category',
-          data: uniqueTimes.map(time => parseTime(time, '{m}-{d} {h}:{i}')),
-					axisPointer: {
-						type: 'shadow',
-					},
-				},
-				yAxis: [
-					{
-						type: 'value',
-						name: '节拍 pcs/min',
-						min: 0,
-						axisLabel: {
-							formatter: '{value}',
-						},
-					},
-				],
-				dataZoom: [
-					{
-						type: 'inside',
-						start: 0,
-						end: 100,
-					},
-					{
-						start: 0,
-						end: 100,
-					},
-				],
-        series: [
-          {
-            name: '磨边节拍',
-            type: 'line',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + 'pcs/min';
-              },
-            },
-            data: uniqueTimes.map(time => {
-              // 查找当前时间对应的 ct 值，没有则补 null（图表中会显示为断点）
-              const match = this.barData.edgeCt.find(item => item.recordTime === time);
-              return match ? match.ct : 0;
-            })
-          },
-          // 钢化节拍
-          {
-            name: '钢化节拍',
-            type: 'line',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + 'pcs/min';
-              },
-            },
-            data: uniqueTimes.map(time => {
-              const match = this.barData.temperCt.find(item => item.recordTime === time);
-              return match ? match.ct : 0;
-            })
-          },
-          // 下片节拍
-          {
-            name: '下片节拍',
-            type: 'line',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + 'pcs/min';
-              },
-            },
-            data: uniqueTimes.map(time => {
-              const match = this.barData.downCt.find(item => item.recordTime === time);
-              return match ? match.ct : 0;
-            })
-          }
-        ]
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/core/analysis/balanceAnalysis/eq-detail.vue b/src/views/core/analysis/balanceAnalysis/eq-detail.vue
deleted file mode 100644
index 73a41acd..00000000
--- a/src/views/core/analysis/balanceAnalysis/eq-detail.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-24 14:47:58
- * @LastEditors: zwq
- * @LastEditTime: 2025-01-09 10:04:17
- * @Description:
--->
-<template>
-	<div>
-		<base-table
-			:page="1"
-			:limit="999"
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			max-height="400"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableData.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<div v-if="eqChartData.length > 0" style="margin-top: 10px">
-			<search-bar
-				:formConfigs="formConfig"
-				ref="searchBarForm1"
-				@headBtnClick="buttonClick" />
-			<div
-				ref="lineChart"
-				id="chart"
-				:style="{ height: '400px', width: '100%', marginLeft: '10px' }" />
-		</div>
-	</div>
-</template>
-
-<script>
-import { getNewCTDet, getNewCTCharts } from '@/api/core/analysis/index';
-import * as echarts from 'echarts';
-require('echarts/theme/macarons'); // echarts theme
-import resize from '@/utils/chartMixins/resize';
-import { parseTime } from '../../mixins/code-filter';
-
-const tableProps = [
-	{
-		prop: 'equipmentName',
-		label: '设备',
-	},
-	{
-		prop: 'size',
-		label: '规格',
-		showOverflowtooltip: true,
-	},
-	{
-		prop: 'process',
-		label: '产品工艺',
-	},
-	{
-		prop: 'standardCt',
-		label: '标准节拍pcs/min',
-	},
-	{
-		prop: 'ct',
-		label: '当前节拍pcs/min',
-	},
-];
-export default {
-	mixins: [resize],
-	data() {
-		return {
-			tableProps,
-			tableData: [],
-			tableBtn: [
-				{
-					type: 'eqChart',
-					btnName: '趋势图',
-				},
-			].filter((v) => v),
-			dataListLoading: false,
-			time: {},
-			eqChartData: [],
-			eqName: null,
-			equipmentId: null,
-			chart: null,
-			formConfig: [
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'timestamp',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'timeVal',
-					width: 350,
-					clearable: false,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-		};
-	},
-	components: {},
-	created() {},
-	mounted() {},
-	beforeDestroy() {
-		if (!this.chart) {
-			return;
-		}
-		this.chart.dispose();
-		this.chart = null;
-	},
-	methods: {
-		// 获取数据列表
-		init(lId, startTime, endTime) {
-			this.eqChartData = [];
-			this.time.startTime = startTime;
-			this.time.endTime = endTime;
-			this.dataListLoading = true;
-      getNewCTDet({ lineId: [lId], startTime, endTime }).then((response) => {
-				this.tableData = response.data;
-				this.dataListLoading = false;
-			});
-		},
-		handleClick(val) {
-			const data = {
-				...this.time,
-				equipmentId: val.data.equipmentId,
-			};
-			this.eqName = val.data.equipmentName;
-			this.equipmentId = val.data.equipmentId;
-			getNewCTCharts(data).then((response) => {
-				this.eqChartData = response.data;
-				this.$nextTick(() => {
-					this.$refs.searchBarForm1.formInline.timeVal = [
-						this.time.startTime,
-						this.time.endTime,
-					];
-					this.initChart();
-				});
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.time.startTime = val.timeVal ? val.timeVal[0] : undefined;
-					this.time.endTime = val.timeVal ? val.timeVal[1] : undefined;
-					const data = {
-						...this.time,
-						equipmentId: this.equipmentId,
-					};
-					getNewCTCharts(data).then((response) => {
-						this.eqChartData = response.data;
-						this.$nextTick(() => {
-							this.initChart();
-						});
-					});
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		initChart() {
-			this.chart = echarts.init(this.$refs.lineChart);
-			const _this = this;
-			this.chart.setOption({
-				title: {
-					text: this.eqName
-						? '{space|}{tip|}{space|}{value|' + this.eqName + ' 节拍趋势图' + '}'
-						: '',
-					textStyle: {
-						rich: {
-							tip: {
-								width: 6,
-								height: 6,
-								borderRadius: 50,
-								backgroundColor: '#288AFF',
-							},
-							space: {
-								width: 8,
-							},
-							value: {
-								fontSize: 14,
-								color: 'black',
-							},
-						},
-					},
-				},
-				color: ['#288AFF', '#8EF0AB', '#FFDC94'],
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'cross',
-						crossStyle: {
-							color: '#999',
-						},
-					},
-				},
-				legend: {
-					data: ['当前节拍', '标准节拍'],
-				},
-				grid: {
-					containLabel: true,
-				},
-				xAxis: {
-					type: 'category',
-					data: this.eqChartData[0].ct.map((item) => {
-						return parseTime(item.recordTime, '{m}-{d} {h}:{i}');
-					}),
-					axisPointer: {
-						type: 'shadow',
-					},
-				},
-				yAxis: [
-					{
-						type: 'value',
-						name: '节拍',
-						min: 0,
-						interval: 20,
-						axisLabel: {
-							formatter: '{value} pcs/min',
-						},
-					},
-				],
-				dataZoom: [
-					{
-						type: 'inside',
-						start: 0,
-						end: 100,
-					},
-					{
-						start: 0,
-						end: 100,
-					},
-				],
-				series: [
-					{
-						name: '标准节拍',
-						type: 'line',
-						tooltip: {
-							valueFormatter: function (value) {
-								return value + 'pcs/min';
-							},
-						},
-						data: this.eqChartData[0].ct.map((item) => {
-							return item.standardCt;
-						}),
-					},
-					{
-						name: '当前节拍',
-						type: 'line',
-						tooltip: {
-							valueFormatter: function (value) {
-								return value + 'pcs/min';
-							},
-						},
-						data: this.eqChartData[0].ct.map((item) => {
-							return item.ct;
-						}),
-					},
-				],
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/core/analysis/balanceAnalysis/index-old.vue b/src/views/core/analysis/balanceAnalysis/index-old.vue
deleted file mode 100644
index 4e0564bd..00000000
--- a/src/views/core/analysis/balanceAnalysis/index-old.vue
+++ /dev/null
@@ -1,296 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<div v-if="tableData.length">
-			<base-table
-				v-loading="dataListLoading"
-				:span-method="mergeColumnHandler"
-				:max-height="tableH"
-				:table-props="tableProps"
-				:table-data="tableData" />
-			<SearchBar :formConfigs="[{ label: '产线平衡分析图', type: 'title' }]" />
-			<balance-chart ref="lineChart" />
-		</div>
-		<div v-else class="no-data-bg"></div>
-		<!-- <pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" /> -->
-	</div>
-</template>
-
-<script>
-// import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import { getCT } from '@/api/core/analysis/index';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
-import BalanceChart from '../balanceChart';
-import { time } from 'echarts';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-// import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
-
-// const tableProps = [
-// 	// {
-//   //   prop: 'lineName',
-// 	// 	label: '产线',
-// 	// 	align: 'center',
-// 	// },
-//   // {
-//   //   prop: 'sum',
-//   //   label: '合计',
-//   //   align: 'center',
-//   // },
-//   // {
-//   //   prop: 'dynamicValue',
-//   //   label: 'dynamicName',
-//   //   align: 'center',
-//   //   children:[
-
-//   //   ]
-//   // }
-// ];
-
-export default {
-	components: {
-		BalanceChart,
-	},
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getCT,
-			},
-			tableProps: [],
-			dataListLoading: false,
-			tableData: [],
-			listQuery: {
-				// time: ''
-				endTime: undefined,
-				lineId: undefined,
-				startTime: undefined,
-			},
-			timeList: [],
-			spanArr: [],
-			xData: [],
-			yData: [],
-			optionArrUrl: [getProductionLinePage],
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'lineIds',
-					defaultSelect: '',
-					multiple: false,
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					width: 350,
-					param: 'time',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-		};
-	},
-	created() {
-		this.getArr();
-	},
-	methods: {
-		getArr() {
-			const params = {
-				page: 1,
-				limit: 500,
-			};
-			this.optionArrUrl.forEach((item, index) => {
-				item(params).then((response) => {
-					this.formConfig[index].selectOptions = response.data.list;
-				});
-			});
-		},
-		setRowSpan(arr) {
-			let count = 0;
-			arr.forEach((item, index) => {
-				if (index === 0) {
-					this.spanArr.push(1);
-				} else {
-					if (item === arr[index - 1]) {
-						this.spanArr[count] += 1;
-						this.spanArr.push(0);
-					} else {
-						count = index;
-						this.spanArr.push(1);
-					}
-				}
-			});
-		},
-		/** 合并table列的规则 */
-		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
-			if (columnIndex == 0) {
-				if (this.spanArr[rowIndex]) {
-					return [
-						this.spanArr[rowIndex], // row span
-						1, // col span
-					];
-				} else {
-					return [0, 0];
-				}
-			}
-		},
-		getData() {
-			// this.listQuery.lineId = '1672847052717821953'
-			// this.listQuery.startTime = '1693497600000';
-			// this.listQuery.endTime = '1693843200000';
-			this.urlOptions.getDataListURL(this.listQuery).then((res) => {
-				console.log(res);
-				let arr = [
-					{
-						prop: 'sectionName',
-						label: '工段',
-						align: 'center',
-					},
-					{
-						prop: 'equName',
-						label: '设备',
-						align: 'center',
-            width: 150
-					},
-				];
-				let sectionArr = [];
-				res.data.data.forEach((ele, index) => {
-					let tempData = [];
-					let ggData = [];
-					let sbluData = [];
-					let sbsjData = [];
-					let cxluData = [];
-					let cxsjData = [];
-					ele.data.forEach((item, index) => {
-						item.children.forEach((params) => {
-							if (params.dynamicName === '生产规格') {
-								tempData[item.dynamicName + '_gg'] = params.dynamicValue;
-								ggData[index] = params.dynamicValue;
-							} else if (params.dynamicName === '设备理论速度') {
-								tempData[item.dynamicName + '_sblu'] = params.dynamicValue;
-								sbluData[index] = params.dynamicValue;
-							} else if (params.dynamicName === '设备实际速度') {
-								tempData[item.dynamicName + '_sbsj'] = params.dynamicValue;
-								sbsjData[index] = params.dynamicValue;
-							} else if (params.dynamicName === '产线理论速度') {
-								tempData[item.dynamicName + '_cxlu'] = params.dynamicValue;
-								cxluData[index] = params.dynamicValue;
-							} else if(params.dynamicName === '产线实际速度') {
-								tempData[item.dynamicName + '_cxsj'] = params.dynamicValue;
-								cxsjData[index] = params.dynamicValue;
-							}
-						});
-					});
-					const equipment = {
-						name: ele.equName,
-						ggData: ggData,
-						sbluData: sbluData,
-						sbsjData: sbsjData,
-						cxluData: cxluData,
-						cxsjData: cxsjData,
-					};
-					tempData['equName'] = ele.equName;
-					tempData['sectionName'] = ele.sectionName;
-					this.tableData.push(tempData);
-					const { sectionName } = tempData;
-					sectionArr.push(sectionName);
-					this.yData.push(equipment);
-				});
-				this.setRowSpan(sectionArr);
-				res.data.nameData.forEach((item) => {
-					this.timeList.push(item.name);
-				});
-				const timeArray = Array.from(new Set(this.timeList));
-        console.log(timeArray)
-				for (const times of timeArray) {
-					if (times !== '生产规格' && times !== '设备理论速度' && times !== '设备实际速度'
-             && times !== '产线理论速度' && times !== '产线实际速度'
-          ) {
-						const subprop = {
-							label: times,
-							align: 'center',
-							children: [
-								{ prop: times + '_gg', label: '生产规格', align: 'center' },
-								{ prop: times + '_sblu', label: '设备理论速度[片/min]', align: 'center' },
-								{ prop: times + '_sbsj', label: '设备实际速度[片/min]', align: 'center' },
-								{ prop: times + '_cxlu', label: '产线理论速度[片/min]', align: 'center' },
-								{ prop: times + '_cxsj', label: '产线实际速度[片/min]', align: 'center' },
-							],
-						};
-						arr.push(subprop);
-						this.xData.push(times);
-					}
-				}
-				this.tableProps = arr;
-
-        console.log(this.$refs)
-        this.$nextTick(()=>{
-          this.$refs.lineChart.initChart(this.xData, this.yData);
-        })
-				// this.total = response.data.total;
-				// this.dataListLoading = false;
-			});
-		},
-		buttonClick(val) {
-			// console.log(val)
-			switch (val.btnName) {
-				case 'search':
-					// this.listQuery.pageNo = 1;
-					// this.listQuery.pageSize = 10;
-					this.listQuery.lineId = val.lineIds;
-					this.listQuery.startTime = val.time
-						? String(new Date(val.time[0]).getTime())
-						: undefined;
-					this.listQuery.endTime = val.time
-						? String(new Date(val.time[1]).getTime())
-						: undefined;
-					if (val.time && val.lineIds) {
-						this.tableData = [];
-						this.xData = [];
-						this.yData = [];
-						this.tableProps = [];
-						this.spanArr = [];
-						this.timeList = [];
-						this.getData();
-					} else {
-						this.$message({
-							message: '请选择产线和时间',
-							type: 'warning',
-						});
-					}
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue
deleted file mode 100644
index 1ca92fc4..00000000
--- a/src/views/core/analysis/balanceAnalysis/index.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2025-01-09 10:27:53
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
-			@headBtnClick="buttonClick" />
-		<div v-if="showData.length">
-			<base-table
-				class="right-aside"
-				v-loading="dataListLoading"
-				:table-props="tableProps"
-				:page="1"
-				:limit="999"
-				:table-data="showData">
-				<method-btn
-					v-if="showData.length"
-					slot="handleBtn"
-					:width="80"
-					label="操作"
-					:method-list="tableBtn"
-					@clickBtn="handleClick" />
-			</base-table>
-			<barChart
-				v-for="item in chartData"
-				:key="item.name + 'echart'"
-				style="margin-top: 50px"
-				height="600px"
-				:id="item.name + 'echart'"
-				:title="item.name + ' 节拍趋势图'"
-				:bar-data="item" />
-		</div>
-		<div v-else class="no-data-bg"></div>
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			close-on-click-modal
-      top="0"
-			width="50%">
-			<eq-detail ref="eqDetail" />
-			<slot name="footer">
-				<el-row slot="footer" type="flex" justify="end">
-					<el-col :span="24">
-						<el-button size="small" class="btnTextStyle" @click="handleCancel">
-							取消
-						</el-button>
-					</el-col>
-				</el-row>
-			</slot>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import eqDetail from './eq-detail';
-import { parseTime } from '../../mixins/code-filter';
-import { getPdList } from '@/api/core/monitoring/auto';
-import { getNewCTNow, getNewCTCharts } from '@/api/core/analysis/index';
-import { getFactoryPage } from '@/api/core/base/factory';
-// import codeFilter from '../../mixins/code-filter'
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
-import barChart from './BarChart.vue';
-
-const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂',
-	},
-	{
-		prop: 'lineName',
-		label: '产线',
-	},
-	{
-		prop: 'size',
-		label: '规格',
-		showOverflowtooltip: true,
-	},
-	{
-		prop: 'process',
-		label: '产品工艺',
-	},
-	{
-		prop: 'edgeCt',
-		label: '磨边当前节拍pcs/min',
-	},
-	{
-		prop: 'temperCt',
-		label: '钢化当前节拍pcs/min',
-	},
-	{
-		prop: 'downCt',
-		label: '下片当前节拍pcs/min',
-	},
-];
-
-export default {
-	components: {
-		barChart,
-		eqDetail,
-	},
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getNewCTNow,
-			},
-			listQuery: {
-				lineId: [],
-			},
-			fileName: '',
-			dataListLoading: false,
-			tableProps,
-			tableBtn: [
-				{
-					type: 'eq',
-					btnName: '详情',
-				},
-			].filter((v) => v),
-			showData: [],
-			tableData: [],
-			chartData: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'lineId',
-					multiple: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'timestamp',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'timeVal',
-					width: 350,
-					clearable: false,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-				// 	type: 'button',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			addOrEditTitle: '',
-			addOrUpdateVisible: false,
-		};
-	},
-	created() {
-		// 获取当前时间
-		const now = new Date();
-		// 获取前一天的同一时间
-		const yesterday = new Date(now.getTime());
-		// 设置为00:00:00
-		yesterday.setHours(0, 0, 0, 0);
-		// 设置为23:59:59
-		const end = new Date(yesterday.getTime());
-		end.setHours(23, 59, 59, 59);
-		this.listQuery.startTime = yesterday.getTime();
-		this.listQuery.endTime = end.getTime();
-		this.$nextTick(() => {
-			this.$refs.searchBarForm.formInline.timeVal = [
-				yesterday.getTime(),
-				end.getTime(),
-			];
-		});
-		this.getDataList();
-		this.getPdLineList();
-	},
-	methods: {
-		handleExport() {
-			let tables = document.querySelector('.el-table').cloneNode(true);
-			const fix = tables.querySelector('.el-table__fixed');
-			const fixRight = tables.querySelector('.el-table__fixed-right');
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'));
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'));
-			}
-			let exportTable = XLSX.utils.table_to_book(tables);
-
-			var exportTableOut = XLSX.write(exportTable, {
-				bookType: 'xlsx',
-				bookSST: true,
-				type: 'array',
-			});
-			// sheetjs.xlsx为导出表格的标题名称
-			try {
-				FileSaver.saveAs(
-					new Blob([exportTableOut], {
-						type: 'application/octet-stream',
-					}),
-					this.fileName + '产线自动报表.xlsx'
-				);
-			} catch (e) {
-				if (typeof console !== 'undefined') console.log(e, exportTableOut);
-			}
-			return exportTableOut;
-		},
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.lineId = val.lineId ? val.lineId : [];
-					this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined;
-					this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined;
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-		getDataList() {
-			this.dataListLoading = true;
-			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
-				this.tableData = response.data;
-				this.dataListLoading = false;
-				this.showData = this.tableData;
-			});
-			getNewCTCharts(this.listQuery).then((response) => {
-				this.chartData = response.data;
-			});
-		},
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.lineId = [];
-			this.$refs.searchBarForm.formInline.lineId = undefined;
-			getPdList(value).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
-		handleClick(val) {
-			this.addOrUpdateVisible = true;
-			this.addOrEditTitle =
-				val.data?.factoryName + '-' + val.data?.lineName + ' 详情';
-			this.$nextTick(() => {
-				this.$refs.eqDetail.init(
-					val.data.lineId,
-					this.listQuery.startTime,
-					this.listQuery.endTime
-				);
-			});
-		},
-		handleCancel() {
-			this.addOrUpdateVisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.handleCancel();
-		},
-	},
-};
-</script>
diff --git a/src/views/core/analysis/balanceChart.vue b/src/views/core/analysis/balanceChart.vue
deleted file mode 100644
index 20a80609..00000000
--- a/src/views/core/analysis/balanceChart.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2023-09-13 09:02:25
- * @LastEditTime: 2024-11-26 15:52:29
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-  <div>
-    <div style="margin: 20px">
-      <el-button v-for="(item, index) in buttonList" :key="index" :class="[item.actived ? 'activeButton': 'normalButton']" @click="changeChart(index)">{{ item.name }}</el-button>
-    </div>
-    <div ref="chartDiv" :class="className" :style="{height:height,width:width}" />
-  </div>
-</template>
-
-<script>
-import * as echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
-// import resize from './mixins/resize'
-
-export default {
-  // mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
-    },
-    width: {
-      type: String,
-      default: '100%'
-    },
-    height: {
-      type: String,
-      default: '350px'
-    },
-    // autoResize: {
-    //   type: Boolean,
-    //   default: true
-    // }
-  },
-  data() {
-    return {
-      chart: null,
-      dataArray: [],
-      xDatas: [],
-      buttonList: []
-    }
-  },
-  mounted() {
-  },
-  methods: {
-    changeChart(index) {
-      this.setOptions(this.xDatas, this.dataArray[index])
-      this.buttonList.forEach((item, s) => {
-        if (index === s) {
-          // item.actived = true
-          this.$nextTick(() =>{
-            // item.actived = true
-            this.$set(item, 'actived', true)
-          })
-        } else {
-          // item.actived = false
-          this.$nextTick(() =>{
-            // item.actived = false
-            this.$set(item, 'actived', false)
-          })
-          // this.$set(item, 'actived', false)
-        }
-      })
-      console.log('看一下数22222据', this.dataArray)
-    },
-    initChart(xData, yData, lineName) {
-      this.dataArray = yData
-      this.buttonList = this.dataArray.map((item, index) => {
-        return {
-          'name': item.name,
-          'actived': index === 0 ? true : false
-        }
-      })
-      console.log('看一下数据', this.dataArray)
-      this.xDatas = xData
-      this.chart = echarts.init(this.$refs.chartDiv, 'macarons')
-      this.setOptions(xData, yData[0], lineName)
-    },
-    setOptions(xData, dataList, lineName) {
-      // let seriesData = []
-        // lineName.forEach((item,index) => {
-        //   seriesData.push({
-        //     name: item,
-        //     data: yData[index],
-        //     type: 'line',
-        //   })
-        // })
-      this.chart.setOption({
-        xAxis: {
-          type: 'category',
-          data: xData
-        },
-        tooltip: {
-          trigger: 'axis'
-        },
-        legend: {
-          data:lineName
-        },
-        yAxis: {
-          type: 'value'
-        },
-        series: [
-          {
-            name: '生产规格',
-            data: dataList.ggData,
-            type: 'line',
-          },
-          {
-            name: '设备理论速度',
-            data: dataList.sbluData,
-            type: 'line',
-          },
-          {
-            name: '设备实际速度',
-            data: dataList.sbsjData,
-            type: 'line',
-          },
-          {
-            name: '产线理论速度',
-            data: dataList.cxluData,
-            type: 'line',
-          },
-          {
-            name: '产线实际速度',
-            data: dataList.cxsjData,
-            type: 'line',
-          }
-        ]
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.activeButton {
-  background-color: rgb(93,159,255);
-}
-.normalButton {
-  background-color: none;
-}
-</style>
diff --git a/src/views/core/analysis/yieldAnalysis/index.vue b/src/views/core/analysis/yieldAnalysis/index.vue
deleted file mode 100644
index 9bb73259..00000000
--- a/src/views/core/analysis/yieldAnalysis/index.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<div v-if="tableData.length">
-			<base-table
-				v-loading="dataListLoading"
-				:table-props="tableProps"
-				:max-height="tableH"
-				:table-data="tableData" />
-			<SearchBar :formConfigs="[{ label: '产品产量对比图', type: 'title' }]" />
-			<line-chart ref="lineChart" />
-		</div>
-		<div v-else class="no-data-bg"></div>
-		<!-- <pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" /> -->
-	</div>
-</template>
-
-<script>
-// import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import { getYieldAnalysisPageData } from '@/api/core/analysis/index';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
-import lineChart from '../LineChart';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-// import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
-
-// const tableProps = [
-// 	// {
-//   //   prop: 'lineName',
-// 	// 	label: '产线',
-// 	// 	align: 'center',
-// 	// },
-//   // {
-//   //   prop: 'sum',
-//   //   label: '合计',
-//   //   align: 'center',
-//   // },
-//   // {
-//   //   prop: 'dynamicValue',
-//   //   label: 'dynamicName',
-//   //   align: 'center',
-//   //   children:[
-
-//   //   ]
-//   // }
-// ];
-
-export default {
-	components: {
-		lineChart,
-	},
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getYieldAnalysisPageData,
-			},
-			tableProps: [],
-			dataListLoading: false,
-			tableData: [],
-			listQuery: {
-				lineIds: [],
-				time: '',
-			},
-			dateLabelList: [],
-			optionArrUrl: [getProductionLinePage],
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'lineIds',
-					defaultSelect: [],
-					multiple: true,
-					filterable: true,
-					width: 200,
-				},
-				{
-					type: 'datePicker',
-					label: '时间',
-					dateType: 'month',
-					format: 'yyyy-MM',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'time',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-		};
-	},
-	created() {
-		this.getArr();
-	},
-	methods: {
-		getArr() {
-			const params = {
-				page: 1,
-				limit: 500,
-			};
-			this.optionArrUrl.forEach((item, index) => {
-				item(params).then((response) => {
-					this.formConfig[index].selectOptions = response.data.list;
-					// this.formConfig[0].defaultSelect = response.data.list[0].id
-					// this.$set(this.formConfig[0], 'defaultSelect', response.data.list[0].id)
-				});
-			});
-		},
-		getData() {
-			// this.listQuery.lineIds = ['1672847052717821953']
-			// this.listQuery.productId = val.productId;
-			// this.listQuery.time = '1694486098000';
-			this.urlOptions.getDataListURL(this.listQuery).then((res) => {
-				let arr = [
-					{
-						prop: 'lineName',
-						label: '产线',
-						fixed: 'left',
-					},
-					{
-						prop: 'sum',
-						label: '合计[片]',
-						fixed: 'left',
-					},
-					{
-						prop: res.data ? res.data.nameData[0].name : undefined,
-						label: res.data ? res.data.nameData[0].name : undefined,
-						align: 'center',
-						children: [],
-					},
-				];
-				// console.log(res.data.nameData.slice(1))
-				let xData = [];
-				let yAllData = [];
-				let lineName = [];
-				if (res.data) {
-					let tempDateList = [];
-					res.data.nameData.forEach((date) => {
-						tempDateList.push(date.name);
-					});
-					this.dateLabelList = Array.from(new Set(tempDateList));
-
-					this.dateLabelList.forEach((item) => {
-						if (item.indexOf('年') === -1) {
-							// 构造表头
-							const props = {
-								prop: item,
-								label: item,
-							};
-							arr[2].children.push(props);
-
-							// 构造echarts横坐标
-							xData.push(item);
-						}
-					});
-					// res.data.nameData.slice(1).forEach(item => {
-					//   const props = {
-					//     'prop': item.name,
-					//     'label': item.name,
-					//     'align': 'center'
-					//   }
-					//   arr[2].children.push(props)
-					// })
-					let tableDataArr = [];
-					res.data.data.forEach((item) => {
-						let obj = {};
-						(obj.lineName = item.lineName),
-							(obj.sum = item.sum),
-							item.data.forEach((ele, index) => {
-								// console.log(ele)
-								ele.children.forEach((e) => {
-									console.log(e.dynamicName);
-									obj['' + e.dynamicName + ''] = e.dynamicValue;
-									console.log(obj['' + e.dynamicName + '']);
-								});
-							});
-						tableDataArr.push(obj);
-					});
-					this.tableData = tableDataArr;
-					this.tableProps = arr;
-
-					// let tempList = []
-					// res.data.nameData.slice(1).forEach(item => {
-					//   tempList.push(item.name)
-					//   // arr[2].children.push(props)
-					// })
-					// xData = Array.from(new Set(tempList))
-
-					res.data.data.forEach((item) => {
-						let yData = [];
-						lineName.push(item.lineName);
-						// let obj = {}
-						// obj.lineName = item.lineName,
-						//   obj.sum = item.sum,
-						item.data.forEach((ele, index) => {
-							// console.log(ele)
-							ele.children.forEach((e) => {
-								// let yData = []
-								yData.push(e.dynamicValue);
-							});
-						});
-						yAllData.push(yData);
-					});
-					console.log(lineName);
-				} else {
-					this.tableProps = arr;
-					this.tableData = [];
-					xData = [];
-					yAllData = [];
-					lineName = [];
-				}
-				// res.data.data[0].data[0].children.forEach((item, index) => {
-				//   // console.log(item)
-				//   yData.push(item.dynamicValue)
-				//   // let data = 'data' + Number(index+1)
-				//   // obj['' + item.dynamicName + ''] = item.dynamicValue
-				// })
-				// console.log(this.yData)
-				this.$nextTick(() => {
-					this.$refs.lineChart.initChart(xData, yAllData, lineName);
-				});
-				// this.total = response.data.total;
-				// this.dataListLoading = false;
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.lineIds = val.lineIds ? val.lineIds : undefined;
-					// this.listQuery.productId = val.productId;
-					this.listQuery.time = val.time
-						? new Date(val.time).getTime()
-						: undefined;
-					// this.listQuery.pageNo = 1;
-					// this.listQuery.pageSize = 10;
-					if (val.time) {
-						this.getData();
-					} else {
-						this.$message({
-							message: '请选择时间',
-							type: 'warning',
-						});
-					}
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/core/base/equipment/assets/eq1.jpg b/src/views/core/base/equipment/assets/eq1.jpg
deleted file mode 100644
index e62db64cd4a443032c01506afe9fc06218cea915..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 42994
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
QvJ{pzk-hu-BW{2Af4Qy|ZvX%Q

diff --git a/src/views/core/base/equipment/assets/eq10.jpg b/src/views/core/base/equipment/assets/eq10.jpg
deleted file mode 100644
index 1f73826063476fb47f4fa791a30b10f92aa050a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 50644
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%0DPw6Lx3`RbHxuyBt_oG
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
ba`IR}s0fb-9dc@Q7*Gaq2dxxUKo9@fYyil1

diff --git a/src/views/core/base/equipment/assets/eq2.jpg b/src/views/core/base/equipment/assets/eq2.jpg
deleted file mode 100644
index 7ca5dcc1d5eee7e8ddefe3c1bff246c5bb4858a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 79486
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
KLNSlJkN??)*sCo7

diff --git a/src/views/core/base/equipment/assets/eq3.jpg b/src/views/core/base/equipment/assets/eq3.jpg
deleted file mode 100644
index 45f230676d4c167f2c520a91ccf40e06e03151ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72929
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

diff --git a/src/views/core/base/equipment/assets/eq4.jpg b/src/views/core/base/equipment/assets/eq4.jpg
deleted file mode 100644
index 514769684ede3564c913b472d1d6f1737218f3ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41596
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

diff --git a/src/views/core/base/equipment/assets/eq5.jpg b/src/views/core/base/equipment/assets/eq5.jpg
deleted file mode 100644
index 8e53616337e7c7800ca72514fdd63b65f079b2e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 62773
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

diff --git a/src/views/core/base/equipment/assets/eq6.jpg b/src/views/core/base/equipment/assets/eq6.jpg
deleted file mode 100644
index 256ec18ef8e4950e0e892c5b51d444d7522e7504..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38141
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

diff --git a/src/views/core/base/equipment/assets/eq7.jpg b/src/views/core/base/equipment/assets/eq7.jpg
deleted file mode 100644
index 3fae2905c84f7175e7de95951731298d0f7939fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 70865
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

diff --git a/src/views/core/base/equipment/assets/eq8.jpg b/src/views/core/base/equipment/assets/eq8.jpg
deleted file mode 100644
index ff3c2c391fa653f18676d2a37a6ad30932b3fd77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 55459
zcmbSyWmFtN*XH2vu7d@K;K2t%a3{D13-0a^f&_O6Aq)i90fM`0kf333cNui>k9T*^
zx99Ay-L3Ba)zw}1>FQJW-sidX^6zCGfUhK{C<j15Kma7Y9)Oo6fD8Z$5%E9gYeRlL
zQP5FPkdaX^(a=!Qu`#i+u`sc)aBvCnac~K6v9Rz-@d=2CNk~Yr@yN(YiOC6xNr?aR
z5(K2zXOK}aP*5<4aj<ZR|DW4SH-G>g;WNT25&{DNkpKaS0O6${00aOKP+qP5kHP<|
zAt1imh>C`efr<6np#dL&h=7EIh>Y|ft6zHuz1{~P6QB^%^Gc%<X_})kxDoS(CFi3v
zzOU^e(fWJN#BbsL1p||mjGTh<4KoWX8@qs@&^uufQJD|2a`Fm_N*}d#boKNN3@xp!
zKik;a*?V|;dHeYK`G<dvh>VK<7L$^imY$KB^*#GnL19sGNoiSm-S7H_#-`?$*51DU
zfx)5Sk<say*}3_Je~ZwK&8_X7-M#&TL)gXT)%DFS{O<lgxDWtH{}a}KBl|ya5xn9;
zL`FtJM*9yg1Vo?L3yA<3g`O9cP+Aks+>MBVFASadeR6(n4+bN@);WoV`(I2_CV`DN
zu>U~&AISdifPMM@LiXRl{x>ct02>M6b@Gr103ZN-v4Ns6L(9tR(>BktuSl`FA0I>A
z=yvX+p!f3xSx0j!ve@vS@zjxV?UX6YNKm|G(P?5~eG#q!!H>JnKXnvlOj}g(X6J)#
zG{r?UJKLG>vHVDGrP}V0si~90=Igl0#=dE6*^X2W@F_C)a}!@{_zKo_G>9wx-D%7Q
z%N&G|Up=hIEhsfTSjw_TZ#C}+_Dxxe40Rot8o2E>R`Gg!XDDW|yGXeE&wtLey|K5k
z!4R<PAoIpt_qu=3lSj#R{)=vwZGgpp>x_1wvct8{vplq^Nbi$u@Cmur@gj)F-X-dz
zx<qmDH;xQ%cD~iQlU1sxpUy5tlx+_9(ws252eA(d8d8kAlU+r+=QhXVn<hl+saDwm
ze-^kaFO(L&s8IoI-NNEtdGaJ19g-oq`>rxxZY@)UOZr<Z;K3H)w_K5qnwk$ax!TEK
zm)vT(3A~kS$=%NARybDGl0nt@MA;{2q<EO08muzt+`Ta8X0s+(Ab1Qq*su}JG=)=m
ztD#_(vc{Q6#|V6jOf=!g7$yazG@SJC;vc>oWBg5Mkdrdl8389aM^q=2C53E0j0nWz
z(pd?Ozs=+v6&WLXuHs$3OjK(i>w5u&w!Q!&4LRD@unx(ZPMBv`oO^|r=&-F2z&GCz
zGdD{jJL%-zNHS{em{W^X)Ki_`=o+98`jA-W7C?wmhl(Dho~k^}kPYNFAW@W#TsF3y
zW=n`9QOh6rQ#>ARAQB$gmo5m8n)A<$f%@lx*}D}?_%8qlsJJe#NZ-4hLg(wf1+Wyy
z`1ZLFgkTdT^=ZBuyg~N$+E$VqE<9eMPRU$r|L1{^jIeC`nK&{y`Y`49k=A++is|!g
zL_+XGuxD%OU@gxTCP-Q%X)(`Q!f<!%0rzq^ee*kg5+m;(9X0UCOu(08;}5<)qYezW
zR9vP)L8flv7*^naeHVR8egnyWbl_O>l{ZM19$oz7`vP!X*lQ^1UwJ>xQ^D2C^L!iy
zOcs7(CAh_Y2iuS_Ug-}n@8gLNfvq%zZLY<30?!F~TINnmk_R_RI3o=(uAytaK@$>U
z3quPbWbNuA`c4gsT;^_3fjE8pQo|LUL@?dNJk!{RHn)mZqV_R=W&D*1p6(|#Rm7H4
z<#&ma!on9?Z_(jS&D`ahyJk-qF92*Voq3S;Fp)-s?J2}%-av;b{WC(<Ed5>g8;?tb
z?(1?<(21b!$C2i*!?E4yGSuE^Z$i>3Gf(tvNvf`b_zX^;_bH%g3&0rxge#n{weXPl
zjj>v@+}lDm<%(YJ2z*ZD%l$-?)R(5#TR<q~1k~mDb<9Dp*j+JQsj3>F`CJ#S#L<`|
z_x0PDcMLAX@bXueu}F%qf)%nR(tV$keFH%?@cr29Jw}^O)Bd5Fc2mtNq$0OVEe+u`
zn6RxQwHx}ODRiJzB94o%W^fS`u@7iG|817pH|96K+sLHSZdJnucLaW&PD_}kbX(S)
zZdoXwc;9X9epq5DNt9QaYE??c`3QtycC;8r0<X^Md&v5S@Tb2jSh~<FNY%>90ZcK(
zh0@Q-V;B9Tz<gF<{Nn1k#l^l16wMtd%l2jNGmNP(9H;srND_1lj>^2$d>)rEFB;#Z
z305|7)}1AUzF~7lh*=fSCDHiwDOhLUd#SQ2PN*>!G4D=O3V`RRftCUPGO7Q)J>KFZ
z4&Q0f`g5e1{_J`V-ByBs9JOaD?cfH9rE<+ED&j;q$1!gc(s|`%tQq+g7{%VlKj_g%
z&#-L}Z!uqk7}YG(gEq(C>On8%Fqa$l0_Z0OSoTq>R5U9+<jH+JVxs^>A{3(Oz|f4&
zSHD}kIaH{+2#&>(SCQB6b*Th)eIwaQff~U(*EHLv>s#t)e_I^-P>_CDcE>nq#-<L?
zGk*bKJ}92&#!CLuT^NAI;4?OUxnw_8K-vMoCKN4vNg(HK{gk=2g)2)At=g1=^`=(I
z>S&W#kgT4}$UCLfgq(x`4gMj<^ZL4eZf=3w?8TwcLrVOhK7??Mw_o+lW}O_T17bgX
zCXgF+;Z4is@rX<86Fe;2%Ic(L&i~x&a700_Zh50?5@94lbsupsJSkF*)Ne)rc~tcv
z`-$y+Q@$*RkqkRM_5c^NBIUqb`Z&NCiE9q?7d+JOjqeIW+UE1;InM+Vu@0cxANkdV
zA3Wjik}rT|;Fr*lb-8+hGc@IjquTe;7e;MS8RjXZl9h@#6cDL8xO%zo=nLTC^T|MZ
z)hbgAeGkDW#}~km+kuMwS7p@tS`_A;0vg0&{ou&zzEb4^TMuQ<8IHO;OKf+F)@Qm9
z_IskiF6>AC^%ns0+96Sav8fC#1G6qwp-Z|P0<~2*T#t9XD{}V*(EIt>=(n9f%%7N=
zNDGluf1Bi?Jt<n*{Gf~nwS-Lyn}B?JMRPu9FB<K*bLqW<n42{ms(%9Tg1?>_m)>zJ
zhq#)GLwS35T5z9@oNS+HfwPQ>1MJ$i-gAQV)pyiqgHj_0OGN>4WkvEX!NV~mQse;3
z7%4x^^Sy6^$Zsn~NbVCpV1zJf;=uv2;Qs8RN4ApuX)bQAUl-zVU6auBwou_GhXMi_
z!lY%e64)QIY>aR}gGlbQ{h=p0^q{Bo<YcR1_Cp`Dp0#f9Hd6PKszGuVGsZ}Hzz_eQ
zE98_?L5Vl<Z8@n|B!;K%n|xT75)axLKNc6e5is^74y&#bZZVo7SmJ_MSu^cir7ZZ@
z1WkoiAvpX>Ps;eHAokzn-Fx8&GK0Vrkv#MiAL=vEPX&q?>XyfYPE(*bo|4r}xs?se
zlm_Fj8I@VR>D&2_egG52wdDn1C45h1O797z9W#3ky$BrI?@;x7J9I|j@H@~1=KPbi
zM6fFDU3D2XfYB1E0yp4(A^j;GE7R55-Q7?o#V+jRe&__RxPOv1)5)VuK~zLi+Xf~A
zDsmGY8pI<#GD?0+rX2bLK&iQ_eTGdQ#9TUYNCvK*H38$DxDeS^?Dd-b`>-mGeiV0$
z?WSkFe%IL;KVkrrHEsVqQ%p#s{tKXv!yX-Kqp+pxV;Ne`r+7o$T~%eQd}CY7@dBs<
z_6OnE+1(OmW!@&f0D>s5%&?wE!Ni?!jCwu6=w>pG`XFcn32Cy^H4eQ=-_!C!$w5~g
zZv2Lh<`(!Hlp8Gi^z=?zZkAgziX0k($U23Wi?pm%WNAk;+^xfuYJ3yfG~e`5mO-65
z-%lPJ{ShaqZykcU?=K&HHGK8MT4>CRQdS_DeT=~cz;6kU?h(8?En8P5Gfa8cHGSej
zD@bo>8;;M~JUQa97AeUYa9|m(@(x>B^lP?w`lMNhfnFyP>~jwIfRg5r+GZ!w=VCla
z0wH@%hX~yjlkakAcbxfmNaF{eJMXdyf9-!uOX@8b)=^)tSG=cp53$%xM;DcqUAOGH
zMdNZy{#ngJy`yN-=i0=`{K)Bsdm&}j*|)|WX1I;tSQEs8F8)xR(X9UtEGa+l))rOE
zsqUm1w%k=@tYJ!0K+5ra0bFZXECr+lWe8ur0Px8#EaFGmKJh1@2_AQ$cG*+~Y^gyu
zUH~;=mcI;A7FyFP(&NlsOF{9ICDOCWgC4=efn4gOljS(pRt?i{+TG>6#Y?GbkA;u!
z{1+Mn)t)NECC+_%VZKIvm<-vh{T8b|jgrfrI4=Osp3}$L3HjTyu;qilQ2j|i8wcJ1
z2eHh0J$KwQ&SMceuTikl%5N#7I93{Tn&9+{g<cT!L3#F{U9ixM`QI(>z@H!0<Su4d
z!q}~HUjTtN%ebmR2Dph#1byOK-?@rpQ$)y^_;^Oa`N#y<g$&?tbO!Y|2E;t0=W_Cz
zdK+=afGyjra>M7@ndMA06kpI8W(#GemLgRMJF0;kX8Ps}pk6S>OtyfZ6!l#ufEEvH
zzHO4`@x%F9Ulqqm_DvDZuNp~hq}>cHF?L+_g}hVQ!11jRs6*c>Pd1aX*pZPf2Jc;R
znPrYu4)2g!8gV|GeUfxxgf%&uxGTrhGsOW8S=`kwP4(Zz^+gDM1H5I!gCV0mn}oIo
zbcNdSaf79Q4b#C?a=P;P+B0J_Ac-M*fFVP|?UFT*nyE>C%J6sM$wQtm-P`9cY=m0U
z;~?V~K+^RDVnpu?V4oph!wkV!fY2H~N)L(<j9yNH*zo00d&!vLm;{p5@{+~eY%=g(
zBvE!A!l;>5F`tF#!jZpkJ*AprkVYmtFw4KG1s4GV?_S-S*8O^OeP_)3<~u9Z!smue
zkMqQS($nFZJ`SWW6|892F96DW55=ifp{yP63?xvxv|kDPp$aC#WzC8dkaZRQ)_BJ3
z7U~EC>+FHjEjz(ME{ucomjmr_;S^NyK@f-Ya9x--uc=6s;<R>#!^34ApJ-rs#gn$>
zYz)*-9Phkt=0vCwt)KE2LhKkkOo!#!uWzPHce0crD>18`<w4B%vOgHux?ngT^j0Yn
z?K@Me8<l#fYi$KVTdqXKv~!@&I$ju*8SM4T?gBohlkyQcJE4-qJbso@*eLKq%5A}Q
z+Xgvi6=pVo<1?`ERoRV6vk^c)aW3i_5MY^nWN6mV6k7ki-8G3yAV$CrbBJuXTp^AS
zu*Kp6Qqm&_;{=**cEy|FXW8?pmmCOXc;EJ7Wz|^8e_o1%{l@A+TFAa<tNdK^m7P!n
z+Z7cBv~iPYSpvtC$tEWhkxO-Op5EH!{e_JfR2L!&4MZ6Y?Y<cRxVEC^-O_T+GWfbD
z8|AMCY=h6M=drRHE2!CZQQ}kH#hflza0p=Pb2QF;k=hbI4H+hx!(m{{ME(?@!MKwc
zAIx_?7zT@cR&KU<{);aq+c&5mR%3~L4#Mm+OLzv(oLowlQL<;SV>t`62={Koz?U%>
zlS|z54lW7M)(=d)MIANE2t)Vz&w}gD6wJ8&r~Asgp^~{U&<Te_AOtnFKsFeC2wYk+
z0%!RMPd3%`s4zXkK42PPNUq~@iX8445ods{9qF%<PNUY`sHAlCs=iG-06zYvOE8e9
z!}rL|(VGoMJ`WDd?~W(=B@W;DXElYEb6`p_dku<e0@=;%$$VNm*-m%sWK0=FtKBVy
zd&t$y#Q7LbM1%xkxkHG;sPOWUKtF@Tkdv3C%vn1%$-7Ag;UeHZNye`8+3{HK@wp6j
zD)m+AtE0Oq{zwyb)s!_2C+5||A(go|O*7BqoDLl(zjw24Qin1yPR4>b=EbL80Bt%5
z_$b<%p=f#4A^oOkQ3FJWWVCL|rR(D@A0sXmQH%}|ohAzcK6(PFmqL2ko(h5<DoPb2
zeY@}e6qJV@`agL5qeONE(ReX;&0e|SzQ=HUs@{;_4u1i>e;n`%2G%vlO1adB5&AL7
zQzkG<H6yL%GvyZE9GC{I2PDGP+k?uEZo%A}D!jatNC<L4nRj{+lg@EwuR+Ccp+nQ5
zthTmB{iHMemVlffj<$u9C@87Q#n{nw``HKXPUa@PVUwTtdPNShgsg?m?nNP#fNt9`
zkdlAnwDbY=_ulLrP2@TUqZaH<M~>qy8E+5y_U{@E5Rr;M)dE?}_if5QKeVv7oY4e#
zR~g}d^X*#jjTM8X?;`59@!$mApfJH9<3PRnYd;IpjC1{d{b1O|S==+yRUzZGmN=*Q
z&!O2lE*VS<k)iR~ARIonZI^Z-$S409ueYmAGC9tZKpCkXnnDmS%QScoe<{Q;l6s3+
z3E5shM+0eRbvcsaUYoB>TZBHbnpcq;@@T8K)*$c3>d9CI2(}9hQRmnK$AwWTwomXM
z#yCVSqxs*z2AF2ZofIaIGV|Ay#J+v{ot^FA@gTJKHPG`7Da@IXG^VYkDi^p?U!T8t
zUZ4bA%+AXLxH2m^m#UQpJR{kUTIL}}fDQGXeGL|X?es_WJ(JA|>O*B7jskRfaRY|s
z{=&0w;~8(>z_@aFm*H#ut2E~{zp=9*5Ym8Opv7;vRQt4@X_>u1igrH&laD5;ax>k#
zGwPBW+E+`?Se7(DD{9Zd$7Y|4xCJ?WeBTb_=Rb*ZyL~tgp{4}fWy-_Z&foRi9tqC)
zCT^;3hN4S9fvx%j+~|Ps9p)byAr2YI<j>TPf`7$<j&gqk94z;i5uWGzLh&BaDesMX
zyMC`lJ@S`TaN>)bnyz=*=vq4_ZUv3sS#)qOy|1lDvTh|rMF`1yu1C0_0e7!On-Qid
zZh{DxCmr{8!%FNJC+qE^UjUjW^HC3U`}dA+Bc6sAQc?`^7qgd%t=~cL>mVxR_r%aV
z))8T(*;MsGy;Lb6iSLgM-GX%xb^r8-TD$q%FTUQ0fx|M}P7?ucUmRAC4cD|9Vs@dj
z85CsfeUI0W_b|2CVh5<Dp}i9&qk9TJij`zu_TAu~Ni#eIvSxSVqbRP_kFR|!!P89}
zMT`v}of+T-5*%hIk(_MAVdTn0=q>*nYQCN<y(Z~{9}N&3-ls<tx@DcHBz$qS`pu1H
zIkgcrBYvsVa3ag)<p&i>G2lKch&1vV79Qha3JJ&wu=1()QJBfT)c=c2x@vW~Z1PoM
z_BZcvH_fCeTXesWlIOUnu5laGWLUjyDKxlY!B@TSy!c0v=^Cjbmu91MLQ(BPmvj2{
z+b_W+`$=#P`I&|)#6K%Cc7(?AoJuCv|HLP=Jbo@t;5hyZWI1=v<WO|lIASoOAfivg
z%d?PrWJ9<NE(+SD5D55M8>2up#zZi<j2(XctaC}Md+WbiK`!aEveIXjqAXS`o}zvU
znQaN=FPKF5cJ&a#S*F?sAU}w?_~~);`8+T)W#zzCGL~bow%q95X&74d%%sRZdNCvT
z2`owb_~r?G#RR+Ue^Q$1r=?50ZKNb=CgRlc(jY3V!<GEp%XTene<n%&Jey1RlrKr|
zo4tF3?m134Jx<!E`W4X<W%AF3C3ipGCozNxKRlA>$z1F&^H|@n?y65C|80Li-KBzW
zZv~^Ng~veQ{OdGCJ?~nV?`7LFRs&gqf6{Y4@iJ0<yDrqKJ-9z|p2?{h8C`#7s86cI
zZ{*3t-p=lyKaD-8x;UlEjN5`on0*h24v&Rh<kk}gJ2~jxJ~Pdhbj?DFyV}yf*;P}w
z(fV%R+*IDw(7DR`KbM>nAHc+9D@TvfM!}!4^>2{&NDN)V$cDoT<}CxS)*SWjL@IL(
zPG<%+<Fss2sF-QoOus+y>u17Y>*so5p5u3Nd-vLX>vA28<pUuW0|}^4M~`U>zn&-8
zPy=N)T;e2wb7!lA%2e;Z7xJhaFZVITA%?dQGtFRTW%CzLFW=7?T2ZcSrhXAheDu`O
zjy@fB4r24tPQN}{1k)<A>v&AA5cl~|vra5(h=|aA(jEG05vZ^%N$Z=%t<&|JTMBeD
zQgP`$qd9ACt!%VZx|o32$APF`gW4tks7|*K2rAS6j*=d~)1Gk>B!Zdc#mFl1wr2|o
zZB}oBZR;$;3?RSw$W`*1_3CZvh=J;zL(|h=0E<8`$#6~_)oL%z@-kCcOV~Q_%NmK7
z6RC;+gWjws4k7E~`NFLhS~F4(lfjq``H3l{G*B1raSoOtv?C*v6q+a7eQ?gde0<_#
zbS8U789wAU6Ax5`pKK-4E-MHcRs5jRoxB$?PYpj*XIaaWOyAwL{{GDliT5aVTxEOf
zoF;8wo~ROPs&Ji1`T9c%!#)=-pdO0ZieMmUGNaAj(&l0AxJU}YV>agsa>dxDlGHvq
zrh-3LOQd<zJqzS2B`;l8wk-MoJi}0$S2%SH=Cgn6fvH+-(DE6H)ga&@)l4mT`B^Bu
z2SjwTo~rV0%#Awb8}b9@BYaRO=L!;A>6G3;<(4ZxaBvMN?^=Idj0RL$7LI2^_Fw4%
z%)d%|U^6^SkC^?_AkB5EqE@&^p6YK4^%AKE#fd4)k8$&3a$&gB<N=g@@W5uc!A5D#
zI~?vgSI|+)d<9eO2XAiQ14CN#%p!%7fp<|9Scu_w*+<%?8a+p`Q-#(G*9?DCqo>Rx
zB^+wMn6o3qm(Z{>!S!x_1t=%Ri*CD{bSKuWZTlhCK8<<{4!}ct?`7u-F9n1aw0;R;
zkvP(HrmZb8tja&-d0m9N5g5K^S=AV(;x}OXG}8AK?mymiKcwKjGQl$XvlSywxD8Qh
zdBq72s?#p=u|175DjJ2ME=^4$R)@j+BNSKT0c#PACQ_Ri>5YkC2lw25FSLIPLyf72
zLh^whjh9rSs0zGI<y~d%pzyu^3^I)s9K#C(`iIC(-K4iQ%W5EO%IRJ3#~*qs4_zut
zb{Ka)UnxFcks!<*Uk9n-DD?kwa9uTO(rgBVNSg`zI^6td<*BM}u47%NC@>R2zoJXp
zTFwk93dsGr<sb<6VEJ}YVZGfx){u3EsZ>gpuCOdmL38w>+HHcc_-Whv=+!|A=G%)_
zg9T==#{9lh=rS|11EA<zO}h?5;$~YMRNq`qovQN<1X)*<2ID?(y5%m8P}{`i<g%B<
z$@qG$&puDOR2Z$+8H-P|i4b}u@4utAJkXV-g{$>#O6-<k&yOG|d+d<ABPytm`d?1L
z6v8Xvn&x)qMc)})6Lyv&FP7+oK){Z>g`yQ@%KZhtS^$$g$$AYu#wC(cb)djN@K3MF
zB)4~|2v$?eYZ^RD1V8GRWUlR7tx7K(`y*8LMZS$1JQ^yY8$x1mAUc<`pqI4tfjDKl
zMpHY``r(5uth;vc&0t>7Xk@&Qd~TnI#~qR>Mafc7fqtifvfAHfjp?65B^_b|Nm<8L
z9xnh8CP+q#Mz;h;)K59a`)y-}-uVmtE@)F7m_*Xw!+GCX;_XtB0o!uVFL58bu1;88
zMo&wI){0Bm2<|qN4!IyV5mNlXASAV%%q!#r;lHohpK(Hv(+dSbNj&6D%AAL4KblDF
z_0gE=*72-JRL3NKVVY$|_Z4{v=epPXnExnzejUflHGW!DHNpGPMvl_{;hr?GmUdl(
z45X0iu@gN+!`4I)zO%P*uRZV7xd@z-eqw9F>7}-OO|O+uc{SKdx22h-OT@CBahIo1
z{D^#L+-3v~X4%(cn#TrYw-G(E0mtn$4<KLrdvdR_F%G}#Gh&rvm|s-#(Apb$+E~-%
zVmOxEbg>KxB#XqA^fPxsi7bfq5k>3#1rS^B#MmcltVj7((tk+~n}CS3An}yj=&Ece
zo*Q!7{_|}gG=4(QeR-v{AvCcfaPekI0XMBX7U@H2=??{H0pQ~U=I&k-%(Q?iq}cBM
zJ<kC)mm7OXcUA=Gc3c#M%DLYK^)JpZuifbX?dR4tFMI<zkfNlFioUAiJ{oD8<=SZG
zNJdf+AEX_beMZcaWPXr;^gU>5$~y;+U8G9x41=OkOJ>A*3-_lpYiFve%*fY>rGOI+
ztVo#iPQiDIDOeIbR`Eqp?|WE1-h7p0+ybvtOJ_@#4`we<$XOCUd_IXh&$AdMz)5I+
z=1H3%|MdMu2<6?6tvG~WhC^&L&f3?sy#Z2Mv8$dC{>+WC3u*yAht_){UAm}Gxd?JO
z%Am9@uY@@EV&+YN-21_wBpep#y3U7=CpQ9uKI$nnOp-p|9w!aVVSh~_2Di3<YM~IO
z!=1DF;NV1fq+5G_-L_(X(&$jOf;-2uW9si|)(WCLH;cbFEew>!eivy}arc+{6!|yd
z9{_MeMSgY-O;XGjOnO4NVq+pUfZbLy^I7ae)uSpBuwC@AWf^36Rg%2nUR|V5jW4eR
zd%LK&{w}<o;oNs<2txZi2!Q91-~A!EAVE6ycca_T3eDxxs#g~Y9_gxja3krxt6vrq
zzNb!i_oT;N5DFc~_bBSQfbX?as4Pt?9wWt(Q2*?K`7@PEbW4vKY#uYS%NS%$nC!Gk
z-;Jm1F*Q-bm(=dRe2o<sF4B~2NDFS0S5Nk&bt-|~F97!C^OaH~F6B>4U)6F#NRXK3
zXiSHkd-Gbc2@*F+D!eWXl=RLVC4$p4%foN<XD?KuL9h)&qRuf9T;;&xtVF^V86Wq=
z#ANkhG>_#cF+5|iy@vsD&ls^~E&`Q$$m<BX4Rub+_EV)Mi_V490&mQ<{9yy=n6B?v
zJwI^+B-~8&`Xpqd;xj0mwj;@#YBNlA&Rd4}LfHaE){RySSzVZYra6IWDPDKG#zFgA
z5B>hYbT!d=>)ZY#b=0D5THtwbm0#(Q7fGdmZUL@l(`fBCq|gz{NVkMab%Z<AB-$#-
z8f$hyhE;u2dYHkU@T%}bjHJz^1?tSxhQ2a&(<$ZZaw%GD+w~ZpXOys61!3QO<<h}B
z*Wu5zFt@TVfd}d=-hMqyF!<c;PYX16e0BRzZe93SzNy`-Z*o6M?EIZ^_Hbh)4ZL%j
znE|Wl?GCgz8ItCue7G<&k!EjoA*Y|+4lHSwY`Blz+~4dvZ>(_CAN*}NLh*?|R6BfV
z%amhd66fE+E#)j5GJ>JiTS_`@ElVxA)t_p1*cV-2%!mYE0HpBFG1boIrdg*qVY#14
ze+flI@(v@3ulswL4tSZ{No-fV$sr8w4}?{OD9uk-ZZ&4Q|ANR;$?@=OTg6&mzfOT|
z&XaA8@vs>p-229_5d2|g$GX9z;Up<8Zhec!A-xM8vf-zLc7u~*9V)3U4a(q{@%&@V
zd9Zd|=W%4bd~+Ds?)}NO4k(`aF)iv<?kwsI>#F-|rBLXYE4v3e)2n{|2gLJCq<NH$
zba<rzF&Gj)$VIBQ`^5#J9~l?Aoz8L%@@AUta?HM3BK)C~Ps&fsO5_F57_Zdl?&9qa
zia4H8KmVNQK*22RxDl^-6rqD8_-m|HbbP9irT5;KeaMjj`~IB6L?2y#c=3@f#lnu)
zWuf71T8;j%t>^pd?D+vkEm!GEC*<&Idq?dpE6at4xfzZx?O#AhQox_UhQzN8s_I*N
z(WhL<s#sigr8YgAtKv71H;LW3tQXn(^&5P2Om*Wx^?`^Wln42>tl+l}bv1PSgJk=)
z3@-pd!97E>IGfJ83@CJ7E@zx6fDw5|h9D;g0bIpGJQ1z;6BLo_@)Qq2U3yC8uQ?9)
zxnM3|fgYZ-5!p6HqiM~bqFq4bVgmLX7CE!^tBNm>OP&qQ6&b1V5w>RMy_TCk!c&x~
zVp~qv^+|5TNU#+pbX?Il3zBI-re(7i-c8Nz%@@C#Jm`g?#Cw8gYeZgU$B!r*AVfoj
zq~#$es?|@YNEWP^3P+jTL;DR88xQ0gu*KGN!qq<Ynddp~Im|p%N4zp&5@mxH)sF)=
znGSptO!9U#xKb7#iS~<P9Mn4Ot<}eC=O;0%aBfx13u!Nj8oytwl2<HLQ$cv3#D>q0
z;tjN9^MdiFx)0*s3KPkwgV#v*iEsk*L^q8i!?bMNiu|=D3%!{2(>P#fp?TVqG(%g5
z@<v0$?YHdlSNh25l<b5+H8}AW7xxb<iz`}5gW~tSXU5-cFw|u43FT##z%`4-mHVql
zdl1eN+cejR@ExiLv?K5lB?5xd(OJtWKX%Ex(<qt*N`(G?Bs;GgJv`D>UTOn3=#SSP
zFF3E=*2yVI{(G`T8mSMG^qlt+QQ_KYZ;=;ArR`r(5=R$TCpL3zPJyBq5+*y4We-to
zv0#ecFH}L{ENY^Eu(knZxq#|lT!Np^m-R?9eqmTk^_a*I<c4l*)+BPzT;b3{xw1nd
z_h#Q1e?HR9X-#~vrX{<yG#QLvS0{G3A>_*8m$4>a{%fb(sl|Ffh<503HrBOx+0#h|
z_o|X5O~hHbI7m&bUrFSNy7+;e_gF5yFGaFnXP4BoVHCi+nIN2jB28I}72iC_W|A<}
z1H^p+SS?Kw>O&7rm1JqA(F~k(P(R6QRixf+b}Vej9~TwTa5*>FuyNmL(o~uYqfsoo
zuO*YLLgBYPohWtn4V?>)T=A9CDp;&3nlAvy8LoTXj0jlR^%6Q+ZztirSG{@G=}x@k
ziBYcF9lFb-dj`Z+o{o-mVyaZk@{L?jb2&7%(1Po3@NC~++Jkdindw`doV$UH4Vrk|
zZTWrZWeVpDAmE-dKS9yLdQ#9dNNygK`iH86U7hvoX6>oxRr(mgI6&!kV+j)%&tJDO
zSN4y)Q#lNpgor4s^bVS169c$s>>*9=*>HN(UP$<q!8bvSsP;ECd+ltxww-+Gk*)Au
zRb|LMdQ~|<<$?0Oznfa2L@8jhwm@<)?owF_18k{)M}za(ewE{|CqS*F;@<)M=%ykq
z@h;iewD#e>FN;Dia}jd^FLI@~hS=USvXt3;s05?rV5brMz!R<ir!=TFIb^><aLys5
zArkCZXa^<fKl!(+RvRpA@&cG>j~$R?2M^IQw$5`~Bw#p`cu*Tan{_l7{%N2Jo1{oe
zO{nU1{dE!y#QLFM%$V<moPZb7KVMx|GFEt)>Fwdf*Td02fGa1>7_Mbt_+vzuXAI~*
z4*jCsh5SrpI|Ki+q)5;TRXJhG3H5#N%7ZGZ_YoG`EgBN$<-jV?dxSjoox=E(zKLMr
zoMh&aYUb0-<45~Xa?M#4y9QL`cX(35z=RM?n-g-Y)P72ztRH}eEu5Uk!LVEr0$f**
zNs_~0aySB6j5x1d#g9JXTWmK{NsV_WBf>Y#?elYhbk_n3NO>ofF}XNGVYmyMW^y{<
z1u*t;f<GH^=!fb9=iu0d17^uo5BSJ9DlVAN_)%bnn<eE?EXx@)&&t?S<hkKm9!k6w
z^{DXzi13p?LGqzqrHY|r!iJ<6G9$tL33);=@qs*tJgs+xgx+^$LyzdXU;Dh$;+7Fh
zP=A(}8!buQ`tU9ebeI@Ao~EJ+%K|bcYlfOje`vJkGR*64PV-LhUdt%09+0tvbw`N%
z&F!8^bB&svPcaRkxtiN(o?WMOJDqv2O2_Y~f+Dy#(hZhbgK>%Sk2q4aIeGT3$gNX$
zRUUPpP4xDW!sKn1fZ;`(``qhDm~$M`@NFLUkpYAdW8<9<pEO72MPXW9-f{R-@;~a$
z4u|!#2neWQtF?8;+DXXBn?t;oh~Sepge9TkUN2i7V1O%6ax)l13Jj+d;sMN@Oajj-
zW#lJXTR=<D6qHXD9&~$8Tbh1KeMxv5y4S@ofNv`=fF~c1`#HtWyaP#Xi7J?=7QUUx
zk~Fh=I|%vKdnJq{o4J(J5Kd>oz!u-4X2K6Yv;mk2>xl01AI&}naw`a`0}n`VdA>3D
zk!LMiQ8NPf%w&xNh0e!Umd1o)?T<(K)3&<o--E;}b@jJ3`T$KL<xR=;J}GsVZ4wSw
z99nRZ^`j#@y=Q_Gi8t);N4aL}Qbgmz#{=J1|6?*dImRp)OR$lp?asESjrvu6$1Q|S
zQkNXbfn)B}hqT*6Ufm_jOQZZTjM&)-<J%Pgv#+iZ`-u-R^<D!dK+KXG;#m0UJH921
zWI52Q)(o!p4&xL_fC5>mA8&P7SWD^VsuF@}+Xa>6|9h-|_u1j!C$6}Yu`uv_XIl78
zz)Ubl!^Cf|a^uBuYKVPue~cdHK%K{g+6!PhtRUrY&f6$~Yfk>{e&MYg%z37}PXRg@
z^;R?0s?pxo^&#}?Qr<sXo;XxD7x9OR05-mUVRP3q`;5SQ63<wMw2j{r99dIjl)0sf
zr{MWk>U?sFaX_$B@N_PH?!y)&j_bA7;&11;Yg<YBMPc-U@YMw1EcGCJQ<7GZ>vhs_
zZ*0u%7diWLnFMb@CvP9#VU6Re`uEFQyOrBxFpck|SXmT>6Ak)G3135U>hZq%uYEZS
zUf^4tI7_oJ*zPTJ8ru2y8rg(tpy)e(=pxvSPkij#a(N7@2vC9tm6`dT8ui!M3Eb2x
z^#3`GZF8H{lCU?Z6ciiR8;d+~+FA<VkwXFwL5|F%ZD}bI`&LO)_9Pvrq(1w7rWyg*
zbnw#ZOOooFjFjrHs_t=3e`rEeGkfPw&sn>Dg0yR)I0EDrsYnhUhmw}m4Jn;p|M939
z&e*(=Pmd~<g`#ac9D^f)2wYC>z>RnZoo@+{3bP?U58BOg2G;@0?vo}vc7H;LDakjc
z`#@CAw~y9uDoN-4g~EcwWGTO18jGV4B^>|LJnb#ss=Z5J2QFs2&<6k2^2JiN%jRO{
zW&U-WAQhj6>gqcT<SS9xUT6z+f}@oA67>R?ys;DRxr^s_3Q$75bX?W^E3BKZH9#?~
zU^vTQiFM&YCm$>`I(Q~vvx{H_D?{j}PL-pgtu47hfhy+~)XOmw%=A1h3Fw*<SKg>N
zisi8GN}kqfZ$tGhgtnOtM_4DN(-B-G$Vu3K3cTK^qP>4mo@rMUusJp?#6A~IOmp(a
zZaLNdf)_06S#30MgSQcHy4F91bYsyw|0H!7g<y1k@T!E*TRwh-C!V+UW<qrn3&*|I
zV}Eot_TLwObE^>nkbaBS)e)xQ9hzMLABHrjEMznp1{amsF^HrUCVy>C{K7l9?xuog
z7CPuvikUP<$61MoY|*A{YaP==yE=K2iW(>H()M}NN;7VKvz=(Yt6xl=@KCpr%ttrI
zX*PPrS<;U<d~g~~{rn12*^XjKveNC<SN^N!lRMrSu?FLQB85?)+<ZHIReh!*OBB5j
z|GQMj6w}G)s!pwwT2y~4w$d|6bm)=4r+mLD{X*b-6~;g^vPceh@0%E|a*$b-KVF=X
z%~!8M8ritL7XW>OVgU0BqtAQ#$!9SI8=Cbq<b7JQsZZgm(~c*W7c(A(bZzS)L|&ku
zUj9T3wvD+On52RL%#mqsa}&z(@1e}Z!jt9mYRQ`dX1Ig+r|yQJV)7WkWyRM;@sg+C
zaY6R=x9q1eXn*h|=e*LtIS0Hl)S>dO=;R|zDgN1?)Too=v{fnhQo|2)<#=_h6jr_s
zGX<w%r(!AyQ<OS8&C3c}1K4?_@3r}brUEq3I((TN&oh!bGyWz{|E%zxk(x5d)R?d2
z+%~Npca3=g+)j9yQNX(l=c=z2Pj==SFgQ2q3IA4uN2C+N_?xb(?Ztcs33SjN7>UvE
z&vc&(9*K$-EMqSAG?PMbiYi{ShoFl41+vQL`J`V>H#Si#9ZVg~Sc!1VaPY&v-emD`
zGgVgjv0aLO=-0ObD3cm<U3Q72hqf<(&#iScS&3-|OJ72W=v_?zRRcBP5u0HAAwGN2
zn|xvC+Sm+j&^ZZxh|=z_8SFYVuHV3)w(`yh-Gc$y792nLYuyWcN+|>_gw=GS#nL<_
z4j1r~)D*6J$}FP(^tUO9jF5{@Be8Gay^8OI;ya@!R5j8sfTQ`r+#<R8LsXHnpYx7L
z&JVSNdcf!M7ITa7OM)*RLt8TcZ0BHK!nbgIS{^*NUH}Y&(glN(|1hp9IyvH+V!eh2
z`9oYoE*N!;(Db?AfdEM30RM$vHnL~Je`Iq&;O$8HTD{9-oam=xuEgiB_MmVwH)G#b
z6nX4k5e%B4(EuGYsHjfnfOj%4-J6>IAjLeJAB$<1WN6|G^FTapJY+lI^`DS^xlWbo
zt8WGPCW_+T-dY<eMv=?YiT9riGVZUg89MXNCDO0=zSj4Xg?ygr#mUvD^{i;VP^Xs+
zXITwnv>7nvn-PCwJH0Y&mB!}P7`2-oid>7e4`6ygGDU$!4bsvtr1oVhe)3$Rkz*^2
z<cLoE>0Gh%bC1z^?~({9g?E-Z<`zf+Cz6NZeTCF7Rea#7`!0i!iJO<Sl%Ocla;)ly
zHt-hnsFPy4e&5+E@q~+gdDz@8wxNe>Cq7OsSf__>55#*ACPfP@)t7e&u@Nt0y5%<p
z%nU2HQ4@_wG*^B9^)%8w!2L^n#Bu0JXp-^Y+*sN`1^zokR*LwICF|7wn@<TyME82a
z$%uI#@CB2NPeuc}1vKwM_L*CXW66ggh8R|uS>|Sz`u}?D&VA&PE&Jj{|9(ThP*8aR
z@SD+d8i?!tdr%6bpC+S@#o|ru6-5o)s8mU;G?V20zE<)uSm*pkks5z{E3b-6O+a+F
zpdl-xC24DBSCDo9z-k(V18{hxYsxs<6iWK$#e@{Fv(;mM!TU@ne_*B+Pk3cg4_;c>
z<;z2l^M<44dhFP|I<jYiffoQ7nH+sc{C&uR5TuNE9EpEHy)Bwhkj+{$Wq=k0n<Ke<
zs^n;jZot0gAC_<W<8Y<aCF#{%TV+;rv^N|A+miaO+?Va&SX)(#{8}qow^5t;p;DFa
zA7@E|5amfA2dRtT@g8XL<8!G4CX}$wTwXH<*#I7d^s3kloFB;Qraq{x*}6-yj2m06
zZ+3RW)ji6J!vmd;PfpF>O(#vdTRLvI^VTE|NgVCGjm%hsxjhQ#?@=~1sox(rT%Yyi
zp+!^&?B2T^Nd4V1EXbU5Hb`}-A8(PKz&-UVN((-Qsn3Nz&o&QzbX~hAD4tM=dn`<}
z2aKG*E(EiaPNSfo&SPKWa@_PyX@%Qo6EL3EPfiRyj5CAUTys0G5SDx|d+GvJ;GjYy
zI~?N7`CRQm!fsLy3KaguPV@Or0a$LBV0!=jg2sr88xe5|8*v5O72U!LL?9!4<ETgc
z8}Slj%A3I<RQj=it5?cL_QCXkM{yH}-8u|8#Zc&u#MKDfEp-i6h&Irwo4q%HLA#b7
zO(QYj4;eHgUGzojA$YU-n(Jq2PRKE7(!G(8?w(W&y*@Bbh$<@V!mo#0Z5ZkRa35pt
z&3Yxt8)0%Kn>fxlP>vP8DIB2@<~Y%mB9&@{^)Cvqp?-&Uf7}>&DSTt-n_9;2M<q(Z
zR^tL?oZN76YevlO^yKiIxP-L`Ke7{ptwhx4sZJ)i!@5gkE>jCk;<PIG?;+X8an~i{
zdJ92wIwXqaWn9F7h2>l>xXwD(Fc(nc+$C}^+BiSGy1vcZq?u`tZH5H)0ys9`0OLJs
zJ(WHBz}_mHKV>9t{1hn)mu{@7SGFaJ_-3W80k9<9brv1VmXYANsepkZU)NV~sQ+nd
z$r{vlLC;&rU-t)AFRe0|OKlS$5d-S}M^4h&kD-gX9un=HK^dn<RQQ`UNvu+dxMo6O
zLK?CLB=jZf1LGIX2|$SU4MU;@_VkU8Thr^*$?4wxK|%_j)Eo~yfZ5#O!Z}LdRD-m1
zf7>xE&8uE{IQJz57j9kje^P7j(%Xym-em4PbbB620rB9sH;GfhY`#J`Z+qA91d}}B
zI@LDmj{^W~Qem#JYe?p!EJQw}Y*Ikf<6pkZHC2<-4dhpsO<MNY2FpMrSw;=ZjVF?0
zO@_~(LUT1(;_yPaxRzq+SW(3iS6K`H_s#)=B!t<s!IM1flZn+5;(ohFDtHlIAB6hA
zzdqH}U<kXbGi4#_pD*JVoZ!?za`@9mNL*{$)B)u{$MqFH8*5KK*e;#F^&Oy5_%3s2
zk481{$A(J;7{_azZ%Ml|R&DO|okBE2tAp>h4kz)Q`5^xnzscE!;z#0!nLwm6Q{NC(
z2O8!RV`G_sPmFIpD0(o>kQ>pFk-(dU{8yKQ&9pcR7jDmCAeQHrhR?p41C*rkztZOf
z$8h*$oRTu%vBtT#e<DhS>y4Pw!$2|OI$76d1c!P;bp=d~n=agJ2<xZuJcVBCaURC~
zubU}sSCu$}?Epy~mji$Rr>;RT7Sva_*R9ON)btLkbCgO>SLSJDnnWu&vi-Dg>*h7o
z8h3Em*k2wI%PQ$;U#j6Je8*5W0@#k98?X-s`fWADiD(jk7v5qNEb%K~Nh4?FL_cID
zILm<C#0p!Bc`%@g`MZnhD5o>)r^~}WUdgQ#LD@tYn5aWq+3mD3HuvDA6fO@EO4rPJ
znF_e!pR`?cDXL003}|pg-6b11YXZL`B}<X>9K6zYjTvWQ1KP7($Zq^7EYwd9zl65;
zVv0OIa~)Gk{5dQ*Q&>vev_<N_{x{b^_1(am&Dq0%_YaUkkO{YNzAJ`Mcfp0sPa%Ar
zorNWAHYahqmKI-bPEq+jlktk27(Ja)(JaaPm6La<ca!{ApyzTMp*femrdX4GdauvL
zwPA9hE=0^qqox}81XI6hi0X5^_lY=BeS$vLt*i}>V8RCbH?p>Ja&U7f0rw0OD|@o(
z1<BN*O7+&hSGz^Cr<DR?6mPw-_63f7hsNFfTx)*?8L^O@58R%FY#p_ECU87BAd;b+
z98aab76+d`agYt&@5Qy-6ztzewv~-n$cm0Jk@o6%$1!|4{adoUzQ=@%aLk@&gjI0*
zlYjG-WVI$(^o4x*{%xu0r1Vb+qV|F+$y43?x*x+(q|tU+oe)Gtk~_CjL-mpoV*ItG
zmBG=v;BEZ!Kd9QLNXb)AqO*E>WZ62~jf1uZX(w;7TXb)cX=U{ovA|^?kFo<b>YGHr
z;`jab^K(uI7_U=*5uT*DF6V$nb+^hffCmgepZX?jE3eIYnEmvJ^z)Y*9Jm^ZH=0?5
zk6KcXe^YyUsLjQ7o0*~v@0a9_HJYumi7&Jxoe<u&6WSgYwoF2mFLrlRPi?LahWLKr
ze;X|*f7E*T@dc2WJ=V;Hl}~^na?nOH+ZE*kaXzg!AYGj+_PF^Gd9elJ-B(||=T@~^
zu@?;v4?cv2*pc*n*-1l}9%3{XVG-Gh1T6|C%bG)8J>45b`-KIZjT4Yh=2MYC7=f<@
zx`@cZ3<aG}<%!3pL{m&jk{x$zR=8Jt_Q2%X_a*pO%d{<!FX@n_;Zdb(rQpLd-*Dve
z&#Fln_wwFMllc;f((Z(?Bd5@>eBZ^1p172gk=s06HU78RRxO>)9X}Hc10q)#f!-1h
z%`?F~zNsH(PB<OUstH%=-do_0q6R5}4ZBkY6i2A<voomNYnjPW_QJ38<bT<{R;Y^0
zl!?^0%og}=H)Z;hC-L?>2Cy;~S(yY%%?JAYT7BIVwaj$nz+{K6Fz42mqJ}2YUG1UH
zH{{{kkMnDOdryKFYqk~H)HJcQLXIe)*Y_GQ#a9FkDKaQ~6@;Q*0MdfNyPW!xtG#9R
zVzN8QIG1SR-XIRG)xt4LNmp2!h_MyHnG^wBRl~P&ffLCwDJ-{(zS`SL$4YCo(w|Kn
z+*=8EpPpYcij=l?o~Uh2Tw!Gw$`y5kRxBT!%OYquMA9j65()yIZ1Hn7-(#R5K|3D$
zUH}wa?dti9a3_J0s@*U1JfH25IM90&P{m+o67tp!3W>L$Zr*DLr!PJ7OsfR5k}=yU
z8tJLVEmGHA-fQsQ7VXSJn3%Bt++9Bmma8F9yf^qgdQIYf!FzL*fqcmUhWxS5e-q8j
zH=eVNiR=Q$>(A)Kg~?_>$}tE>*Zh(TOtul@^1>F%NRFq1|E{9v>dFMT5g1!_{NB1k
z?ev~MS*f>^J5E7WG`^*&`1(Nn*VvRNS*b2=mng~A?a_pl;^x<*?>PrGjh9Ysj$nI1
z;=^XASi9|M16CRFsh&68lbY<O!%oJU^Q(XcoR6x%HP9Y|M(J7h$uEunya1>lfh8>l
z?b0P>66Agn>Qi4CLM0qth1L?^aPilGt=t@LQCD?>x~}jl7ahg)z&&8GebDNvN~{n9
zTbs$5!bpNQtMlG;=Oi_X2i?{2;}_*T4hBhAn3XM8dn|VvuR2Mnc*WajO5~a0S{d3B
z<b-1>9ZmKW#VbfjFqZER<rlzL_xqKzyhvY{T^!<RWVfmC@ClKlYe;J4PIJ(EYUr=7
z?3P95fQK->29AZOe$ife<X6S%aij?V8)A7ShGvVIFF#_@QWWPzNVL4JT5CgR(3$>w
zpZ<6ssq^`!r_5jfmZ>yGlQNT&qit5TlW>K5AWdrDsi8_TuF0y@WpxTG?v+KZ(rBea
zB%7kQ$MWYPM(spEypdvM#xK2t&-#B8{GBXD3-(a}zRpE3N!w>aqeIx^hZjIh%7x4K
zPcRP7zt~%Q5o)471HNe?^$Yz^%uoHa;<MbAIHAnnorx3S<aBdgk)70ajZ?vND<gI`
z0vSTmTu|4l+H6nbQfm?6$r9v+AHEKKy01|?PJ6Owoy|D&HUj-xD1o<?tDKxij|dH0
z^b_gRYwdtzm5a%gI2TLYc4KR}TB}0DaG2AW6L!I_OjChPn&yz<J@DpN2A7Q1UzSMO
zY_d8&#{6L~P6fJKWWAwW)Th`$k_|AWuf^a||0<7qlWA4QwB2b<^-0`66icS~ZtRDJ
zg^+p`xBVtjoUgh~s936k^xuk-u}HMEtujW0sZ$kf#+)Zhd~2PZw)j+Hqv!lHSuoK$
z6(EgV?QdAZJ4p|qIz{c7{4$jCEQ?dMHkPgO-Fqmpz`;&}g-7{KF0lbo$5qOy8U4A8
zlQ%|GQL@HzKGr{cfdQX+0%#kqbigNA53&Y^vNw>>H3zM{$odX!g-4oFB!`<Dcpvb~
zGuqlgwo`xYQ84{afh84st<urJ-95DETkM30`O4>UsCE}hFp;l|QsZ<AR#xS9_Km^6
z)09oEIQIgeCwqz61~73PD%7!Qw#0Z-Jyrh#AoTTmd{+Wz7b)tT9&_OtPQiH?Azz-L
zk4u!5yuO|si0yd0u@-jSMdZNO-bm?)BObPNmVB#$OXk6gDSX%)D$?~0Sa0@7N9ox*
z-?aH!A0U>)(1)#Ll@!+d3x8rL*X?M6W7{mQtFdFSW5dK!bqabP5HD*;FPZO2W1&lB
z(w=AFXB^7kL$?*DHwGq@WOe`&2O9Z64lj1?)c$eJJekxR+*wNh!~2tyIwCkOOMGj!
zLD7Yz*6ncc+EIF=<DKSoWRV*;xb#EKGSnGSM1wkFf)611)pJj9Xhmt^WBZ>9DiIb(
zOF%%#{Q)yJ=CT61fi$m8>le8Yo)Gp!aSF?#wfC2YqE0KLjC|oF(7`&Ic0i|rIIZHc
z1nX~tF?r5&zN}*3;e*;}h#K4)My5J_jm13Ygm2%tpsDH*&=6R{-hGlRb*JVk6Q0nI
z+c3Uj`*qW5hVctsd)%-*jXGD(OhX5wV#<L<U2S_LO+IqUD3-#%otTq5cYkg*R8+;0
zx9MT`)&;9ZzKM#pvz!zA+!nZKTCd9Z`ZlmgHK_P39*NmNpAw$BL3Tn_5y(6Dn$b3c
z^`|W58WUD`-jh$jzPXG3%tJ(Hfe6mO?t8r%fkmcn;V3IjbJb%UXP9JE305A7u^qJC
zw)uE(F($C-<5d*bK=G5ClIOu8B^W1Jq@T!=&?q3^I_Z4DH}Ug}D9=AORY_SVHgMuo
z|7}TDlIUNZI*fX~0B8c0a}_xoT=4B7Og0YC75nZw@cW40;NBuZuB^%VBd+&Ls&%n{
zT4Si?^8BVFjwS4A<Oe&cXOIaGY3Zk{5E~V<Zv=;SSFi7oEKBYG9vBXE?EWlU9`P?_
z%-~GJuEuy9AvTCWBQGpbo{(R)Y-B6sA2d)kI!1g7ljpSl=zx&JjW(XVFkRi-a(`6z
z{HmH`Jc?V9(F)DjBolzg>OJ^r@^S+6;$Yn@sbQvGRUtjHo#ap{wV&42_SIrs<-MSH
zpF)%#JKBC|{uclWLG`|{w~l%A+3jI-gpx>ERlbDqX(84OlfsQCjyBpJMni<pQ-R3>
zsYEV)@!}u&DP-<hbUy?|7x!e;FH8O<QAg#P@|%y_%i`6^xtr~JShix!WBURGjdDIv
zbDRypa!L0!^PSw*EonTKS5jO_ZI+a@VN{PXQFiisHgouP$#2?aTXuvyEH9nNR1kBF
z^#}W-@~Y$~nEQ|Rb@=bBd|kZOt$ass3Dj-;x#OD777FOVj1V#b7|wIfdU0O8t6tjZ
z_BVI8PZhPbv~4t!%E5LjjFW;#VP7Kt$E&Z;u6U93OT97~Qr06XYEYLBqjolh=OYI-
z>|YstMXlX<14T%+WsP;MQr_DsZp#5tx>J-Rk(huZcOafR)@@o`p>wbB_l0kKZE<hn
zPY_v1BgmId(r1bMyJY?uBpXOG5zjw!pyU%@GvD}gOxAulco^!sb+cOP8m^)CozMQh
zM7x+Nmv;nws0ipl$9kJt@yEoQ)oX|GlUyKCA&%Wv5=O$r4V<2s{A<rXCeJJQKfxCv
z-_94e=wu}B$(diT{0g^>4EfKbziG`2!hi6ETE%R-F~4nA)6H98hEWdx0NxS;1GgP{
z#dsgZ>o_!>1H$PfA!7S}qK_Kkas=q4XYj8px_i0VM1|c!{w(v)bKbpQ_JbRIJK;q*
z=TOy{f!F>&O8)@twXA9Ki<<U4rpDV#iL8Fz5>Fg632s&i-6fqqUD58rRU8};xf_mi
zz!f6VEp8fDXyjyGK~^~fI2k{P9Vt?H?YZ+dGcMK(o<=zpIlPTPPzd1k@6xogChTp_
zgQr?vPa34s1yw7#@r<ZFhdpagOw#Q@mSg2Ko3{B*rI>;<yO2k>T-AM6Qy!^0I(c#`
zqOc(6K3eBBXHJ;;j!Di(Z^DacCfWMSefIm?i6ptZlI_VqH0)U8(>2I=()4M9#b((V
zmO`n|EODF)?_LiviTAD#;x2)vYkJp*Ej8E#+EX<CV@D%LDz?=MP^&2ilk3OUywk0X
z(Dep*uYpzsTNdR={xz+O>5J*wK_d+I#Pk09R@Q;xe+Fo}bjM7J_9EU?a<h-U7?nXi
zc{rr;lvZO<vKD2<sJ9yoyf!yCS_EJ$Y*Xhuvsu&XG21YVumm22*3yvC<S--DbgrXA
zO$6xn{{U*$rMHysEQ@SiN6dTB2Lq?-i9FXa1It-mazE>Ym8qe!-)NTrH_RkV;QJcu
zHEVwke`RVdXRWQx=h-IN3AQL(_idhW>67?Vbr^K0Y*=Xb@ahqlQ123K3fMe!9jF72
zzkxpAWV`U;nC;Gggw@SvQ3i)`x0cv?oK<~9GitU9TqxY+{{Y`7{A*6)%G%>kmOHzM
zp|*7*No6}#7aWplfxvh%oBL*UQ@xlmXY0<-{<U85O_jsw@+F<aTHKaQOsE`zxMzdM
zOxK=xM#IF>d|UqjLB59b!Ye$?ULlh4i&-|E$Ex{-dUMmYdgiVJT70X{M|wbESV1Yb
zh|bZpq<r39arMFJpH6<Y-~2j+e{PYUe1<=$u0GW;2OQUP@b)75*(0cdznGwAW!<@J
z+mAyde=|gOfmj?0bn-E|n;9p}VV}mHrL)Upw<drp>UQ8;J^%wCoPBGV`zRL|2L*ux
zE9>{GsJ-(HEV%_wtz#k|I$YrWKCM6>4*Xg8G4V3{#XA20itqGzF0EPQyp~w+q8nmd
zlg9^z9RTfIFOB?Tb>hze>32(}n=3mESOq$alX;GQVnUSxM+1ucBjX>&F9>Kp9`O#3
zb9}ejk+PZtV`uZe=UstV<7%9+$UK3Qjw|5pSH*Te@P#IW6_cgf-J6D+Dn<%{wBU8%
z_wQ7d#BTf#@SlvepA<FkhIDDK=df(e3SA@&Q0@(ea;kCA^PWc)_cy`o9~IkZbHU=x
zH0jevDK_Y4jzh4VkV;6yuk-KQ<8Rs5_JGs=4Qe;CYFZT9gm-Z)25U)`UL*`y;R^i3
zlii0wUwHgH_?6+$in<!=z8t<=$UzG<Og75{{{VJGJcH@j_9l}}0eTBu>M)VV?-c&E
zC4z~3LE<vW%4#J+_VS}Y%$m}(fHmxR9Pb~_qO(ACZEdmlujI-66n{Zd7djsq_^U?n
zFN6-Yu3tx|>Ch^(%O^bJg-|(WCx8bgzC!WO?b&;OZGUayy%OHV8a9sF>rihtQJw>o
zA1aa8Y2G;JHFx%#@YlpYj($6fLGa#-dvoE<0ag&<O2sA1AZKz<QUe4Ym~3@5;@&R(
zl>B+%ZwzW0=DlYXg`KP~Df49+ZK%vZ9=|R=q*kg8tBaW<$p?=$yDNP{!aYUiw!Bcc
z5xxpO2w}(61Nc`xZ#34o2|P1P6v*3_NZhGY>M_!ltz6y<ShGFDFkCNE=NTWL72oI{
z6Y&N1nry9YUiA(mG06~=sm^eq=WioFFFw6$lpEMhrMcRCF#WImW#In+7U;MBBD|Ny
z8f}&2cMg;7`$z!tQcejt?D@~A>tCY(02clx_-o?Um*KAyczaZa`%Ba`u{<(#Vf)7p
ztU88Lq%!pc8vL`={1<g+q(b*z9+5Z7$S++T0~KPWR~S=*2t7_lJ5u;U={zCh9XeDu
z*2xsAW{Nw218!U~18MAd&Uy@kN3&w*?0u8q`)0iOgALhSM<bsvpWqn-`keY2`@`Z_
z#G5~Z{{RNH&llZnWYTo=BvG-zmSO_MAN&eNMf_{>t-ou%Kf=B+VBQmyC8_e&7WsK!
z;W^pqiu#}Sl(6`_`$G5!L-4kp;6>2%$gWoM@X4&hFWN$;B2ZKS7c5E7`#zP<<rqJG
z+U4ByU)i7bsrX&{IQR=$)_hf|UwDt=2Z`@q_WIjOw-U<|hGGPgIaCbJ(lG&v!Ca1&
zd*es#bK#HLYr>Zv6SuLs(R2j7vzG5sGZuM~i()m1pgC5<5>7IM83#4<Kf$jb{0s0U
z$BAM1pYX?4@lK&F;f~e?yeO72F9kSsEc>&TJ(Ob{=Z?}mRco%@>kp;LbEixNtnh;x
z?2b5<m4_Yow0nKClbmOxmh6V?kF!1wd;<7Q;tear7nYhXrK}wu5i>o@Y!ZBuH%x!A
z?Ot8uk00pzKZow^^luDkx+D2Afbz(%FEGfUkM^=gJ@H;~Vd9-nO|!d#4;SlV-t|J<
z!)<)<M>>FT9aMnB4BQ`6T>agyn-mPuLjvH9<;il(-><hdvV+{qpJU4}r&*fMAL>>V
zRUi5n{ybRzHR)a&*DZAY6GU5hpi&^2WqDJ1GBY=9^Z=*pUSEG^)^}6bvj#ToLNMsb
zoPs|*{xuXDoyC-XQ*QFX+_?S|Q5C7Io|+#-P4P-QjRN&GON(2#F%?)A$zxUrgUYZV
zj-%;VJ|gj6nQ^Y$-C5oiNaa^j@GoPYnIrQCylpiWxo%_;j^*=@(ur=Mw;$`~mDPyE
zY4T&&B!l`^wnjH*{Q8-^xsu{mM|l{#5V+)=lgAaM@t#dF{Az<u4Gc?b7UkW$4~}{K
ztD5kMwAOXVE#!`K5Ida|fw@8CXFPgU&0|N4QPi(4E@Ym@UD9G9ADe<Rv2s~{Q-vAl
zgPb1n;h-wZo0Xrr{u1$?g{<hBR^Jh5*VkWWkImb09E85no>lti+P^3N0N|n!StspX
z;<mMD)VvlgD2E$&{gN+FZKv_Co$q`xduGt1Kl)6uM<jND6Ep8-RSKh%!sqBmt!?Qa
z3pM>~SB}9gF6>rcyK|}9O$1omoR-=^^d6*&!k!ipmE(KAHva%I%CdrTo3c4_26&Rb
zg#C(jO&?D9zP5VR<WWbe*|m+lcM3eYCut*PQsj+<g<!3pyi_;HTD<$jUkzX3ww(dj
ztn9TVYt?zDvbZkZP+#?66&T4U=K6Y9H7U?w@WrL|o#fH@gY9J=%~bhm0A3#?ed6AS
z813uSp~&?jHDO*p?x~-rK0NS7n{lN}1op99L5w_C5Q4o=1z3A>2*^1E0u6i{<DUoV
zJ_Go#s#*(W)og9!7gl<0)_kUdOMf(>lX{=s7TPh(6+P?ekA@$#-M7T=gK4H~PciYW
zl=ij;;w`1_qLNgJCnbm*mv$Vt1nqCVBbxFL6?`+Z_>J))Ad|&$tX50pU0qEM&8l3L
z3NSKB-N?x4$rYsK892t;vyO%urWe{)a$e1P-F_DG-&4diIdsiF-&2a?OIyafxALNP
zxRNsi?^Y53tOI@0FxedYR`sur?`+-%8(m;nRZ*TmF%&Nf=L`=j<eyRpZY$kBCH}_I
zXdW6}U&9*Ix5*rSWU=0DVB;CwuApFjMP&Rk{gG$!=9N9vo+GuEScyq3w8mM?E&bPQ
z@JDfv#)nO<(XA|1I_mIc57|$~Q|f;nd^=(GsqIoozRoP*XE9E(SX=^REg|HP9~dKW
z;3%(X_{*m(-wpJenC^bdHJ6B$#IYo7>zQSbra?b^b<a+<<$eVCL4W%^{?Pss)-~J6
z&xd@;)apeF2+6jY0=VY{mH=Ry`Y%E829YwXcT&%D7o8)rEySpw>sYDTyKZrVkOx}9
z)8?8*SFEVRp4UEEywdOD((VggJczc;-@I85NSD!y_pUqQ7&Ck{@Z6)SYqzlsdqr&D
z`#pV$@rPf~r$a5JyFh^kR7}m2fHHDVrF?nu2giDLp`cu8(`drtc<-L#3(<D!VgxFc
z^7&GJLGxf903?7huP-UjLly1j;-j~jz{_Ux+^QfAA$_3%8;Qx|9c$V?CbpliU-$;r
z;C-^)t~EBE2qYWw`h~$!!QhY-jz&Qh<PvIarb}mW3nI;Ha3)f~5s-7p@6cDQc%$R@
zi@a<900_>Js9f4fr&!!1a9i8y_R$p%{{S`{VCUvIB=B%}s?_a0BJ0BX4UL7oHa-kC
zgUthc(ZaijoJTFVvEz<?E5$WG1WPx?T_a9gcw$@ENrEfyK%n7)<NbriJJ-DH-xF0d
zm}Z{N+S~mn$#1n@M;06HOoZ)FKu|$HL7MaT@phFbiS+G3wM`z*TUcW&I$W984<Rh1
z0KAQgPqFu@MhfV+@Y}*^<H6%?7XBM1wzbr4WD?74&nD?tV{CBiw;oq+xvp;a;8p#e
zqR{D=aot8kadGl8g>Ah@Uevw@_>pDconOWCw!H)&+835B5sKNS^U)+eV=f8VwONP_
z*MVAApBF9U*Cu%GwR_utDT<V{ML9AOPB!$wAC78W%Usvc{T_}I2^r5dQG5peJn^1|
zV7HB@n38$^(6I?N;4c^?btDSl7xs_vs<~IQ)s%zR$&CL1?MmD5XYDcJ4Kv2tZlO8U
zAhV7cqLrH55;p<2fX5>ux&4J-<!4W~rToXQPw+<LNwx^u__!AnM+hd<Zqm{NyYHOi
z9V?0P)`&C>b#%F|g!0?MtL6nDI5|Bt?_EBx`(OMvoo$3#jnUb28?iQ0V`w~{mE>O%
z{ycam#Xc^U{?Aal^0p{he2Eu0?Y9*wjZfuc_SF9XnHp%tXAAd}`>ecId1>%M<5tq(
z)Z)~%=vLw}C`nPt8SHR=y}MV7TYO;ffZDC9$OdwEK`wtpuY1tEQKfjV!&)`gi+T2|
zCAC<~DzE}Uo#PA#IjNO7M_DTs8OB;g+~)5-6WwXkI<BXsN|M7QOz|UzLdaLAKEIV!
zwD6?*Exh(KT*EV&M1kRi#-L-SGIQ6j>0RQGI}`Oai>e1YjKs*@dSH5eD>GBiyj|d}
zZ&8lcO$$)8vb=^(#jhf15tM=m!1eX3I<JGZU2DTv)-p?NZFO-2!aSK6qLK&)C3D}>
zyCqis`TU3YREnqj$MmA&Joms~4R3rYrW<>y;JKH{X!pijl2;iy6{mIKE7@WSJhRSu
zfBv<0U_W9%5l#r_xc>mYfBN)X8Ne@uFXJQRjQtwAZwFXOr0S0~(rk>xR1kB{N2k!%
zxs9{bepJ3wdwx`16LXoHN0`kcEG(*6k<VUgHPL6zN;t=0wbcmU`=j&!0P9nNIQ|v?
z0KUKa)LjbaA9bb7A=<X`vB>@tUQzL~$Hw3Ai$0g&y(04GTh!$+iLKCvw}+DM4`aws
zdv3_&3i=~#fPKaP0KUKa)#4u+{wiz#01W;l_+9PqE-iF<pfXPdyI@bUWG=n3cH@tF
zsM*L(>7nqi#czNg5Iz+6Z8cvKX;Nu+w=*rgQp&^TcK*1@{0(@1n`<rY+N2Qq_&b<3
zag6uJJ;3~H>A%|p;!daW0y!?;?($tdwHLXL-r`cr3Li04V>ko}K;ph+(Y2=1rju(F
zGAJ8?$3hN2O6o~6Q+B!5U3e~Nt|K@4P0p7Ik8#+q^ZdCO51+lqd<@l}0(hfd_+P63
z0BdMEmCl<bz-xIFMj2#GsUfq$!8r#R$nBcW)BYxEdRD^?-ND*hrNoPjuH1sG2>!k6
z7VpJ3cdmuyk<oHOyKWgLp1G^#MtsemqW=H}K0Ik2Adg7!{pO)}toXJ&RGM|N(<gH(
zfC-QV4W6Sv%DV3p{8RAP!!)|T@l5yH1)ia(OZI7RbgQIUG64V|FRli0UkH2=_|1Lr
z%i|t}<4eyD-QQVhb}wNp8f05qT)@brlg8|_vHDki`&)k4wqGB9AL-s2wD5+jqukr-
zX?(XA@&*hRDNv|TGn3{6*R^rVolbo%%h$ilp>dM3vFW-8?OSuB{6oLg((7CC27<bb
z(_2Qa5-DxjF%Hn<AwulHAP@lKHRL}W{wiPmK(f}QeLCg{uH~L(`$nK-D5rDn3I;3Z
z{Wrxo*4Bv;^CM`KAy&xwM??5@{HgaIExwgXG=!n;U5RPAlhNvA+Ul=ks>OPQ<s=e=
z_~y6m{9h%rAz7s=oB$?Z2+n&NvGAMV$BceBc&c9x_#;I+-l~v2+gq)~Q0$3WRhYD_
ztBksix#qpDPxvN>$JmitPYhYY&C)j2?MeM4BlW3X?uM`4)bUI2h_{#edRoaW#bYd2
z6Uav_PeRz^IN)~mtcW#h+pR?!Gb_&0f`cTIbH*#)X8!<!a{kaUE+g=iFWV7o7Hgl*
zQBi51@J}y~*1DV$T=*g5g<CAktJyyvMVy+ure!ALu8#rnZndcEej>coZ$WFBh%Vaz
z2MPv201nmq0paiXDer?cPY&r;58=NPTwGdOMFYqh6b$NtNgusD9C}pJe$77@Tj3Sw
zhosSDiu6L3h(w6)_WAjcZDKf37m_$Wqn|9$e`OzuJ{<A%*B2iQ^&7nb>>d$r@I!Qh
ze<SZ;mFn*%4n9)Z`L^?n=|ZBlSf|?dWX7tN*Iy=&l)PcD&*Og`c!O8d?BrC`Z?3P>
z*<udy#?JB(a6g4}lh6Q7X?SL9{{RV_-A+r382qRfJDo1;DJ9%8@wG4xc*BOs!P-Vh
z74(*q`#Ste(`37f4}_YnlvfB<rjFH;LKqcwB?E9l>A)B`>t8<nTKFg9Uxw4A--x^;
ztN43Qx|GFjCH1t3jKF7NvjLnA-j%;9Ni@lYS2;L1*v7w__R=UW5u|G?fK9x_VO$QQ
z>M{WxzY&^W+BeONJJ)US-&0=*X!mx$EYn+9@W!JQlEtQ(e6t<jl<5rW_$4-$1ghh3
zP#Yr^Lf^y9sCb4QCr^}KnfZm`0k@62y@=p)J5wB$wm9kh;>z+8rGD#rfAy+(t`(Q}
ztAqXJ83+6;>5WVFP)#Sm7M>?fNBdjtmhwvk2?0=8CO{{4PbG7JI5p^>vk&a8@blw`
z!Yj`a+}mC*t!H*E?h-q)h!ub;%Ak9Z$v<~J=x}k|=b?;+XJ~4CN*)ILtPjvsaztbp
zRU<tPE9yOC;HHD4UInnx_cE{rrgoDf)B;HTJ63+F@RHwCMv;+iOe>a?04jhp&!ERN
zaz3QIbR2IJgZ-br8!o@%Ic8wNBaCj(OlH0N;>Yac{jcEv0PUR?-~J|+V=`N)$+(1d
zz~e5wk?Jx%E3f^Y{tzDyt>jaN7Y>Opo3rHFO8@~pWECWjabEubcj0)V(x#d~B$D0-
zXp4>&f-u}Y4j7F38tsH5$!2`TTvca@_ON;*^73svOS|!KzqOw3?QP2>ergD0W{Mkd
zs=--;jqd!b6O12f>TG;lu7AQq1>0VTk_0Gi<04JFm(YMS&~wmN(3(HNjb}&rC*o^e
zLK|zAp58XIcv)D(F5u3@x`HsOKqH)HzIf5RD<!?ux`4S$rD$DzvN$BE0O!;kAHuLv
z<$4~)TE5c!>fH@r9;T)70@);rU$t9XGDR}Vk;Ya=OpX8<$OoTqdhsn+!B^U5uxyeO
zBR&cM!+=k7Uqxu17`?u^)FXvrj@wa?81X0ilela+?}52U{{U+}xvQ!C2foxbcyBH>
zMv4`Qqi?fEm(M#}k^#Xyj^iUEtyHPXdYR$zP{T`+w2{nwIJ|$^^HR3)L{nPd_@yE*
zV-qi#1*v5t%^>jX0XPI>KBBX%d~ZFMjP(6OM$|8?VP=bTan8zOVm8PWf;i=|>~UPj
ziF`G!>1@wDGu_&5K2_SI7~OM>jP%c;!Kz*qvY%J+1&yL9RB2VEk-qG4gO+3H0LiR5
zb+wOe)QqC#eGk*Wg*sjDh`t@`I(DHW++NtLtF**!m3IxLy~?m-?_WIpDZgKZKei5s
zYilfjWYwmI+U6*@SrSJuIC1N_e9n3><F7vV@N-kR(Y_aI+RmrG2{k`D<yKx9V<dT5
z&-*IBoqT`c9d=I_{?wiux`DR{^%z*UVIQ1jZ^;>rbk6*$=gZ*Lt3PMw`RIM^`&@h}
z)AjEKc%sFkiJ2^=xVI7@Bg_b0di$c+!(R>jLh)!8)7(vk*~dRjabI8l);}7e()1lh
zSRBo9G;JJFNAoi_-Jk$DIW9U^=bSqI-IbNSlSabg5D}D*x<_38HOje@)cPDmRMn3{
z_=n@RxVDlA^3#<#QO*DvB>ey;vE}$n;mvd5jg{T2Ys=zUZam9}xe=|Aw(^yjr^~pu
z{{S!yo<`m>YEKDXY5o_y)UGv4t84p-t-P@;U%U{v-T_zwI)%v`^&Di@fbq1Z<iKyz
zD>A%6EN`?ndEgI2`d3PVddZ$ruPQH=ius;d;=hL4{+~Po#^&Ewif$FGVgdJKkje&e
z*PrEH@9|f{)_NDhpAXx=hP)&%mP>`2>eSEYx@;R+q{t+K#DTPZ(aGdjW1wiKR`@yM
zjZXP2<~Ag~mDQq<t%MGwZo$remE;~X`1!5tz7I_!Qqsfe_D~g71ZA>vSf8#xDjhhb
zs8hybD@iEZN3WTho)ytG4LTVh@ZO8&HN<bdH7TVbKGIIjuan9y!_U99Qqiq+sk}oQ
zLv5wnE-m5_e`oos3bD&)aOCHc-vYVKJH;{hvi|^2({1!SeJsAhmq4*EiBBT|bIW7!
zuS4)og?x1@TwhzECf}B|-TY_$y5(&5UDoB#gL(?;bNGgM^+@a<ZC1@$Vz)pKlF`V8
zatL3T^!BcUR?%*4_0c?<obt;oQX@KuhC<3n;2`eIe;Ud73#Hs^m%cN$8k5>VXQ)}q
ztpssp%!g|ey;~ecxC0$eTC?#JLDn?uxPP&mR@SETXGd634#f@*PSgN$MMGh)G0;sR
zGfB7m$FJ6w(SFf)401o08@N_=UBm);AY^ChnysjKXZ{jh9{xe7U1`xlaT>I?gXSf-
zuw3p0WFvEf^sZ;c{u}=Qgg?X{5nDZ5RgyhcCA)a8ui8SnxOlK|tAYExfzMvN*RP1i
zQo}b1Zi&mXTxMs>I!RgIciVr+_A5;r!>~`~G<ue*!=EwTEl_(D0zya8#d)uYHHU{-
zy;u?}cv4apB_xCyI0JDck8@u8pj$QXi8QFK?4q>Or@4g&_yHwJ0O80dC+pt6XYozQ
zkHmVC^&)m3t$dy<8;FWend|aDOUW{PzY$V&{hEBKZ?9j>pZ*dV^Y^1ag?+*ME!;KV
z!R;<%v~QZ@?)2hTAJV=7H!EL${>nf%z~2wBAARnQasL2M5(>tSDy?VBIW~=R{HF_m
z!$z$NYAwkvJs<fVz=RWw^XXYSkj|k$`_;05f(ImhYbN}Er`&(OYpnPSmDF^pPzsM2
z=}+FVt2?k&QIf>q0qa1UC0cOnSQB{bL4aiHmh$^T{$c+B$8%Y8{95qr8l{DcPjb>;
z%CN-iZ1^ll7~~I8R;kVGj#*+UN8+0M&eJ13XfC-Fv-l$JZF)&AH5(hvF=E>tp|L)6
zQXQn0kjO#cbl4BfIrW_Q8qYcM?f(E67LR8x#=OX^Tn?0;W(IRpp9EXy<wzI(*zx?U
zl=0@5HiH$Xm3K5kV!()`ZrJrc^wlXhV=A@dN)B&ibcRumwcvlYRi%tS2_^9r$SZZC
zT*WjFyzwKfZl~CW&#%fWtGCpy+2%p0U6QS|?vNh9`f=8=z9Lvfs(3#3JC=KdZJ#XC
zGp=_GWD|p1#|<m1v&o)qO(x?O&zgKa@DIe_9=;zPSHrp_`mT?0y%Ome6?d-;K4Lm_
zuM^fkVjqn<Wz3Ne0P2^Jsre;?%YDP>8oye9XPb7=J_YGf={D;UOR1G)iadagI1(Ix
zyPkVjq^aVxw=9}HN;Q3@IMiKL{`2t4f7v7BEt;JCH}Ns{ioxIi06_+Y{gnPLCA!~T
z{5|n9qp?kord$~_kGw!!f%X1X`pxlQ_P6jK!QT@}plgRzn^TPvM~=qK$Q4**9mIfm
z^sYk7{t6H9r%;wSQMJ^PPr9GkjP3a$C-kdHl;oN7SM2W(j=yJ*4r)@(;O%!*v6&J{
z^xv{bl9y0M^veD09!GFJg?oOLEMFXD@Ry7=4Hs1K-QIzBJoZ)>%wm1)p$o|wP*`I)
z<aIgEZ=-%5{8I4e#XTlnN5gm0UR%W{l_;9pTX&7{4hl%B-49%2-nq{nF#iCAl>Y$N
zC8x<3E3|nymsW)zc70Dg@rQ!+--!yAz9Wh)QqJA~0OQg@BE%bmxTgKAaC)#j5<8m3
z(!XbahdL^cvv@;C%JgZp_+(-9W<p2cYqhg-_gCj6;$Q}Qe(fspB%!W_6qS-ZCsw5O
zl$j^MzYb}-KgUa#)9j(O#)QaBYlDF#AOYwA1M(H_KiacjYFE(ASN$GLAW@7d$RDbc
z_}7p875Tn4-}BQ$WB&k=Vy|}AZR3J8Xya5Y<grnVlib%GTPmL;=`y>#H_e&*tIIrN
z`%!!?@D8zYrE9)2va-~zoX0h?q?0^MI))LeVDsL+HQ3_6BtLCp+E?ut;>iQZi7muZ
zghP$|LaaJ}bg}#?D?QIjO2_DAU$%e2iJ=n@9a@M_NnX<BSFSpk@z%Q^1pIUOd+{3S
zZG1Q5Egx3BU`pCScD{Q6GDwJ!<N@Cm`15;X;r{^axh}0_jjnN&P2V=|yo&l8_Gi^1
zhvMgg=1ZlL;^JpV8xcz#q_N|b1McAc?zM1Hp2lugKTiGY<!|^Xzk{Xmf5E*GZRCzA
z?e(N9B%i~WCggv>g4ffx+Jb4CeD`vzyl|m*5sa||&{u^1+SZVGllF4IxsFSSjCU6I
z7V<!>U0jl@l~76h_#%{7ysk}l{hYaXKOy{O;C+8cyl7_MsH{<|?}U~LtWG%UIa68w
z0f$hw@okO7QB53{jwS#C8JKdYJ=ox5-n}x{;ij#qYBtE)_0`qw!}%<J%`9t?_fA*<
z6oLml=RLWvUGQzar^CCAMoYAk`WtlnUA(up#LW^M1x3Q)n}g0qaz3Z2L0<1e%AP8$
zX*J8t{Tes^HTbFg4e%4gnjG@~0HwhK22Au|s9XO4K>aFj*pJ7_;E#d6B9i7q5WBue
z)Dw@AF}Sz>L_hb*uMY8sqpEy%)b%Y=SS5o()1qCmI=V8F*c-B-WaOSRT&>@UF8n2<
z%cVf?{hn2#QqyczEC?(J10-iYoO7OO$)@knoE<4srun`r>-QgeXm(m(inOaeUfl%I
zT`v8|xn0>IhDRJSu>3vg=fG&ot0We-W$u`mgs~P=`?X)*58~t=ov<sJ{fV_Z6!<dQ
zHPzBjKAC$UQ|1REIY5<iNBd1D<zD!+*+=&PCaos*vE^0drzVpsX!=O9iZB5f9S2U|
z;aXbEKxkTnk;+?2!`tLE=q{0+SGgG+asGLu#1d`r?xX-Gb+oI;Z;`sytMxfun$Yq8
z0El-NS04tosWiA+-sVdihK@K}4Uq#Ml%Dv`53PQ9MHaFxZJO6mSgq%abG);n5s}yy
z2im_$ykTo5kMP3kNiv2TX;khV%p`v-*TX-vrmf(w4*2qWza43dcc#r7h)nixEM<xL
zNXHe<_eatw^ERLLq9}M{!u~2<eA&gUc~aZN(yV55kQoAQMZjT<oO94ur0cpL#GNj~
zMLK-(-V4irHttts0?>>H<91jnBxGl$dMWYu!aH3~RE0F_M-9YnYEje?k;Ze<rn>R3
z!V_+?Tz_PQV!$)QfKPsZoot#*{t3%GJDW|l_Z}bNuLXQSk5;nM?^*5RHsatcvc|wE
zQp#IyP8i^J>(p1dd?E1Nyy}s7r$L8O)ol~bp6c2qc;aG7RCdqIK*7#2`E$AO{{Y3`
z3?uOzZDMSI`!kz{gXP7jLSH}Z?H{13*WNn#cWrZdX{cV>Sx<dy2%T1MD7gjr+@u~e
z+p(sfF2vNrI;-MK(SN}+J~I4Nm&D@V!ag0hx^a6ThI_amZz2@u<q~6QBr9|$?)w_>
zs}Bua{35w;5Zh+vS)2&WfV7!!;TRncuNCx1!fQW<)*dc{Nbsn(xww`)i>;{MX^aS)
zaSlnwPCN5nW21Pp!oDlCp4VK}A%|3gXM%fa&ydlTVgW)Aw@_(Gx35!7H7L-Vrk(U(
zspkGV)U}_BS210|s=cMW5aF%wZKYf|Ex3XK1Yr7}{{Tw!-|ai?DGYYf$En-I;vp;w
zPUC^kAP_mmPob}<{3qbAhqo6H=~f#2<?b$3+>Jq`b_asIo)qVr$!~=|1k*K(=&kiR
zEJ0vHTizHC3Ng_7lUZ54POeEi^E<AG&sN?i)mCW1vWd*jLh+28<LGO4@5W7Ir(0f6
zrWc0f?T9E=V}eH`w<>zqxmbJ{&^%dxWv1BbSDK8FhG@gz`JPgfmSfc8C%tU7$AUfx
z`PLTBy1uTA8I9DcRwe_Eye>U~HL8rCQ_rs`!Kf(SPofjWYcGdCV|cXnhFeWvR!J_U
zh0fPhC(Hnh@q`3=@&$aIeRpv$h6MKxUMV(-3UTrgj34+G4t}HQ+j!^WR=49@?MnLg
z@*xT=wl?-rDJix1BzGsF&$mw1&)(@XTYM_<0h!0{9@Q08am#0)$0P8lou#*9Tr_1z
z_=#P~97dITx;C*L#8-`Ckig{~;%R|kH=+f|#^(w%+d1uBzl6MFs$GFJ`jnQ^Ge)W8
zz@<UmpF@iC17&k9j2BYDI$KE198<cH8<oc3r=iB>$Q?30YpOb3$J;I>((Sb?O%}!*
zYm1rhV+|xRxJC0$0Lqtqt_MQBde<^XzbiI-XTh%y%`SuD%eeJB+e?`)ql#f}W7{B!
zV`V3D9&;mfBE2)=w}(W!ER8;)e)6T%>Oi>J$trX5;=CK-R<Ed9-fCWEr#xO2nZz<n
z0FQi^GDHk{7%n#miQr&kwt4hz66y^vQq^r_zSJ@HhLLk}>5xM6g(9J*VDx*P*TcPA
zO1GC*)AdV%8NGD-JYXHhRNi+22m=aSa(|206~KIVpZi0{UK6y_<|1fplHE>7*yi$f
zUVe<HBi6bv1=-u)>w<TTJn25fVo%B&Ipe2cTzAC@6@D^k$r}FVIqk$`9PVE{pI^i9
ztaE86URLgx;F<TF6B%AHo70j_eB6=g-UqYSbiEfh7xPPfX#3h<F`44|lK?q6J9mZ8
zwRsnb=1Y$dY7(JfuRE~ZFmbr`745oCxfI%U+?K>jmp5kLa6ApI8E@4HuMF`>So}+>
zDkxMJG6hk<197hd9NUzA52@hVYo8JRCTBk#>-10dPffo7ye;l7PyS6!UzR>7)~>B}
z>0pZPXplyvBC>!F<6o%%0I}=5pR<30UPdnMZ!;ES$<4&3s|!uX-fwgqTZ@HUGNTx@
z<30ToJ*FkgepQKnLB6>E0IrAm*6cXX<y__Sf2Ul3*GB$z=_B%i0}77t=FWfm=HJSj
zyC$Q%d|A)Ne|Fps{8bYznc=V|Ze<Kf+ZuN`<iGd|sXFfQw}Yb`@6@6noUzulR&!4@
z@`P}OQA04sa9=;nR&+7>-x53uq-Pqm2cP=u9eR}A&xDfIdaum-`sUqju4QmZGq;%8
z>~I(PD6f?N0B+xl-Y@uBqWD?-DXmMQo7t`s<)Vr<X#$A$jIyy9%XG(HYwFwg4I+TR
zl^7r%hp+V&^Jndk@NdN57c?CJcxO(u)owKDXK5|2ZhVqMpis(50FXv`Aau@06`DTH
zpB%&cQ2b=Gk~cpPE}k;r5Mj0_pLU3W^&-Bf_)GCC#2*tr9m99xYt_EgZ8a(FOyW4u
zl?fRegleNapWy^_Jc{|}{uy)PoGo$Zd@XyO_VdJrHEl3#k;vHmGUsj&r(QPKxO^S>
zb>eS^z6ZFq@g9nr47Zx3*HBoCnC2-Njv<ZFlD$D4dsW8mTKb$A-6%==erI!F6w7ki
z-I-7F1Nv1@9XL-4UJwb!(}CaS6)lT-MojQo%XQCFRXlAdJ{P*l?w|S)u7tHm$VvN*
z`ZM-vPx!K0IU|>Qlm7sb+<!{wOJHKTui5)hx6^(B=vR`yZKI0jR&@Ee`$UI~S3@%_
zVcCdPT;#F96~_J9NxtXY;g|b8CH>X;BlBbS`q3^mACGbfExhq2pJrH*@~PjBN#S#}
zE>1ev&bohswM4%Y!=;I!f&+grictGtR@%&Vo(6dJ=Qa9U@$2?bgX3?CBiF6GU3uZ_
z<%T#KG_{WA2?8-?B?(e_#{}b!mF0i%@9z*>J4Fx0t3)!|y_rcoEfFRbV$28nM_iNh
z4o5&htFmn~Ms)uGuwBc=r1;X#OGmMiEkZYF9Xz&DVjS%pE_&c`&lT)GId(oJkb)QY
zX@WW99OplcVt&s50JFT`0%6uo$BBR8BDmDrHg`(}vqUHe;RCl^j{U1k$I2VT^72L_
zPK-xyYSAS<B)3PIn7?O5a=yNu{{XGbT{-hT@Fbj0F_Y8xX;;rHilu6)8l9l>a!DlQ
z)sZF+Gg{dBr7aDwf(RSqPN?T3u834~(=x<Q@)hrT-VLIkM<2-7g8UGW4~)9P;GF2d
z=Nx~mkNo}>>sr>eb^ibfOj=<IEgIf=N!!lkHrsjk^Q8X(zH5%Ey+!DKW>)_I*>C2@
zlV6$t0JhoFyf^W~Sf5g{n46d_WVgL_VFI?|SP_g#^5A157_ZPTh@TTQkA^yBz4oq`
zFBI~uN-d)dazh;QM+0g904BAqd_$#b+EjOma}2gKBD%Z%)>auD8pe%!Rb?nscX834
z%}h0DQjK}Vs7m&I9k)LsEIe)Cb=9;<F0V9;i#RoD9_0?0>KfUc9nKa&U2&X72qUI>
zuG8TE0F1mdC&k|iN1}a==S_NlE=y?TStNo_mLNk&*aJKaWOrj<q`wd~j|hA`(0{gd
z>kBCCeB^}4ZIQlbI9}Z3@%YzAqdtXirlt0pETOTTRn~iDMMnqjoQ@A#>P_imo0VC%
zxAoJ~#obaTn@7Az(8(j)x~dMWN}emjKWhsM`;XZV#OWQxx<;pMZ)<ZL%boE&cTqp^
z^T-4rVr$yGPvV_F!TL0srll{HWgDV2fT#em!u23>NFL;h=RPoLRz5oTJK~E5pLLzy
zn<IJ9usj9a7#>GqQEgEZc7&gi`5&Nsbnz9!+s$yc(_F!FsdZ-(vPuvDe85i}@&M22
zis=XK5#kwc1oD4n+pz&!JFzZUoRUV!*yD_THIwlJ!&cr1@iu|t1%VBOHz}swulJ!m
zB(H!zU`9``%i6o$N8xsru4~`gmjx`RX^ifO%CQtvoE+c*fzV^FE4@NbPRD^fWKvI~
z{;X7&#n-+#@E^no?j_U0!DVRi&!>5T6`oflF_BdN00N$af@{a6@vCWu-WQifnoWat
z*`H`R$3G_rj(c-n`K+dmci^8ASeat6ZCWc^X=1coBB~e51B?;_p1-DR!mqvtTeadt
zV|jNZL=y5!sGxdaXD5tyshVom79S9slbdS(UPrY4%^w=H>%B)%(Qjb2)8uq{&C0kD
zHo~f)F~&&_=bpe<)0W!8zA)Tz&THXKH}-MAd96OhtBXUqOT4jVh#R*A3!I)o=O3kd
zW|!ifL*WLaYouyAsl4#a<H?6pc$*ed9Q=+k@{S1}nDiWNPF$+eM+P#KYtPzHmEUhq
z>tpPlBJE!Tc7GbP;;Z=VydkYzxgt1hr;&*40upP*wQq_39Pq}Px~<jq)OL2tCz9sU
zISOMK8NkB>k;l@!F6;K;)qHW`?N?4d7q_;J?d60_FC;%Kh{#JQ05$_>2aMqMs+)@3
z=b=iaShkjk^?3gPX+H*hOYnH`wUyMe>bi=xyiCdR7cnpZpIq0;dRjfPTXddFBMwH<
za#tAi+g#_vTRY7Y#TqQEhC7=%e$Wu}he5n_`ilAoT+yOkYH96@eU9u4sBw&Jf14dU
zWRJqRWA7`T#wtpcOK+#-a#p%b9w51rTZxk5WrRCjNg!ro1~Kn}>sGuktazI8{@Y83
zTe{QXf;VWQieVT;#^N%Az6TZQ9s?_)YZiAfw1QZrS4;reU`7WxudRM3-Cth#Mge)I
zNu~ppQf?MPz?BE?^#1_s*7nsS&GxCnQnts(8mGhS?-1%xwxf8LcVkaXUU``YB>~nJ
z!sPZiJY;pQ2gC4dQtMG@wz9=*9QOpmtqfqXAdSVgl12x7_OGgAK>{MiNZ2q5<d4pi
zNVc?s>Im)`mIMTsBXe*LI{KVeuATavF~&9Swf_JB;C>V7I+uq&DMGrlTii!w;mf&U
zc;i%f)a_CZ-oG;s%D!&aej{p=8=GX0Op3-!k309aDDKV31(@~fde_+cW$mTDiQ)ye
zxDvRsYj$AZvhO2<^#i4OUyQX)Ce5YNrMG~%G45j&Z!0cwk&)Mvnu$T%Mt0D|K{d?_
z-1){26SKTgq;^)bTZtluTQnB$Cz!)}<pwz!Jf47#_%<}Xa_(#2vYi`Eyc5i!WxatX
zlOs3)yB;|`tLZzP7fQ5(-4epll6jUOMZ9F3=L|UO$6u{p@rH?|*lE|-7Cs-eSR%BR
zQzVwrGb=1)f;j7u?NRJr_c!|eIWAQV{LMevQ^OMIz9_vnx;2f2&*9nUwwBV}P{|v<
z?6F?Ffq;4eUo`mNM%7P><<hV8-ws%PruJuxQ`IL>(&KRgM=V0;jt&4MXBF=M0I`3>
z1n~#OYuz^T;e^*3X@=S_D~-8O$S`ofE>BL?<i8Vs55J2(H~7&mZp;>TaxBrt7k1{7
zHGjjFC-4;#_m!e=O4O?JR@;8QUA)f6!+)}tfpw-?Nvi5MM_5HA&X*#|YEE)CVF_<d
z+m3pHz!j<E{{Y$FPPg!0r)3IicNdz3sd8q3M<ip*E%GZBQn}no;kp5ywd@`Nn!;^6
zO}n(7Ke3n*R!2BR3J(Vz2ssCyG3{GF5xya5mVaWlx1QSVVzmUDXAFgjKQB}5`P9xl
zttg)4c_(Q!m5<MF9eh5x_<f`4*6np8!6eTj+g;m)kTF#SmB-#(D&&6&#~(Ipke=4#
zQj*?zWN#?#f=1oK;eJuqKXrdf`v>;XT^#%{@P(_{C6>7J$#%DI8B)-BOax<(;&mU8
z_s7XL*E(&aHqg%?cnc(wf%muhPCDbDW&*Hk%;<wt_meU$?I)7!WwOfBF;znw9ELa<
z<Li&cyQsBW*lt~QE32rr6v|vjJdBbfj0Oy+1Q13s?Oc6@)DY`Zi+PHZJYwEOBoKVX
z=RZMG>Sp#$a^~jx;!C@mlG4d@D;8;3wpociNhg|zv8}GpsC*Unv#Civw2-PtIrA22
zRxsQga>Nd`&G?$u75KB^be+>|M$^s10zcN0c^qQ84+Rp?>M9Q{DNug{{x!hsm&<+e
zH$t8qh~#^GXRbHbk(gC;##D{8PxMFWoF#>gJS{rPTFMVkB`5x8(Q^1lOVO@(T7rlq
zGYz)@pxnie%d_A6-;I3z;?ujtx}hKQ^C$j<YuL3774<C^RY{%(M_D&UGEP5-sNnP`
zuqT7i_}7Wa{{V!8Q6rq(KmLSk%Eh+YZ2G<(!$%KRtRS?}-@ALBeXd7*`n|(O@~j~g
zC|u(_XT5%;e#z0iU$f7GRzgetk;x~oGdcdX`M)%75IIA&x)L}w`d#}qF5iKE4&xu_
zS^ogX+O@&S$+ct6<2ovy5)w}LpXkq1gYSML`PVmoaeHz909_mT*GX=Fc)#xt=UnCR
z&F#m$jDK475<edx#%e3SlFoDJjDJe72enkz$&W_AVboj5fAP~zZe=%Q+2tBuvlMz=
z%gPu<8x!VjJ90rd&#woH=R7$l+x{l_7?OTnQa0e@qoJnhk-Av|Bny?pf_on1dmetE
zQ~U;kZ;GA~+bYVU`*>*BGPeNdKZba(YA{i4qu^mt&UE7YqwBpvBeI@GX$Uj1lc(MJ
zRe$zc^WO*P+W!ED(^QL7@krG~^E|e)&Yv_2PYKE759?losa(f9Dn}waL`pbT$y33>
z^f(~?BB>B-&vYW{#<ktjx0l>~>a8f#l_hICbk|Qk*U08PQD>^^TJMK1be|L3X_j^~
zJ8Cv>7<ImllmNNhHkBZddF$=ZJMmKY%$CRfCK;k7_AF!)oF;SiHR!mnIQYHuPobw6
zCSrZZ$z5>V@^cA)vrFaqqlQ+J+7Gl%6UPH?+U&U9j<_97XZYNSd^2|&0O;jID-41&
z(AKiZZdrtnm6U+Q@;#5?T=$GtRnTr?Cv1R)`MDs5$3M=xR_Dga*=T)D@HWaTzk(VC
zl)#9kwUJma2MsI#0F6@kfuY#==fhg2g?BXe@ZF8RY;m^a!N?<yewC^4NEm(<_+d%F
z`y!M0l7FpPoEM%$>c{!lm58BF6B*K}v-x$o`Zf-<@bINpo3x^nPthZY@MndOgmeo{
zC;Mvdcx^T;GP02SSB<BRp5IE3#vTic#a=S-&xoP%CH|8xie=5MvHi{3xB#qxj&Xze
zo|W8SdQuz?)zKKJMMZ3fDwCAmM)h~U&vKl1(8ql9HlPelfkX#|Qajg_>-I2dejvYF
zdzQI|S(@Qlj&|=miVt8;2e1|F3~S1~a@g@r!90MdaDUwuv^P9F(f;9j{{Wej=G;RO
zmF=WRvUz1AjPQDNKECvjUkimVf}?R5KF1WpBfA+(Wy#4Wy+tHnXOuGW9ILo{5y$xc
zRk`ww_B&sIujc$(*BjGHQU3su620SFiYV=6oI$>F0`5f{v7F;RmEeD~*k|~kuQ(%U
z(-0Akr+WVYhwEQLYJc(LH`2WN+Erg8?Q);@Me6?mGtPWdqUk;{)6&OS(xkn$M-m9+
zj4;UW)~nd)I%c14_UU7AZCHckmEdF32a4);=76=0JUtpUC03jgl(&7)UR7r}Dsq!)
zY`YxqiL_l4#+o#mPPwBUOHFoGHuJ-k%ABbj@JFbr>@@8wPSO)fx6@^ZPDKiq=@|;3
zbORkR?OS_&MJ@pCT{knkwT!K9$4K!$iF2dsx?GpKZNh|--bhZ;0R&?m2p|wgAc0&z
z#T(mC0sJHJb;Xo(*;?A@w_aHgGYH$sV7Oc!GmbHe^za627sqZQ@IQ!O84IUeHb3o?
zQYEXaGw}Px9~HH480dF8Rn@_qT$B<+CAuRk1`XJDBRn7Qu9k0!`u*xaZsli17*VxC
zpRNZcxD5*8+W!DjlK$%A-rb~6Eg;?jz&-Qdiu8{PPiV5qZ*?pSXv@7!s2CRD5D#pR
z<yxsp^*o6}nv#zyOZ6a+;x?f<lH8<ZOuH1KkjvYqaC-V@-ntJDYqD9Y#UL_3*c_f?
zKB{|vDz|yys2@&ER?0Y*72PV7bO&f`XP=?^VATktf$u@{6eO#c`GMHn_Z)Q@{{Vqg
zP29&3N->Sm>>eFDnk+?}&u-%?*y=yVx;;z5R$e5sk{hT>tfLN~;2*-glf^$1BhWk%
zp^ZCSg4X<M3bRKP$j{|@QfDj4+q-8t>x$r{`1j&CZD-lyX&O;;@&Otgrt$vIOlG=y
z(pG1O3>|8(o*I4UZQ|bvY99&gC9u7DHGctLFpc*UzR2zb0(&k;UWeHI{%7J(fwWHu
z>63VmM$_&NnKTO=jcqEFM?DVSPSeIo?nkY4m){q(U3=l@iR?9x5vAO>a4b+ow1NrU
zk}#wFpUSyU0(if}{{Zlb>K+x=^^}sv@)K_qzEfiky|OqedT0BhmDAAlDaN{7?K`Kf
zlht?iGJGLDvv{LX)h3=3VGZ2z!55bDNpfFuffz+>;|h5rjN?4x-@eLBD+Jc9YZ5zs
zl*pxUq?5A;r?;m{`47PDs6MZ6p=p|Yml~^?qA;vtMY-UV0azRo!G2+kVNX$-`d8sM
z!G9T8=r65n7n&}GETK%+H;*JePnLY#VPj)}Ny7jR;xkyruOiz+->ZVdS5KX_C)Z0a
zmtVbZbb3NGI=mZDG;zv-$UidjI*;?zSJqz^HRyF;18MVHI8z{eZyce@^%?3vrF?1Q
zEic612&1>vb$hK7Qqot-A8zpN^4<VjAvbN>aCQ|Z9-gB;1>eRS+nond(<0UF-b-0a
zi6>yns=>Fe?yBD^l1^|*80u;LW<J&tv)BBu`66YJf5Lrw^r}VjB;Na7Et<XCYiq6b
zw%(T%u`EN)k==mgqILJEUsThe1jzFt{{U_>Kc#Z|2aR;=y*Aq6^(#wOW$QJ<U>s+w
zaCji}?lJ-5u4$ev(hL^u4z*<{z}qah5%cbI$L1^4KRtBi7Sl$>&atIj_<vD&Zd9U4
z51#)3-Cf=P01VfYYiZ$0d_Zo7shL=e?w2Z0JoA(7*RZcbx7I8*pA2eiWvNGcV}MQ`
zIThau+?)@?wQ(LO*7O&FS+8u2WmNfv<1E7?rhA`mdeli=>xI>prv8q;9eGk?sX`fk
z=><kVO6@eS7HB#o=g!tGVz-fYOC`f5)K2Zs9CiFF=Z_V9N${495wf?ngILt$04=qW
zA;&+(Ap|efaw|6bz@OTBZSRPDO?{->y`{95Ho6syMj#HVN(oq>-jZ>Z2OW9A#ZNQY
zYHJ)d?JA9>_`gr{*zJF3El$r`{i7^(Z3*GC(A!j$&8bYPv)(aGh@%+&+J-sE0JcCm
z&IF$jb&GEbd|dH$-TlP(P+Ul>9O59w_Qs&E$^hez*~Tjm_DlGAt?NG!^nVyV%=&GN
zmquW=>J%nh=9LjyLV=6{ka6wSKa5@&y}bC1;(L2*+x<fJ-XnBA)e&DcM)C>y-;>Dv
zde@!pYDTh;CY#*)nc;Ag!Md)uzMn5ITWPM}*JF<G$Hi?Q!`B+stlHJ(ou$lj2<?$(
z3hu;U6$2R~JeuS*?-XmA&xs(>^xLbO$*$!IXj(!G7HzSE@0!TcY@+clvmm{(Rt&qm
z$Qi*>FaYb0d9OzJH>95r{6f|*Qp#B`^xHWl((N85Ej`A}L;)ilWuLF`aavwdYq5pl
zN;2N|@1eqe(pr_3*TomoEiM}J-$a5PGF#bPmbscW3oNWjJeS?m(zqRIG^WwvdsRid
zS#aA=-a-#=Vh871ej(AWOSJbYe%&#Wd4!#K$zpx;S#s&N{{Y!WbpT2xRL8Llf1s=+
z^||cOvZolQdkf)PYip~;62!ZrB0#~2W6)!R@1I^P+rAroGqCZ^gRQ}v%!S;C61G73
zc;x>8oL7+zHp0uow)%`ZnjKKxlx;jj!Nh)ApEJzqjFL9>uX_EO9>Y~SgmN{?I727y
z?`4mISF*6FdX+cTGjqV#O)dS^ibi+HWRyAR0xoNj@ollT_`#*ZKvr2G$R4@LtD05j
zp>KP3+Hy0`5=!r|WU3HGPqkrqlKSO-CTaINh!9SmOUPy+0Kmy4o&fJ&PGJQcT-xgY
z07Lcu6iQirCv{~9`LpPDa|M;mZh2l0=Kv`|*1ld3;s)QWULRRl{-(XjG)-ewwUJG$
zN4$B0PNA@K$JhGTg=>+R^;@KGys|Jqop|`JhuCDPCp~pJ**?(PyQ?a-sEA;kXLe8j
z0A9aP{{UxH5quEvTJS&OUZfAi{{W4CW4e(uHaIFV&$+MEFMtsR_$lC_)BYupo}R0k
z-vsX`=zP~1!;=S3R_`|T^m=+8iE2N1zwZjcx=-|}kNao&*F$R<7ZIKhBav8l3!8~Q
z-apR0WAWxz+g?raH^!Qh-d^dNb;sFbw+gbAMPnkejDwJIf<WUP{j1mfy7|xIeelt|
zQLY(2UopaxPf&I+{#Dh7ij?(7gPT>IIt!87?%$b{qML+~(9F)HZrI#{agW1~<SV7{
zK8<y0@qfZzRBJ7wTt;Med@`4}cNiGw?jHT?htT{)l3xKC86v$W;fA2sUl;s7jM>b9
zkbl{=pB3sgqp|WhS8DK5?vJEy^ysWFE*>()uB7wdcV^nD$F>lDwG*6G{av$ipYDHC
zR2XwyN8hro<<xdIlU&T(Vu=ineE=CX;hzxvZ9j-FEZQ42irOV}6pZAT4S;emFhO5a
z^{-j@h~_T^>TJ9niobz%2lO@JcjY6}t%Dp$CXf;Bh5os%=_t3Z{{YwdpEH}+sUO`(
zYhC^NenM!MGRUSW7du9B81wJR{$910<1n5c@ag+PvPRJ?%E}951A<OEayp+{)$siB
z3+LbSDUTQ*QCeOuy^HLY>J(sD%^yC8dH%K3)tU2<eBTl8ehJb);Vt+Dqv`fjqJL;;
z(JWIO?fK9Uc>32s-!rlGCZ_mVXxe|np9$Ns4AE&;io^^8e5K7-2RSw7^=Ii+(p2GY
z$U9RSok-NiLoBIp6UifOL<NcT72=*W@lB1_iSHzV-c-V<A|_r!fPU~D>$mu+c+qM0
zcB*hDk)5&JC>(xm`d681wt?ccxg(hsk&mk`KcQObr5>#LOxF_Jy@XcQf7jj`ZmIUR
z^4*HJQVM`N^armW<5Jz1ita{xhw`J1Sz{ywT$T=cXE?`trKZNeZ-H<Q_X+v&{cE<i
zv<qjdmch-jbtBX=n%&wbfeXym{hd&+#D5WIwx1CH0LO)Tw}~&c7<_SOYLZAa$!!Zf
zVSZA>e>undpQU+!?B}CJZR1^1{Uw>+eKBK^WRSY=TbWlQJw8=I_*cH_$NnYq{Ri_E
z=2m~cKKCk(uyOhRXEp~E0h$-JC^!@zk5MS1iUx-$tUrh+9s%(w^wTa+{z7Wn2CzOP
zKF^0fDQ`_G?Ee7d7oeGJekRG_JvQ-j_TgLm%fYH6;ha&(O})j$1O11uL$|dCwJmK>
zV}V!8bLW1sIIYh&i^4jTFc=qH)fNmD@`UGZ4^fZCty=sn^CY$VQps|+3%)ipmgCfg
z=RAXtabArrni0@e&xUQ5Jx<k#7!of8dx|+H%^N*B>A&Nr;!DOg2Yvc<xA~lJh&~JG
znjeMjC6YM4(<Y{|8D?ex$K=S{d-ntKt}^GqdQ5g#E)JfoE<jRWpx&b$KDF<^7;Pc{
z0EAaa5;V%Ksz)g>#pV&4c?TnKz~J-iUPXJO*}j2sF`o4o?L|R0YuKUx0G^)p(BhXt
zVQWrsQk0(OqIfsqriFjtok0^!)91cdOM7`zHDVcwAm<<L56ZoQ`}Sq<_3fp#k+g|S
z%Nr|1iiM9H1MX{!_$b!%SzJR0n8_5-%30&s#j?b37?0r<^mY7`DAQ$$_LPNLNg3oH
z{<U>ef@@>RuTpBO)$jgCfG_O5W8g0p!Qx#GO+huSDsgiboMu#lXG4<{9l22W+DJTR
zy;n-V9}*VoFAv$SkK%1ZHt{{;f-Pp~=)@3MhTNQb5D!CK&&2&s$HJEK>$>i-e4^@h
z4IrGTE>+*4;C<78J*&?@W#5V#PlNnHqDwJv?Q6@l)b$(NhTFNxG8Ja$AOnH*JPvD`
zv{GxAbKT1;RjQ@!9n#w89r1JESH#<Y6wBeej}+Q!Gip(NugHedWDcm^WC*OFt4KL!
zCnRFH?+JV()}ryB{2}^|uczDU_r7EOg8n;|ON^;vq?r0J4TcA=Lz?VAYv0-`Eo<Wr
zi>ml~;!<op*{1s>?-uluUEWD_A%H5QI6WG?lfd5;ZuPH=nohZXvb6E)OL}hZZX}iA
zg$_hpoRU-lv}c}0bH%v3t<Q2$jN@mq)ari@!fAIt9=L!l&YN>9M#{yNRTwOagn)LI
zkTysiD?R=gSVw24`K<+%aI5*(65MU`32cMTF@b^CwP<+DPd+s9&xkx%XEfIKU)o{N
z#z4zFcwPwP5epJM{pq@Yfb>SaO;z+{nmd<ol2&Fw;~SJNagIR)9SwEvlW6fP%|>4A
zoxiU>#?Qe^-wpUL;%&567nACS{uwN8W3Ywp6%mF*Hqdf6D)h}@>YoB`?)8mEd9H*u
zDRV4#w(+AY><)JB+&Dhi@7leS!q<`M4{Ej=eZHR*PLg?0L?d3H^Z<6Qm&ZCH>VFgC
z(ppI^?DZ`|+6H(Nd!ouwNmU(BB!S%4-p)L_o?^sL+Flwrrn;OLiN9osv~LM%3YYO(
zTtjH{U&tZc(#Tx61-%quN3PuQUW@xL{1x!OhdexdM>0jI&8QZMZmzA=D2yC@szyi5
zIVY2kO8VR4H|)Klp8`#12B&iyM{4kiolCn7xXC56oOjK9hw%FMQ`9~YE{CUI!lKFU
zASFos*6E*VVUok6_0Mc#rkttG-UVVIiKPasz1i!&FxUJu@XNv1dXyIy!f4saR7FNT
z2*y2gz^^9wWv8aSq4?9q`rAZx4ME|KB`v$`@$Hk252iTJYV&Uo+vyrtgFJNyihM;c
zil@;8Y-fp3gjP`Ms#r13L0`SbFfq+&_(#X5;-|u`N5g&=Ta?w~u$tysQW9e`kU&Cx
zcH|6an!anZli4(#yQO}XDgMoRR*_|`UA%JdoTCNqSZ!m2?ZEu&uK2kIy?F+&aGJ8)
z6pij9wT|2dS5<Ail1_Sz_2l~39s4-`&mJnU)TO&^aWs3$A}ekl-EIS9a-=aEPq?o`
z_@&{^cg8vlaq3##s$Inl*57KkvJjUKoNfx(J9B_~^vO6FA%06(y0VA2a#KxuT=?I|
zEggjRF~stjrP82z+2kj4%z{S8Jut(H<StQ#s^OcK85!fDrrurLUtbSCSCD|H3ld0G
zP!xRt01shLyo{~7^4y<aYV%vWKGvK$B9O^}TUbU($j|;dD}TWrB$vaQgwrEShlge(
zm6NzX!bhcZ_X<`B2RYfAb%uQD22Vl#DClU>`V0Fv=(=>;4zYPXv=4OGuWn^z1<YY%
zZMo}=oZ`HP;`fFj@jvZ0x)`7AkX^JE{%mWXEEtC%dsLsYr^J0DL-3ZTr|VkHt)1P*
ztt^)5eI`87<-{<g_s{dHek9kRoA$4<Wu7K+J+NObfgkD@rYnaTCswaIT~EB>sZpU$
zROeA&l1o=@U#a$8rH#F{j8^Kw#4&{2M_de7=l6^CCtnn5%A{aj%0Kb*UvFA!(FkPS
zEa<@wG6U}8@W<<42l%2vCcmja_pW3=`0=kJ7_Q=d?+R0V^|`#iQ#5Mwok8O%gxC)M
z0A7Fk=D$fk1$=$*6_>)_32Aq_{8m@?nrsly9n5ZlTp$PLBM0gYeq>AGnRV@Q%?_xV
zWwepure|`gg2a|o1-cJR^zB{GhCE4WcLa7;>|Jf+MMh`d%%ETvI2`ex#=7uSV(%n;
z*BRoZqYN~b(sE7PXW1@`Rj#M&CX?|i!TO4c?YvQ=%?kX@BHu@a1F1am_}4ur#Qy*V
zw5&&qbR)_C0GO0N{8fHy>)K7!{tVUiLyLVr-ZL9qNsz581GY85Ib+GkU<o(_HS=3B
zHR(D_x%q07XYJ?wEYAmj(AlB?0N~0W{wloN;-`jw8~jvg<+<_grj>G>`IZ``uo4h3
z3x>{cIN*x>h$PcVCWTJgre`=tqO{Uz{Rr@vfG>PMuS)Hz9Zu7c9Kk?Rotq$><n+fF
z8P7H99|W&O&&O{M#ke1u<bmwAvLF4Pyj%8s@$uLG30SW5d(AE*V{pa5@=<qeX3sz)
z3(vK6AF|hrqwxprN1<C=zWC#}yp!-SJ~QvPU_Rj2qS{eDGMx!LVoiK6@@L;#s%GXs
zKY)KTREpH`&vAHVdzieIS!9g{(z!);3VHPdG>(<ZeRDAUQ>C`A;oU;cF_~nD>>jK+
z1M>pDIPv$yOAP~AT^?J7ORI29v7QPs?0xtZ_VX=qUl#l^Z{lwSUPV2uS1k@DQ7Q(;
z4>-?G39Vr_9TDSW@NuratKKR6&zO7(;&}Djxf%%rqTx#qUcdV(u9L=>zFoK(`?k(M
zG6(+8PVn!7t-LwKylD(WCu)E>?n&-&1#y28_4usexRkJ6$r@z)vpzp02l1}E>2`dA
zh39CWe|$Yno&oU4C#IKbKk^FI906J$0%G3}{5ZrF&X;U(dXL>LRAjF;YT5c)T(FAr
zBH)T?sS0A6R;)*y{8x;5np?1TOh^ci8^4F9a4XHcL8+y!ot!NEZ;`^D+1fMuewFQ>
zIM8I)^nctg>zEtNMIBsY1xNYqUmko?@m{;6_>Ge9!+OPyj6=$Xdz%>%CC4mPh{5F6
z^qNlX{J#GH^ZXBv%_voMr6|Wot^P@VhoRW(3fH#VNDO3LAI7_wui31x32wH;euBIQ
z;r{@L<?#lw9?0A*Bg|sUj2?^mu>!rONtW8l!8=iaLQiGy`d3V~*zn?|4H@Xavs}Jz
zy{v+BvfKI3A+L4SzvIGR!}-_GKeCO$xz{!3&PcGfWA%9^Z{$UN4XghE$Ua}g`HJ$Z
z{{S2AKS0W~!AIx$vz!D{=8$nf=}h!R&S?+UmXL~KKr_xcJ%w<dE!U*hJ`(uySz=hE
zwbQTRAsZm=fw`{nG7WjRjP$F$2jHi~X1wx*vgult$L^T00NcJgfk86apOv=P0|T1U
zx49m*$i=9DI5l$LRQIhDK4HM>Ug&hqZFqj<8{1)?vMxV5;fACesjaUMYHGTbu3Mvn
z`E&g%M9ylI^w9NR7I>FR@a~yqajaUK+gWCc2;x|lPu>)ffx{373VE)5zAyML*G#;T
zd^;$GB`Wd#mJk`Rq?~T_BcE!a@iy*x{4J-v5v;{Eh|q?BO@$CYVy7IQzW(**dXM(U
z*tJxTPe~Lu^#e;nGqp!}`RQ9W(Ku{8X9VQ`02Ar2hCV9Owd;W{jbi#~x0*L%VpPdH
zv5lnk#dnivr&2OC(Yb-uipCP|L6zzb6^1z{it^uqO?sBf*RY5X-rK^Fc?%a-`Hlb`
zcLDfUYise#z{khBZ-y_mQkV1G!EY_H#VVbwR5225+rpA^3C0h8D_(fUEy>v&>V-*F
zaiXtgy#D_H_$LSP$KkAACGa+)B)z=2TPVKYZx`B`)!1$sA(^-flkc7le7C0fW;u7U
zc2bF+JMsthueW|PX!;(9CFt;=p5sNi(Pp-Qpm~EjDJ4vVe8g|YI|8-xEsTvDNP;sP
zkX5&FkF9waIjYq8wR*kX{{R!~a~V!Gt!TwsIz=e0tn^)5SNZ&kRvr+F<+7tLG1PUg
zjxPa-qVr@-MmZ+~iq!Can<v^LxR41~oxEcnzvte&uM}R}X+9Lba~OM>VlhDo0iH<@
zMOFSI?Ovp5rmlSa>(8A+FLQ|SPlhjbnD60^X+^X7mk9>qQ}-iiV!bkVJ`bgJOQ6eR
z;ORrI8Y|N<2d>{M=Kf1t{t@ujui@VfMXTN01P!!Ers5@7kp=`uJh9r#xQ?t_9AdRK
zDb~)?5q6Qrt{Aj#;GNFgC<Cb4qw^K2hK3cZIZNHx$?$Y7bErjR;1b~NC)r6K%DpSc
z+8h@D02}-xXQ<jo9lg%2r^j&>!B<B^EPJ<dMmC%r*PiHC5O{jx32tPLJ2yU2X|T=*
zCxMLTjAVM(595CnYF`sPPkk#uWGwp?BSNYW0IQsixB#E6IcThBN;j7`WA&%vb=*<-
zR`x?QYE}mzvkYey`8A__MPCPeH@lL`Z9C4?HCu;`a?;O)a8^c)U;(@Cw(d&w;-#|q
zZK~YZi+inF@_REIDYR>r+A<C>52qiMaZr3b()=glyK7GsU)*Wl8Y<Gsb!ixRN{{(w
zpz*kz44yD^+ZD$Oa-y_8fnsQ5r^zzc!w(wA;k`S=I$ncs4ct16aW&Q6s=_B(wr!BA
zfI$VBnMQgYyyG?WKkUVGYipuiz_Y<~D{S99QElCV-CMuj$DjalUlMqV_fKtk?6j*^
zw_$J<CZ160aNK0BK_2VJrfb#g{vmuu8dK={Mb4LR4d`23#t)gfn1WHZs7!_frvL+-
z<kpm@rJqBW8-;w=i%RF#x(AHxE<9sn4U5Lk*Qyg??Z1<cOjjY}Xyv+Fl#CZ7L@*Eg
zLp9_d3}NwC!fTt&O7}o*b6WD*EnRQaM*$-l+qWeCKb3R-Fa4o>L*W1+)$BZ*i2#r!
zO`nvLj&ca(H{>g)+9a<n4<0y4PJFc5e>8m2eH&P6Qp0i#a>C^#LVjRJ1XC`rpqF4m
z{{SyswrZZMsL!eD7gyI`Joi#Gti`kQ6O&cpk~K+0i0s6Cg<AnmM<ipOGwEJUkH1OT
zT<R{oV?ED>Y;-wp5b5@_$#WcDTJKpLDzPjE>|!<JIH)Wpf=$j8g*<QP8RLrP&JU>i
z)~=pyS50N}u0`*gpDP2&^6}R>&g}bis<`Zt*m&2&8kdHVAo~Q-{et32Uf?Nc-Ct(b
z&-@1jeLn<!e)CcIjb*OKJW$@Hq&EvB2ZeOE1Lf<;W$Ee-eFyeiX<@r*ZAHY_4)KFD
zTa{Og=Yx~Z2Vq=(v+&Nu#EzEjr`{`Xf=e*5vW#<|VmQGc{d1I_ZB1{3-?Xl`u1zI}
zh&4SvdyEB%??S?5`o2a_wnlyH!8QK?8fq`BU-KU~5`Pc-Mz_38@QYLM?z0Tmu=%$6
zNxZ2TEQ!u=ahzwju@%SolTDt-Qk|!Tq7%DHnLE0i<2}gDV>(plZe)6RT*nuLx}jQ8
zPqSvegW?OBHCs`0JP8Y<Z(=ru%CG>F_<nVXrfT<k71GZI#J0`5Y1qVP)Dhf!SFZle
zzq1nl(J<@VJXdYu+nq4N5((|R<8U8-Nd4lF6sR2!-W@ypE~)<j1kmvvy_&opD1%X*
zTZf9zXxsEMWS*6pl`1clXe#)OPC80;=H}L#yPq@o!^WDHui=YKU$|AB;&A~Ht7Qg3
z3xIm}t_7lW19s&kWM?(?eedi$;w>*sxznz7*v{f+iV199G9?25hTYKgJRi^+@LhM|
zkBzLgNi?gy7g@QU*p&uLcVz$!ovp~n9gSRSMo!6`j+2VJM-IUHpU##w1;+MZz42X6
ztKkEoX*y(@jjjEbp>Wgruv{mXwHI!}6@WbC_4MMpKMs5+vhg;Umv*|`Q8@=NT_Yg}
z(;yN0iqy*J;IwZN>i!&><mq~i&5F!6O0dX6$i0IvMjpn#rvCtfZR<B$m+e)jNq>4|
zW2asn(=f|1Om*&guO6G=E~jq{lY-Z9sNBzJ$u`mILXtrGfmAd<1g4R#THVPVz4}2S
zxwXF~B9{j{TLc^){Lyk8V%_bj`=PB(bhm^<Zybsg478<B<+Rpup8NiNA^!ls=l=kR
zugRSw;^&F<EfN^t#Tu2Byi6kr9<C>uBjHb$3n>68z*2As9QrNC#H~(t4QugRSy@zM
z4Muy!VeAZTDE(=sX4g~og{8g+{yic80Kez|0EnnAKG|~wkx6L*jzuWL&pd)Ke}cay
zylL?d$7$g!ok9L1o4D1MCGvH%_NQi7AnhbdK-tM7sb5<0q49IaWbxx~5q=u1{{Z}5
zJESjW+4_^?sBgS24a9fhZ7tA~H0*P>F2!&@V&2^Ij<xZ(#;=I!tKP|F0~F5Ykyw4w
zz$jmGv8pLQ-rZgmZ}Ahv`kFDl@m{TZV#6xkYI1@J;O*Q`<Ly*p3#eX46JJYc(jWDb
zICLK5gP+J6)z!MO<I~EODvo@|?|MP0LGb&+>86+SV;XwRvjq7AXPcb%+nm+1oL1JK
z8L{xqvIX4H+9Cm*Wb6XDmb|{n#-6AC+mG<Bc<OtSRxJ@xvQ=ihzW)HAdjA05{{a5A
zGwqk>{$ap>+kgJXtc#XP8sk1G>3?qU@;2Q0QjOp4k&ow!>VDUM{{TSs{{X-L0R4?}
z{{RzwPbY>xANY${)HKlcI(3BCa;$d)aahp58C++IxaiY4u@LsOr4H!vts}xV+Ce@<
zLMZod^3Y%t+djDLKl;@VjI|+Yr(CGPDFZgs-H*zj`0-!PwWIMBy!t}wR?N4SQh;ER
z-{%ewe2y`m_2oYk{93vdxqG%>HZU))BPSRNNP;8iUQB)wf^l8Pz$m#(l_TE2V|(Pg
z@sE$-jf1VEc2Hz`sF6?pJdIyYYXcf|zlZY`@aOy!A6J`O*1joEB%W%h(?ERv<|gQ~
zekQ)f*ZfB`UMz<~@{qwbgWdVO?hLXb<I@;#(!7ek^=qG@U}5aAv5WKk$i)=kF-jJ!
z>KQ;8sS3~rDFP8!n&SRDmXF|P#6|#?9vswg2XppmE4o2kPsgPV@IS}uWJp73H_Bv?
zkgJ#+WaB(gC$m2lBU``u;~@Mh)G2lk`lhQ^x2bdsN1Osw=hm;o$rYjV@@*7WE6jhX
zYSi%M&UFH^lBO~90B}d*J*w<0#d0y<v|cIHZNp)tm1AFQsL7_ZW^3QNJ#WV_O?U9y
zMU^B(c{MbcnI%~A2w*uRXM#AdHNDdAM0)6JyJX17&Ej$Uus^-WO7%Y)N#Xrh!rDHK
zdEywfYpZ#qx&Xw|{G+i8(>2OBh5Q@l-aW^UAatB4+4c!Z01SH9L)60!Q9>4X-SmCW
zarjkd{fpr{7cPx5T)`}?(gM5pXOa&CkUt9Id}I4N>Ao)3B-F0;%Sfe>R5WqV^8Bh4
zADM~hJ!>oC7sY=F#qh^j(RBS=`$qoq6^b-lX(QZ61m%W3`q$4kek9X$y&~~u(Jb$7
zCbkg9-gL<DNJsk7hrwZ<gcakZTX1$#xAo{eH7f1SaFdPSZT|D<{{R<wZ&>gqk^QG<
z;^}Yh45B<++^}`rpcVi)3&dy%0B36FrEnfE@n*TLSiyUKKG8L+Zkqk0jNCMM!3^Ao
z$6uHe$5C7jmb-HVmZr|-89bQUXqf_lb`9S%V3VBp>(h)^L#XR8>Nb+uWJfa~Ns?KT
zB@MWS87Cxd9)RSY202Qr<Zz3!?a=S`6=5Xi`Ml1~#>-T-^5V1AB)7IXCDJ8l?a;PI
z>0K1M94A!KX0~~6wJ^yw#nt@9<XF?FUdl2Tg#)#4$>XbwNMTr$OLymZd-%W}n8B$f
z_?fChaSX90lFpI3h5LH!0F~*_UMZ=?XxYZ7){}3Sx%3Z+BDmBveJ0TA_cm6Nxsb(S
zm6Ath2%+2pR47JbIN+%#99Nm?9}vc&G}ae)5?(YnERkG@i#)IgWR2fwz-%E0ft|S>
zYUZQyv%|}yPjBYQHN<uyWAa%_y~$0CK`ouRW<2A74l|1IzX*8GTG2I09srFC8Dy5&
zOST=SmCvYGB#)`b-ZjaF#Z;+HN}{v7`>&_qeFkxpVX&BqQNl?|9Fb|JpS^E+UtMp0
zx?Oo6Qj5!ZhMr=Md0A%#huPc!yI5x=W2qHuLeYGUQ&zp3YYVCON4KZ|0ng$q!fk#y
zYxeAp@o7>=gOpjF8$G!!d;3$gzuFgGk5Gwq2=rvK%Nab0Ci4#m7(9W_Gmv=Ach3<{
zDaq?@$IDX6u{EZtt3^u6?dY}L^|I@uK9mu~1ch>QfO>k2)<=#!FQfS1!FtA%smD4q
zs!eY_vW9qMM&N*PoaBN%3F+3n=KlcWuZP&H+iNHp;|$1PoP=$oE0UQwJZ8D6e`r~4
z7TVeehT_@_Xkao)9E~KUBUNW+ILT&G$0Mol*0^Y9F|QZTPEqw+p59}_6>_??-3(1S
zx7P7*Pg|po8jga#3cm1nkF=?DUlnQO+~~d{R3WB|02^t57<A((-Bjgsjw_SXyl<-b
zM^K0?uxhYFBFP+poHh<eI0y3;Z{okj%l`lp2eQ1=G|8<tt3+jmjIoluvbbPIah^M1
z9M_W@#zy_t<y;OKw{wnr4)nRxcY{0QMpYrph>E}7eF{Hle-quOnP;Qhxjbj*e0~DB
ze;#XIAoz(o-0IfWwvMr?2LAw3Fbfg)kNZZv&2<^_2J#o$rMZ^w+EX0DL~I7baBx5%
z{RklbHBzZLD>g+u6&h0Jglx@!_(LujXYE#hjog3ZLGYaDx%*9@{skfawBG~i(fEtS
zdQO*k*9HsQsI7^&kRy%m7a)}*zomWY@Yntc_we(?ntZo9rmNy@$iYIzdjhXaoc`lE
z{A)eV#_hTAM7jWp34Kb<Nd6FAkLaXVaqzdpdVh;$xPtz8ZA=NdW{%tvz>qLT0QU#2
zebcOdz<&s|OBZEbYH2_?Y4sle0PqzR<tzI$cvr&Owft6^hN%oPNxn6TU>O&Wl(sTJ
zKhN7Hxm#KZ$#pjyz|CoH#4NKkbGs`+#|IroeZA_Go?G~ZJlLj=NWzi}?ZFAuj902z
zK@GY{5?l{3{Dfp<+ckR7X?Gf`K{PR!?C!Z!$A3!Xl<U!UlIC7p{l`=&!mN3s?0605
zgj-N)B#SeGa!jnuO>({}({!jVn#pZlt*x7HnpYxM?%nwG9-mWRXU*{2N4vH&CZLv$
zjD(60F;C->UpRQD!*?1+p(0$#Bc}87nEp~T$2m2p)+tM8Vqt`>Cel|tveQj}vR(})
z&;aSSZz;BtnftA`sLl>OK&xIK_?_`T;rxU93tQA|(K<lWG?4!Q-?l8j`0aZi!=Di8
z{u;TsfN5g;?O{ROfGEas*RNXF)-{bE#1oiKgBF@qwik(qC)8muX+L|Wfhtp{E>^WN
zyfyn{YtwjoIecT`$+b;p2YAHx69^JW_#m<Y*Et*x-Ku2$v$UpSW$>1&kDL{f_^>~c
z9zP1xZ-@FE5Wr=cNqoRtA&4LP2&&f}74XzDmGbwG_GCPLaa@j_JBK{1eDV8Pc%^)0
z;++#yip^}6dmYORa{0Iz>P`nfqZOU-tOW47ON_I*{SGUn{h>S$b*pQ7W!8xhp4uyE
zBPeIu!y_DS&mGNq{<o^j;jf3j53<sry0F)5u5Vvdni*Jmp_(HB$m0M97#;U#sLyN?
zP)Qu}cV_3s2W9Y9q!g7bsv8_+Z(b|s)ldgQO?qw9-$~$2ZcE)kZ-Xp*F?Ht@K4Rn%
zo-56h=3Z+0jynui+nu|CBL@byG>;EkYC1lne?8Qe=Fr9#B#1wmxZv_wV;@7FdR9rU
ztHXtV;STW%k(Mt8Kkuq#G+)uY7Z#+lX%Tp;8%U>EZra{)B10qjWUlOGcc77%C#G8m
z2cDx%{g(Vst+w4Z<4)8EV{dmG1OEVzS39P}Ep@01schQ7z%a*Hkk_DC$T1s2S{a8b
zQLsnlOwRA2hvF~Ui^g66)1uV%t9Y%n_L)~LI+b?8AP}UUfb)u_;av|;w6)f(<%>_f
zp8DA#j#(}YZw4kw36C(a-|~T+jyHBBA4vZIgu`7iM+N2Vnx&GQn@vOa@t!f!x^?Vp
z=gmXLnuOY;&Lg#kM00@^x}uJMx&Rck66TThCW-q({7&#Cgsr6fN!D%QSkf=->#3Ih
z5x^fOot>QX@~v3V{{U={j+)k)aRr}@;1l_Q#nt?Fk-iiVQAv$Z1H2MQ&&n`IApEI6
zj`ho(=1YjlepvY_llbDGgT?y2p$!euLxKpv!OyqgKPpdBlx(#=v77dl{iGsxoOq7*
z<|q5#X19W9x$GJ=JAVQVa-K5%tA0J`x;3@+*Nrtx2yQZ9WeB1`7^`($oHDTd52bwP
zABy#RdxJDLenf=in2}eXz*dKez9MVBF4C+lbxY}P(#$YcmPTMfB!RS@qZ^wT1MeKr
z9J=g!5BxUI#?Tml!o}7OMmcr=0189<L;Pj<o26?SP4A5SL91!4Wh38Oq{Wci@E>~d
zmBGRK*No)<0JHx9e2Tecs@zzt-c}Mx6JV7IMnHPwX#nJKat{WC-*TK+M0-!dZ`yCh
ze+RUG?0r7|3*8-9w03%>yB{E)Nr}dG<nx1-$tM{mvb<~Y&sy=UvKb+?NaS-Xh$cCa
z`T3hYP6-_V1AqYHy!TRTizwn$xpC%OM=pADR1!LS*2lwN0{Dl=(rdT+OyN(5tQ%IH
zoRCVRsM@$3u`Dn@4x|dMd2Dh#B^NJf;;w#;{{X=sukLjiJ}b#QK2nC#!kqR00FS)?
z080G@*0iffkZKJA8`$G8toZqYGbt<d%7ge<=I{Iy+v9(SJ_p+Psy~U|A+hlM`usK*
zT4|EhhLsT9EBTEY91vM}bI{~>ufB)HUj_Kf!|`9}-Y?QG^!XT%v|4HrkO&<K4Z$9U
zx#XqoE_KJ2FtRi;OM_gZ>pmX1jpa`kTfAsMW=&0Sq~`#T+;l&cW9mN;d;z4&(BJ$+
z(k$g%7LMm%iZ&S;83sYxwbJ%8*K^SNQm-}T7k?Q364(sgd{6M=4!=K$p+EalvS$6G
zJ_g&IKg7=uNPpPX7EJy`)8!S<a#4!&-`Y85e}Eql(gYGt`W51$777@cm;sVNAB}O-
ze$t-;tznK?Jb9zYubg>uJg0+$kf4$H*UrDT&+RYpbH<+mHJ=aoQ^a<<&bf1QZMMz}
zX_1*0RcAY%J);13p{9d<4}#xazqHfd`dbx>)fg#um2;DhfE=EqoKzOy5KA!G6l{O%
zrYoGg@iN}qm?Vk3tSDIIMR2$n8*mqB$6ztj&{j!HISySTPh~6*<OV-lF3cVl9glSI
z%U}4D$`<}yY{MsiAbujNd{y{sec@~EXT>@_@=2pbv6Jm*7b7K8?x-u&`t+!OXWxtZ
z2g40+?X_PIXr3UjniWK~)#Gdj1Me%xy_esPd)KjRzZE<Suly+So}$`kg*5GMcaF-(
zNsjHMQ5yzlmlDUE@D)s8kU_~#39H=XSZTs~HE&Lb$S1_NS5rI5a?;AjEYcoH`kI;>
zy+-$Oh%|v!nC!v810?a-4z-VQVv#uuG!px)gCDJGcvk9ND^v5MU=YU0`&>5%u^xor
zA7fCR&q>jW*ld$bv6<v`WzOB(!ROMM2B8(hgqmeUC)4`W-W8Hr^q&!FK3JE{fiBTI
zi6MNJA4uM6$)3tvY2GOzG07P!=<30gj-Y}#G$+_Sit2Qh(TBMy9Hd9Fomh9mk}FGJ
zFZP2kn<tqpjLdf)auojnGHVXm*d?lul=&nQI{yF_ZEJ^cw>`>({{W69S!r8CC(Mz@
zGf02nMxPlwa9xS_V^C$42m`%28L)dAS`Ng`pYOIm-Zg5~wn=WPf7S^Vy}*sn^8@m#
z49Cm&tCl%4S?90szw}GeD#Z78u`Hx)9S8Ci0@}n5b_$nKbM}w;3jY8hQHd}Bs$tNO
zK^{Kh{#7Ip$L6LG1D?33eB1+4TfX_@=e}tZYo61ld_DMY;!O_TJzK|q8IEr(O(M-a
z*4Hq}umchO*$uShaB-aDt$8Ms;7<hI+}^>ec*g5WFrxVq+G*c!iskn(VhD69ye>Bk
z{M><DHlt@P&aHSNQzLoKaHA*h8jJfr<rgLy0QK5MN=a#9+4np7{tug91!-E$m(OoL
zp>W88?jaN_5MCR0OJtC7#xM^x=vwdWoqGNu(KMYi;vax~MSG|itu5oyHN!lzISLdM
z*^o})pn9pVpQ4gjxmR^z+#W@Ax+lbc7HB%1rlF^JlUB36wEqB6JXf*?jBVS2&jW85
z>5e*8=qpRP(rW$+hv7HI^P!zu-&jo(RgO2mv;;*VM^eNC$iV~<dxKwn{>^_B8(g^5
zbl*737m@a~B;|n&6^H&jKO<k8=f^%EePSI_O;X}(_?cQcr6J0d>G!fQJvvvaSpL$#
z6FwEn7F#_w-u6pqr$c$9M3S^Js=78+RPALd!|Ex;+j3_X&(Uv)8uAMyB1{I)etK7k
z-s+HC>T<lZ1>oRkn)xeP{j~lgYss?X`yoL+VzMfK^eXkA*_3#<<CV9FZl+6Vj-K$T
zbV8W(1CTh+{PQ)hGU#UF(z`x~hR<!A1YphPu^<oYS!r!Q_UYXq*fH|wC#7_2qTO4p
zigClY8LSJ<KK5N`qL8Fx18zn!?kg&v6Fn?5{n|%Q7`V4aG2AkYeb7!T&u{fBYpc0q
zxzCxB4iEDc-8HS!#!LEi;=Ic4$j5UdyzD+~?Nf^LF&KJv)uxYM4*4$AE?IbUPPn-Z
z0!6rUkO#~7cC9Hq52&MyxNabvlbwx)Kg;<V!?by#l)OdB1B0G_TJ)V6FRd+O`&?#J
zAQ6{M-=Q_dPYsI0>q@6G?Ee7I{ut%ORHr7K<I4M^kJher3mD+@qlpTPZAHdDxvpnd
z*Y6=iCKub1zpiW7^{p3A@ePQI<7*G@NCx5bApZa=^G_1|AX~V|u)ApS{{SrH_4@w+
z^{Z8w(5Eg;L|h-9$C&W-8s?_%jvH5;YSCHT%1lf|ib~23J9q0+H-!@WMuBZ5h1x>v
zDVilb9)uCd#Z7bJtIrMC+QE5h@36Su*=6VSt<4798+B7RmPZ>DWPVldQ<N%2N}Ia!
zI3>*&X=u+e*M1P`4dK01>M}G;%Amcwg~$%1bsoK|%fI1N=;Me@(+=Ch{{V%3LE`&o
zT>|A}&PZRIr|}PZ^BFYDiH;d3lzmA9`PFi!3QZnfzYBD(<<ySHZ~p)jRs2ukOMeb{
zM^HAZ$g%`yEC(ZS1E3zY>MNqphVsl|f#pkc{Do^D1;yeI3u<er!yKkIk7{#)&pcA)
zv0VMnpFAz5Txy;sv#_=cb#-$cyip`>4q25zT=qFQ_BG!4+R=U+_|IMNwye3;baiaW
z0|N}i1#z{G4hj-RMstCVYooXLD`RP?MLw4xvbl^TvCSDM=-3PhAmk8gm&E@7g}T>?
z{86a*t60?|z0~yycihTVV@D-%fU%LZU}FFd1uHaHGG{m8&3tQ9!rK`kbIKEwUK4Zk
zUQB&mzny&v;n?kTnW59$O#3??7JGNzoicZB`K#y25t`;qDI~G!^{9OfA=FU3Q(0=l
zz~FL>KLbuS&UxD3k*PF0AA)d4H;sxsHq#cikx*SglB%&P0mG>P`{N?I3ttgx7FrCK
zS4AFl)J?HyVvawQE=U9>I^&#HAHm$(c;eny1r-pI-k&nkT->bMMe*O4I-zV5asgA%
z<B!s+=1+6pJR9O)0qU0V4R21?>?8mNp4Ro{R`(%FWAGK|HvR<oVd9%hi0u4RD#%p%
zaLuS(#!nmu5=x+R>AU(@faq3j3=zC1DpV6&ep1K)mL+0%KDDBiw?<Ak*_^+QJ{irT
z>I{(D3)KDwwYoEsKi$b;)3~lvNV>GqF0bRe)1+ZMCL~ca#?Y}~Ly`Pg0E`|EYt)+2
zqmN{B$dUE(nC?%@r|Dcj#9tF$gtmoaw;0@v%#8c7fDRatr~S~i4WX#Wxu^KXWwnmd
zJISPhIPzvY)BgEjMLSr!m_-)YV6$0CC+x8-LGk_IydJgZ);=oLbkfGwOL&-!Zu>Gh
z?bC2L>C{vgTJEcQ2cLQ7V3IQ$e}yh&T8z4$jp5gtC??a6qkChfO5bQ`?8a2cGNFnF
zT;MZz<3CVo>beDu)U4^^G@4`b`FF_iOxWOY^9*$UD&gkW@1(Z2g(hf3N_Q1@B1R;g
z#YrF>V0@qqDC0cUX>}X>kVKbG!1f?x`BZ3~>|L4Zeh&CEulVOs)Gail36{%Fxzwj-
zxIhF@MqP&ol5hYW$@Bz|B-ib3;=Z`TOwq=6w3s*qaB_aN(0F^qmwq0+l4VhO8^rLK
zCYo5#h8QRJPK5n4k5ENoOKxUjWMbs?EOVMq$fRNUvXhPN`I_!L1L0fW5^3HdxV5;p
zj!i1S-?Vpt5i+Zylu~*&9FRNh$Gu?-2=Wfzm2dk}do42N!6UbL?uzb~SP|t+e{x0z
zliz6>p<HiK&vZ)WZ6ygkUKc8VERj_o?9v~W8;H;QKsWeTMX%{eVXs_SET&k5F!^jg
zT;?<*`Sa>|=dEEF^28EYjyXB1yAs;s=^8lIwQD;uBzC`OnIiM9PRQfjz;0vNMsiP}
zuBYPXgRH(Ed_mXrEf-g{*R-2E$BNfcf>fS6n1|hbuN@EPn&z!ht*#@UBeGc7Ixy;_
z9D`b3Cf4;I80%L$wzYQphNEynmf~D)Yzz*bz)-;EXT+HX3v%A5cK-l{c0UVriwlns
zD(bU+mdRk2Z#Fzg7DPhP?gKm*3OUD9$gB}-82%CYRht`|jWo(_E@ibcp^ifgg*Tz<
zrw5RIC<bWwHs%c*O7T_9^2E2d79z^uGB21KNux3{^T_hnMLy41lFXAx@=I{?O8m1H
z3`zAo^GoCm^cbgzRCb{f)%7<tO%lfU!W#CkHm@W%+H>1SZEBW}B1p0`2QMH5N3;Qq
z{o-&dD^b=GS<0il@y2#W`!?=S00$pHDjz6%Qh91SRc;<+Cs6+YVdxjbuGi1fq-e9+
zkU}X8jNdbGBX7o)Z|6d#RD!v|4UA+Ee?n?cClq;p)PRk(3Ei^FNyk#u-?mNt!~Xz%
zRNhukN^-&vaaE`h3%OWw2>pMpG|w+@^ZM1rw#__R0Z9R#vrZT=z#!*5)!j|vl63nc
zO3IO{`Ne#eW630_X7$E%$OENJEtlGnp;e#?iF0(g-y=vpByHc!Qa8@cwiuKXoCWFl
z^{Y5c@@a5@@kXF$%^OBH0K9e}{{W48-S6!e;_XYtW5qT%F-NP}Xi#adKA~xAce*5G
zj3`HoZaH46U#Tp4uPwTddK^{H46_|G#J$J%dXA(1exUX1_;dJXniEGsuKZBf{A9AW
zrETHqBrBGZ9}a2oNJmVEjs<Vlw0;?UT=7rB+bipT3+oqJG?$K#JKMUHkSHNRR#V8_
zdCzlP0$jY3yMU><ZD6AVABAaY=)2DE?$wE<WA!Ygqs;&e?m5P55_@-TZE|q@Z~^qL
zs?}aOrTymPliIWHa5Z={9!D7<b5%8|R3&62>2M-!DiMzB&3V=Cnp)yUI|fPNkOBOw
z*=LG5Av-~CIu!%@*PLrM2(mv67#;{9S3IJ6bgElJmKG}vi-3WTU9VoxW#Nrx>q@g|
zZf(FYp$Q;mBZ0vn*NnZapJ@ajz&w!O(!QJU!<)Sd#$CHhLZpH89@Q%GF~wR*9(Atx
zA6*tQ684$ec`~pcsjhEK(lzJ?8cTT)e*;PwAE6`>UgfG=JdrRvKOFO1XwvP~i8k>T
zK9w~gPP}<)MKpQQydC1~a*3qgObXoFVHk2ZD<K}8f0(LQeg%SDn3UTS{{TGx@8#3-
zuRw;z-A553`(mUvu($lOQa+X7Pb-xvIpC@|KHWdBTb;`iq`7NG=Z|ZC0@MwRkwQ{+
zE5_16&V4JAxA;k_-AGxI)nC$7SI6gG`KnynX|Uo*h*8G_G|dt_eNN{Qs0vh^k&#s#
z%NK-d7|M4~s{XC{5b)G%UD1}kkDT>Sh4<0UV|cBbZyAUxkH?CW{t&B;6GOd#$r`-H
zTPWLr!SC{l_sv_tQa#*~M{u$iB;rLN52iX|x!qsk{-Y!=v8-+z9T|>)O8N>I$~cdL
zTK4LB^(a)Q@gv9d%@TFhE!sfy!iy1P4Z~qZM@}<}m&ZN=m&D#L)ioPv6kFZMUO2(P
z&IdRir=Feb(O2Qtsc$!$_N9OTW;X=zJ@He)p<G39zI+m(LHtYJySm)L9$%+?B#y=q
zZsLj94nrY0KF1jq<dgg&w6>AL*jshZ3LKjH)B8O<(pw~FsjnWq(WVUYJ=>uyc;Asq
z*W7&0J04J<3++!QOtnxu`Dy({TK@oq4&E5PTN_db_hMZBg1h-NX^7lzBsurnpVpvl
z8DEJbG9Olye}xVxIoZHl_(t9fi1u0{Nh5>=i~>pMNaq#dt!XFxBez#u7$a&$1M)#3
zNh9#wKRWvx!u|xc*7X&(XiP1`tcc{5U`7u-es$(j{>~at*&1tWyP^B?1Ts&7xPg}F
z2e;u_$~}#tJvA|W4WVD_keIZ~SG<-hXS#TksErqMkUQW4a5?m>{{Z+&w7FoqxJ$$<
zZWO-F&9oDYoDP{FeMql)_zxbV@H@nF-&|?&YZea<)i^^c6$F5!kPhsCbBg&Ue+c-S
z!f$zLbdXx5<YE~duyxzLTljO1RDM+&qeW(VCBC(5sz9<^vq+sch2Ynp{6<_gvHtVO
zN9kS1fjmEXZ=yY~+HG#5X*a9F;E$lrJu8s-wQOwU(_>+SiAns$OqJEg7p;y3K+QZT
zH4+@u;-MOiDM$rLiZCgRj{=NTg-5M4fIH9txXo9-T%w;tQ}OFjU7W@AIiL;y02@mv
z@f5}3`#ZcaOjD79(4!JFjt+7?h~)J+F*xS8e0+v2enGNT-3$-=;fCfUCb{G|s$yFf
z)#-OsAmCE&BBU%z4ryvF`0q*PkM9r8iwv7Q(UK}LB9G%AojD#h>mU>)NaEe7?V1C?
z4>A)?^WqF}Nfkp4+|$>mN??#Xe4zeSB1J5R2@H;Z*;7D?Q3H;g(9mO%in9)xs5<<b
zeajDM+OEan?O}#SiFW<?fz28Lic^EdF*vS*Uk>YXN40bd)gJIa_){YAKZsnNx+UgE
zP-7$cigpX57&~@2q-mUYuAVQ3zA3rpJraC+k^rj%;TMa#ogI(;v|sV1VO<<{=We9Z
zh}e<O=4-r<;U9_$@ui|S{WO+5f9O;%!Y>v`Nc%0Sf55Z+vrf!8mve%6nmlKZdK7`)
zy$yZ^c&czWNo61VB))(28og`#JZtU&lK#>^pkx04ve9SQT=DLCi5ryFzYN(Kbng-z
zzwYdl?w$^AVHiAf*W0CftY5Q^qb>vMaVM@K2l|TJ@c#hp`+H#yqLAxr<j)eva26nZ
z#NMP2z5U=1;Y~%~VqD|g`T6ad(m)(wk(^b_C;j370Cv6d>-KunrI}>8)UMZn0E-I0
z&aGH}&UztY!%(|oM|pqx)we6Ky`)dMZS0w^rBK0BarxL*E$xawh~b3FzkChgbJx?Y
zXnm${w9T}z8?o1)&amz*oiC$d=D07COs%}+<nnV<Hr#@ai1jOP2yW6X?u5)%LPi7~
zKN7;ccf?l0Ek<~<GK^QIJNjn5dqg&~SouT4*7q|O`6Ri&Wc)C2KN|9n8ENu=Y+Z<;
zx3wF|5yv={SJ*Hd)(34TuB_(~N=x%bTxX57^mm0W7A+S~SkbnKPyvr>`O?=(xt3v;
zS7LGU^ON}3(z+&_s@rK6LPUlVu&V451CBk7OoFqyZ%|_-EKGRgsaoM>19|Pwt#(?J
z_t3<_&`L3nmAL+O#mGT(oPvD?N;ue~0CgXoI02rbp(7rr@TyvyOtCMJ0B-xLt#dZ)
zXL!!^&u1haV*oI5*VeNB4%<eaEx2h*J}sMQU;xhL_dTk18jQ~3TZsI!IYnN-rC#`b
zbtE1kFc{(sGPYZ1&M-58dWz_^<70(e+Fb3m7XszNMiq0$)+hQ^B4s~y20c!H!nJPI
zR$>UpwkjkMAjlX$O7ZJulxn_c`>)IVk6sv=$49C&9oTT_tbUc7b2G)#);CgrhBhbp
zS5M_5E^&&9pi{^570GOV4{v@yfBYZJ*ZrQZ{_8x~#M4SGnVQ_i8RK|}uRl@+d0osA
zhH#eyB$5lSHS`~ebjYss_Ko9N7a-!iu78K|OEFtG_B%HU<dx6#r%yk_Df=q-i~HC0
z@-v<St6bFeM<SMzI2$94hpyGf@-*hskqDAlmPP4+tDogvY~K&HjV3peTM-;!ZZac+
zwVt{y*6`bMGt^hoLU5|Npze<{QE+yWAknPiwx7+00*$vA80nhIxUqS3=@nE)KGD0E
z_WD<8r&>)Nz%m8^4D<D@Qv*GqkRss7**NLI{{R}WxhID_H9oGw-WOfWFahXKZ`Qc&
zSHjl%n!B_%vM?N~zQg)0dM1w{fxOtsjlz}Qqa8*nyqa~qYRjHm)YR<DzK4um{2Yq;
z%+~g>#V<i1oz=(u2moux{xN(V@q^sy=F>-(_9gQZ%!*ZQ*elOmjxpC2_KY?b@u1qo
zaan#Qwzl(PaD|JmdXeevP~&o=K3z}GvG9Aw@t>Q+@~%I<Di7;Z#qf*9({Q>bKC{RF
z0L53^scmlUff-+^{{ZV%h0`sgA2fkas8gC=&&<=?Hhg1i`#*T<@c~;KL}UCfa-jbJ
zI<o%&vu}>#0L^b_5IxM<AE2+XBGHypnA%A{3|06v{{SIKB3S<b-fCQnxGIu9EsOSV
z@oc1nccsKfP}4E~NNUu7vqy-!ORMQ?{^^ka05lc$OqyN1iZ@1I)T(3p)qm`3OpU7|
zpI1?j(w`y^X(QyQzh%u@RXe;%WQVX=nAGR?PSi*nyh{`NMQxwv!oIO>1gh^qrG06m
zOP7s^tOudp{V3!_`&pko_?z}+)HREjlUVUDoq4t~=PjnvR4xMNemEE%IK^{we#&ve
z0bO=kk8!tY{<Zavsc7=vNLiK<#~Jn&K-j8Ct|eI+PVKI$dV3zVT#@Q8X)cG$1NL7~
zeruby9;+h%0EJqM_F%G){bSxa_nCj9*V6X(w&l;5CQ;aVXZlsaro!NPQ7Jx;*YeFA
zv0VkvH`MuwKW6<c7zVbwZ&K19=qmhQv(|+W`LwAf`p*3RO<zWvF&gBlPi2ok%B8lm
zjmRunhodgv=S7!byq{C&h`t4ANC908k?38?{Y_{`@KZ-X82En+?-?S!?W~u6W1Ux?
zn~45ZUgj8(7MY3TvJ;={PRp>bF6WEG@VmqI#|`1@WB&cR{{U61uy_MTjq?_RX&D@Y
z<){Au6JDY%pqnBssgu>CV1Jb-_Hr%^lQWM*+;jShuaP%>&o&+xhS-)%D_FhOH5Bx+
zpK%CKXZy9>-&#WwWi5yv;N<>hvC`rE!XUET-tCX)Rbm@`%%AKzjA-G?p84cvrH@T6
z+YQWMj^#1^D`(G{FeQx@o1*!c{3=1GT+8!$VLq~d^{5rul^&6~IhisBdIB@_#XjE1
zEW2fo%m=!R571VavUr;eRl9SNf0ay@$2}E);8e$QviNctmx&cY>M>21!tq6e<^TtA
ziqnZiZT-{!(a8NO>{^3GfY7NK>QnmE>Q;w629);B8E!s7&eF#R@~vdkS<pH~8x!2E
zbsA*x+#oVq1VhI4j|QJTva|l=jynPcLw-f2rspFzlGq=(w^sMgf5NLilQd@_#s2^S
zP;p(OSjlj9w*Ynh;25S$VGKc)2+MUXC>f@hG;)JYmuKD__b~zo<(ju=;rV{gbk88c
zQTJ4?K5pFB>^dLX5B##g>zN5Pb{!5ITX~1>8-CCMQb%8{H7hZ4oV*$hn~}a%e^A&T
z*0yXs9b+q!CXE*z_MhukMx7Kh43#QBxgIfET5ZmsAu6u26&O2I@P8_&Fi}T)z7My}
zENE6T#|4IQ%{NWBhU>(3#Vn4XvHZ;v9B%xxijwIJvq{S!B%BT_vG_-DV(|#EFo`W^
zRxSdJsR~G7dhw3cl%AJ0gSLlp4vHtzQ|%rdg2k2>W_e_g61eMty?S@AnDzTY*VBlk
z!frSm@IM;+TSnEJR?_8Zk)?Q%&mau((!M~}Cyno?#`HVS%G}^)xubU3*%xDzv#^mT
zT*wIxo|W{Dj%1fhv}KV1F|Pp$9X)HpRTbPG5Bvue^e2R_M7|lYz(a_@!X_!pVM|gA
z^qDQ(l8iQ<i;Cc`7ztaB{j1b972jzlRhQ*CuP(X3mA<{|B4Hvj{ct&|I=1DqcS$xd
zBOdi{1dgJrYB4m>i1WsCTE}x4?V-&^ZXNPlC)YKr;d>G_=p2xTla=7~^{Y#!q#);R
zLiepL2F(Vp4i_sBD}#}eIsAF8@7Ux~yp_&_QIQ^8Y#HuGYM501;QVUE)OeWYpefH4
z37w($dH^WidyXlrTo1YW(*v^s2Nn40XXVByCQm~f#70PMi^fPG^TunLve&`9jwzrF
z%)kago_?6F%U3RJCLK8Biu3D}3b<e}!1c{>VzTTmIez*Vefs_9JuFRJJiW<j*!SaV
zQp5(gP~k^W&2#TzZ6lK{tVI6+w1T>Q8cUfp8(AlE#h_B#*VGEi^6{LguNtOXT8rny
zPxOD}dvV0VYSj^yE`z2_q#HQ@0N_6<{VOH>37|B7ShER&SOU$#_2kz|Vpb&XBk4^@
zw-Oc4Us{;vweZiA6%Wz>0Fx=<Db-h`&PwmWb`c?HqmhrNKjB>M=Z9fg2k!Qc`D0$4
zE}JV1tgNTd@;_R{)pT2yhC(KeLaImxG0F7JdpLZ{4T#b**R#;#sfMXfbZ`x#K_~jQ
z80dS~HLqHfl~bLlSwR42gT-856PTrBSaZ*Iz^tuTQ<7;;=rRi*x}^TK>ZHyWDD)~c
zQ@Y?gzhD>xL9vwwD}(;X%}s3N@-3t%{iM(Jspg(gzcdV^*)dO)o?^6i)2PUEj+rWH
zUfNy^tZ~;M)NOEckdD9S=}t?cNCnFKus`8W!{)IfLV5D!Ak;S|>LkyXfPaXCT6X$*
z)FY6k<Z2^Q>|7iV#<DIPqir*z<GKo)YA$UD+P%Uy=ajFoHEs1K04U3G(8dq-tnKkI
z8Iiu5X$`b<MKi7smb<ygC+Sa@xG5UflUvC-j%9~-23+AzaZHIUbMoAzXVZosp{{ak
zp)BRTbH{e7vgO|)8}Vv6O6EGbWtm%SZyUyVEFmVU&2i+pSy3_X9zQ~B64P;-HQLHc
z0hD|i>HJHnC5F3kVKf40E#&gmWKaml9FRHuX;?Xo-?l|5WsIT&+%642?a2%!c$K|Y
zLb?8wlEI_u0D~B`e05jI{EbyU8?=y-4eWCIBXN($izm3Q!bzbgb0LiTOP}$o^2=!F
zc4s*5q;dKRg7d?-7KmConb-Y;nxpm$ouTmOoE+!+)g&vLkzZ-7a?fx`;1a`+{Cb-{
zwWeFJCP{;KAnyLP99lBInC$3_DU<+kLB<Y$r9d<_kgA2ldYlnT!@DE8@g=+GX_2_#
z>>te543{!Ij6-c!JsP@$;qe$bSeRp}z{llL$D-RTfu39p^W~BaQ982*J4x?kLW3ZG
z8RPY>s5Gh4bdq_M$mA%H93O9*wLZgR8U+sJdi>1CKZa^(g}96_kgx8`oc?B&$6|xT
zyz=DwDF+o>PqJ9mjM6$Dyz~Be#c9uf9C!lNKpilO1yq{lE>{N48}Y~TqgDj)%^M-|
z?t>`m3XkQQl_rlEeaF<PBlH!GC8=e?!L!$vZ2kn}^r+*ux^La15Qq3j%bIozo095r
zS^!o?^6}NAZV%Is=U446BAo-Qqs!__j-S@K?NdpYN=Sr-*Kp2Rs^k*O1&z#0w6)2O
zNY3s+0lI#FrB5x#&D`0Y7Ez0N(Shr{womEBJegKKrBRRjB#?hf!nA@{dsVv+BYEJn
zvX=RBJ*%_vE#`@9;)!F^-YG0gzSl5dk(0Fa9^I&F#VKD?p3Uku@)=Nn0^n!!HG1k-
zwV0&PTq|KqV;Je4^p^UlYnBbCG|}XM(Zt7(rYm}Oxz=ZSQqEvV9b;wBZ%W2hVNc^}
ze9a>nOW{{DqK*laZIf_6!p?a72&?*Dm2Uz&MF3swOE6sI{#0A|TH&0uu*evk{Fool
z71ii^LtDaQDp$T8lz&?0o;M90>c{U!>V;SKAKVu=*8+FLk^w&T*?c3^CQlq`fw+!G
z^4tX+f(SXTI(W9s%47tC-nx$gYEtPQAhf!M*j-43ff3*mK^f`qU2?Nb#y7e2XM_=h
z-6lttu6E<NuZ;X~?`z^6K@bdy-#_=!ue1CZuKHP?L~D0$Ok{(Bk6~XZd_%RfJ|@3t
zCK4-3$9CKvNv=q1CU&h7JpSJL^f1A~pKAJ>;nljQgLL57X7ch#IUMs}IY(rh!bW!k
z?O#jy8X2uTC8i|t8&(luBd*hokPbcS=B$CT#<uZ8VJW~T%VUqiyncBLO5As^Ue;ud
z;4!nNSP|B|p6)G^xbK?ICK4(TPjUq`6-gAj`HDKJBxmxehy$oJENbqf2L#rL&FX2G
zZRWBc=<x?=$la0;N~vUm3(W>_;Q7|i8-V%bJ7Xia7_ECtSldfukDUPkl6b0e!yUYS
z7?Ly{B}P(t-Mf}QfghD<a`j)=V)me;%mi_fR7t_D4MRR=PfU8%2IiVNhBJ_)f@=>`
zxVQoK%`ee#F<UbnM%duuxcyp7gt*)$WFX`n$Aj%wk<C_C5<Ny|idf`wK~g?u$*f6i
z7Fm=6NhAutX6~v~?PVhrHK9w0<yIk;gJZV_v`3x0J<{6M;?d)cq<pMEXF2FS>k}*v
zHxu|)ymt~@>CuvgGEfo+PL+((s6BbCQSC8s>z+^HNEim)x909~Kwt*|W73$-^{JgW
z)Q>FH(Bmf;c)JpPv4A6K{ION;URhv#C>$IgN?oUSCyz>Ok(O6d7%M3U2EKa}k<qG~
zr1@Xoj_P>X$KurUeOE`cy=F7QjV6EAC@TK|nEtiSY911mu-20o3;Yrir}OA*NNe)i
zT}+c0t`S_0cy7M6sb#HL-mnPk6Q0g7`t+}hbTj;k-ivdB?e8zUb@H+3Dw%#i<I-Pq
z`}SuM_8Z$TmgXmbblh@5{AzhEw?;8LW50U!Z7)rGu*y?%5z}r#6%MQL^3wJ^3u!Ii
z))g!IV-@tcE+<uBo-Us&?!U?EzY~V8QsVyrb1V9uOl(15M6P|d)s=$^K62i~S5<ZJ
z&r!D|+h*ZM@Q_u%!kHI<HHH9viT?oLZU^<Rs-u`;YsZ=u6~6Dm*z%`_txi^yALd|b
zntWF>Ttw=suM=U81_&7+%DHQ+Rf&q_ez@knQrqF)q@=dU<9?qsfQpU&5nfE&zS{(T
z+09qiu&{d6UwR+at4nA<xbj9GS>i%|g0(z2eB*wu_+PTfa>@=qUf%ty(<AsVJcN0g
zoJu{TCX(~v9ClXh=KlbB$0y6c{&mk+H^9a%%A)*V=v;7EhV+T!vO^m-M2-ic#}yfY
z2TjM{{EGC0@b1xA?z?Zn2l&zthx&5;>zRo9p#GKRPl~drXsS2q8Gn(|vaDO)DSX%Y
zoCchzZs9DXAa%}p@ARwQFo(<6Z@iWUGcysi<aO;`v_2NnH1`a$w&mw9Fslbn&|Th1
zOm6IQPW+F{IIJHPVI=<mcS@waBmQj{{g+iQdU0N?@@;^y+z;j|#grQ*+^omYJ$irH
zyfXm>t)V&Zu#x<#)Dn1Y4pPz~?jRr3RjwhcKjGl2{Nr!)62L`#RiXEuZ3V+C64+0t
z6|-xqPLcU(6w+?%<%Z|-uS>GI(+JD}DgOXv0Hv2vXtU+pvwP$LRP$WIUk(NQ<d^6R
z35Q$PUnI{xir!nFkl5U=PIok9;Qln1z6H6NR%>-aM<pBOKc#keTKvdx&=5Ton#j8G
zEy6#^2_IA@q2n{Te-8^4>oorWBGnuU_^P+^Igj{4bz6`J*)}Nd(yu@G_w=b-z;{Tc
zUG0?r0M|^P=~~Cc7q2HM*!Et3ooFthad-rBF+fLB0mtc5r^HiQ#*}~XC;0`k<n(iY
zam=T~nVauk+ryrR1l6eg2P8@Z-p48F@~I!rwZ@ZoCC?WQvGva!`&8#mcz15PX2(yR
zf%<j9p;FK1@mHq3BH!jyco_cx%ej2nofpHXu3Ig3Q`ZPTon4RNo}C^GO(dt^Xs9NK
z4fD%3JvVVpj9Df=P+QkIu9)C+SucMX_d+IK-w7QRAHGb`{{VywNsI3Qp!PFhezf%P
zev1IfRAnFZ)EdoawkL-<_9lt$VMqW9%t`Cl`PD3|6EBY!Kb4TBjH4H5(uu8grf5yH
zO>J*J(STjIWA&<ysAyJ&cGv^3ZC@=11JGu(=9S^JS1-0VB(Bg1stYQfN!$-$gZwI%
zOrOVysQqRC003WIYvHFA@;6(=x?my3o>Z?PjB$cLTB$dSt&xd>+Aw?n015s^vt&zo
zQ-LV=T-7<OqAl{XupQ)Xf1MxLI4OS<nqIPhqd>C?>*2EbBTc+-Dlyp#f54kR$W#*e
z_fbU3L2Spi;(x}n<+MSM-3br6AMvQ9vxuP$Y!$t6kJ73fKbAvPMSR<Tn-sGgTl;^J
zaC}VEqxo9i01x*Q`sTDD@$Jsg#@<Yk*KSAQSeBMi7XgHEZT=vmBlE2&&`e4TmXSvw
z?dka%?*7cc$3;dzaxwbWA^o@ao|SuJzUAB!K5n_qbpHSkEfRfZG?GIZjak*ycLK5Q
zNs?yTsuwkDOW$QG%CagDcq6F%>#@7560~R1o*th%D`88pQ~v-0;=We#wU^s<%c;Z$
z9r6>foS)@h^YHTiE4U;x>aoWnoD_CKTw}2#>t0>s+gnRre(E@031i*zm<eV4{c8w&
zvS&^G)Xy}I!Qq#BuF}0SE9jpF-kYxs*_qtDrA|vWPg?S88ykCxVh*8Dumzg{es$@W
zNub&YqSCLWFe(le*aC6SrCi<g7d6e>q>1A~KpnbQl4_jaO@V>9;=4<mt8|3(B%}gH
zWpDAW3V95ZIVY*;YcxcLZ6I?`g*Qlpa*Up)qA0oO1xW^DkzE`D4|=3#b^3hJ#cL>g
zsK!s-TnfS0?<09Mk#2nEw{|;MuQ>kz3X&~ZkaEDEYJ*F-OaA~ESnma+4byK*w5_R(
zmGm#_k(il7saGACRz#Ok#(B+d__lSIRFECVZy6cIaXQhR9X`se+<e&?ryWfmh1;!3
z5m|ONNc61xi*?i?-X=(udhf`pK5n5R?PNF|4h3}n8`Bc<!Tk6`PrKI~eJb1KF_cvI
zIjHo|tZ{K0dkoW<s>BZCyEwoV(`q^o*$}a|z&#EPWnO8<D@4f(OLYU9YF9b^nomQ#
zvAR>Gp!-7O%g4;!c&r&O&^Z~;zAJLYRxK_q(Jn+|CvUe}%9z9t%&Yi{gwF1SE2yqM
z{{SCKY?_iU{IuuO6(`C%MxW>KraQ1-l~5n8JAnghAo24brYf!0u&s~`**=7dv2`TI
zJOYWwI5o}Qvw4_e=kem2ZJEiEy{){WO_t#qx!t!loj#Ty{#toh?l`Nqyb*#$Se7+q
z<$?9$t5cHExzc<w^K4<gM2)ot%AP**pJQEip{ZT@MNN#cf;bX7)(?SfuTGyKv%2yl
zFY_+IdB?tMS6a2yRy1jEclI18{!3gHu(WH+^&@xvc0D>(CkU=qXEe7hoWYOy7^Dj~
zQw9(F^#Z|gTjsfZdt>}5KFdDio0&2G^<c8>BL4uFXy5A<f0(wuX*|XU)&Btc)gr66
zNYnoMKjBgNWX7swlaArAO+fl`%5rC${`;*~4-B@ZzT{7~sQ%M0N9F_fV+ZU10M@Lp
z6w1k>+>#V<0NIdw`qPe)2|qEFz08KF>y{B&>2t`XhS8ChCbm>*Eug;SX6GigXPQou
zPTw*}N2^IxrLm9_RyG6QpXpjxH`7Vcm>;b|lU&Gu)<{R7YU)WxWn+=+yE9IkEQ98S
z&(Ip44FG2*ITW77NUPx|UXngf_l_yaEYXZ-KHKW9M=C2#rZOnRM1V2tQKh3hZCG|6
zb61X{$VNsn{?Vr{t0ad2CMb6W$|_h*6kpvQ*s9_?kmPUU*EOLOrcR(7)YgzAUZHda
zdye$3(i-Kxj7zgDLz3C-MnA^0jr6(y09Ncj-%<R{bXxd<Zsb^(WMBXkpKfau!x70R
zKHI9G(~4t~v#}yc=EMmop2YL|Q&vD*9fy8RF=JBPD9^F03bC&T8Sl+9btQR_C?QB5
zt<tNTr;OmXSJi63kqE}+KVE6AZw$b0D1RJKtSMcS>Cvt2%EotLk6*lhDv@;by}tW8
z!p$O*HvP<F*V2<u32ku`DuNXB&0o+hBAZ`PIV~K7@DEB%X%+6gGbOUK8+l_<+~LRO
zD<11dmB1mDhxbqTS8d}T4~;mvfr<{iF#wOHa$-s2PFN6qsYTrl#U@shO_8CEGlfx&
zt5qbhk|LpoM^TfUewD2Z@;dzSlD^C_`BbQ4od9Fy{duRT+eSC`a4}?ok4#j5W{xE}
z3_gby&@H{b(xP6x=Cd_TC4g3j;F3=xIT-p-nKm*?+h;Ai=s`7I*4djIbLa@GGFmh<
z46_hAfC$Y#HI0YM1LxNO{{UK|im^wy@DUVoz^ywwV8^UY$E{M5IaS700{T_EQy%Op
zsN>T#m>!CPQzLxCudP{8B8(CUqKfBDopvT!omT+u{{VN2sWaj8)cTqzp|BcdkPb1;
z5lc92$iWY)nkb{73ofO6ql<z^xT?Qtl$^22KJ-yiz<hH&hZ(>WmltwCzbT@MOK@vK
z2(K<BA9xSOu4y{G)|GlLVJqf<Mp$NwD$~$bL*~A?yJnH(JBi7~A_BnVoc(B`rM(7_
z#(?`)rio=FkCl)o(uyi>!K7?YV|cNj^s-c+yI4A`4G~iBy9cEdRYB@=$s@Of8;vS9
zU@*~wK>AlXc^}GD^F<X6oi;^ykcA$V7-G^DqKeTrCWg-uSediZuw}`R@Vk41(uylc
zy$(qwa(jDpWAd)k>7FWPw8|coQB`vZMO^Ou49f<T=v0&D5=cJ6wDqU+B2WiI+|fl~
z-lw5WE<|Dl`LTgc^3SytQFdLB<x<|1{{SqHN+_c2EUX0x^sJ8(TQ$~^aT=8e8Tq<#
z%@k0WnpQl%SY?gBgYc&9m4-Jc`cXw~bDF>{U$4pdnsL+E@<e~F6j632krUaKVe<j>
zsjaPi*-<l=ViXplimS3xMYOaryP+fHV!V4)(Oc|b+0Wxe6)mx-tCh7I6L8If0Y0Xv
zMW9J8aUu_>G*MEd(l&8dBa=yzEd0oS6IGhfhXI1~=uH$=-I2<PWU`F_>JPO)%T)vE
z=|vRo#mb58S8SWTD(0DVEp<4hbuIzu4HQ$kHb+C^{dqMAN~~<8s2O8i*|B-8*J~&k
z_o9lGpyaMnmd<Ds3o%#q2A=jVZPkRIG4DkcMphkVrm;d^Qr^_d%Mk<c=N^<%Nj6$Y
zi4-5aHv#KUhSn)^6cjyr<WWT?*|JLHqfJ>+$vI{9?^K=zhD>c3$74klCw2`akN??a
ChI)wr

diff --git a/src/views/core/base/equipment/assets/eq9.jpg b/src/views/core/base/equipment/assets/eq9.jpg
deleted file mode 100644
index 93754f39c696ab946d6abfe50c52917c7c0143fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45892
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

diff --git a/src/views/core/base/equipment/components/AssetsUpload.vue b/src/views/core/base/equipment/components/AssetsUpload.vue
deleted file mode 100644
index 3f7875d8..00000000
--- a/src/views/core/base/equipment/components/AssetsUpload.vue
+++ /dev/null
@@ -1,460 +0,0 @@
-<!--
-    filename: AssetsUpload.vue
-    author: liubin
-    date: 2023-10-12 16:40:14
-    description: 上传资料/图片 组件
--->
-
-<template>
-	<div class="assets-upload">
-		<section class="operations">
-			<el-button type="text" class="expand-btn" @click="expand = !expand">
-				<i class="el-icon-folder-opened" v-if="expand"></i>
-				<i class="el-icon-folder" v-else></i>
-				展开
-			</el-button>
-			<!-- <div class="preview-btn">
-				<i class="el-icon-view"></i>
-				预览
-			</div> -->
-		</section>
-		<section
-			class="file-area"
-			:style="{
-				height: expand ? 'auto' : isPicMode ? '180px' : '152px',
-				gap: isPicMode ? '0 24px' : '24px',
-				gridAutoRows: isPicMode ? '180px' : '152px',
-			}">
-			<el-upload
-				class="equipment-upload"
-				:style="{ marginBottom: isPicMode ? '48px' : '24px' }"
-				:disabled="disabled"
-				drag
-				:action="uploadUrl"
-				:headers="headers"
-				multiple
-				:show-file-list="false"
-				:before-upload="beforeUpload"
-				:on-success="handleSuccess">
-				<i class="el-icon-upload"></i>
-				<div class="el-upload__text">
-					<span>将文件拖到此处或</span>
-					<em>点击上传</em>
-				</div>
-				<div class="el-upload__tip" slot="tip">
-					{{
-						isPicMode ? '仅支持上传 .jpg .png 格式文件, 且' : ''
-					}}文件大小不超过2MB
-				</div>
-			</el-upload>
-			<!-- <div
-				class="file-list__item"
-				v-for="n in 9"
-				:key="n"
-				:style="{
-					display: n > 4 && !expand ? 'none' : 'block',
-				}"
-				:data-name="n"
-				:class="{ 'default-icon': !isPicMode }">
-				<i class="el-icon-delete"></i>
-			</div> -->
-			<div
-				v-for="(file, index) in files"
-				:key="file.fileName"
-				style="width: 100%">
-				<div
-					class="file-list__item"
-					v-if="!isPicMode"
-					:style="{
-						background: isPicMode
-							? `url(${file.fileUrl}) no-repeat`
-							: `url(${defaultBg}) no-repeat`,
-						backgroundSize: isPicMode ? '100% 100%' : '64px',
-						backgroundPosition: isPicMode ? '0% 0%' : 'center',
-					}"
-					@click="handleDownload(file)"
-					:data-name="file.fileName">
-					<el-button
-						v-if="!disabled"
-						type="text"
-						class="el-icon-delete"
-						style="padding: 0"
-						@click="(e) => handleDelete(file)" />
-				</div>
-
-				<el-image
-					v-else
-					class="file-list__item"
-					style="width: 100%"
-					:src="file.fileUrl"
-					:preview-src-list="files.map((item) => item.fileUrl)"></el-image>
-        </div>
-		</section>
-	</div>
-</template>
-
-<script>
-import { getAccessToken } from '@/utils/auth';
-import defaultBg from '../../../../../assets/images/default-file-icon.png';
-
-function checkSize(file, message) {
-	const isLt2M = file.size / 1024 / 1024 < 2;
-	if (!isLt2M) {
-		message.error('上传文件大小不能超过 2MB!');
-	}
-	return isLt2M;
-}
-
-function checkPic(file, message) {
-	const isJPG = file.type === 'image/jpeg';
-	const isPNG = file.type === 'image/png';
-	const isPic = isJPG || isPNG;
-	if (!isPic) {
-		message.error('上传图片只能是 JPG/PNG 格式!');
-	}
-	return isPic;
-}
-
-export default {
-	name: 'AssetsUpload',
-	components: {},
-	model: {
-		prop: 'dataSource',
-		event: 'update',
-	},
-	props: {
-		type: {
-			type: String,
-			default: 'image',
-		},
-		dataSource: {
-			type: Array,
-			default: () => [],
-		},
-		equipmentId: {
-			type: String,
-			default: '',
-		},
-		isPicMode: {
-			type: Boolean,
-			default: false,
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	emits: ['update-filelist'],
-	data() {
-		return {
-			defaultBg,
-			expand: false,
-			headers: { Authorization: 'Bearer ' + getAccessToken() }, // 设置上传的请求头部
-			fileList: [],
-			uploadUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload',
-			files: [
-				// 服务器返回的结构
-				// {
-				// 	fileName: 'sf.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://hbimg.b0.upaiyun.com/cc7475787bd08ed926b68eaf53fa1f2c5473259115e3c-gJdObd_fw658',
-				// },
-				// {
-				// 	fileName: 'sddf.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl: 'https://img0.sc115.com/wm/xqx/pic1/1501xofo4ssolji.jpg',
-				// },
-				// {
-				// 	fileName: 'jjj.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://www.mms591.com/www.mms591.com-photo/2013081823/1-130QR34544.jpg',
-				// },
-				// {
-				// 	fileName: 'asdfasdf.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://hbimg.b0.upaiyun.com/8f6bced5f2e38d3a021b2c48d5a98dfb6317e3e12c6a0-QmhJ5v_fw658',
-				// },
-				// {
-				// 	fileName: 'asdkj.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://www.mms591.com/www.mms591.com-photo/2013013021/1-130130212034.jpg',
-				// },
-				// {
-				// 	fileName: 'lkasjdf.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://www.mms591.com/www.mms591.com-photo/2013072122/1-130H1223057.jpg',
-				// },
-				// {
-				// 	fileName: 'asdf.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://img.1ppt.com/uploads/allimg/1212/1-1212101ZH5A2.jpg',
-				// },
-				// {
-				// 	fileName: 'afdffff.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://www.mms591.com/www.mms591.com-photo/2013051721/1-13051H11945.jpg',
-				// },
-			],
-			updateTimer: null,
-		};
-	},
-	watch: {
-		dataSource: {
-			handler(val) {
-				this.files = JSON.parse(JSON.stringify(val));
-			},
-			immediate: true,
-			deep: true,
-		},
-	},
-	mounted() {},
-	methods: {
-		// handle success, per file!
-		handleSuccess(response, file, fileList) {
-			this.$notify({
-				title: '成功',
-				message: '上传成功! 点击确认保存上传结果',
-				type: 'success',
-			});
-			if (
-				response == null ||
-				!('data' in response) ||
-				response.data == null ||
-				response.data.trim() == ''
-			) {
-				this.$message.warning('上传出错了!');
-				return;
-			}
-			this.files.push({
-				fileName: file.name,
-				fileUrl: response.data,
-				fileType: this.isPicMode ? 1 : 2,
-			});
-			// debugger;
-
-			// 延时更新
-			if (this.updateTimer) {
-				clearTimeout(this.updateTimer);
-			}
-			this.updateTimer = setTimeout(() => {
-				// console.log('[AssetsUpload] 更新上传列表');
-				this.emitFilelist();
-				clearTimeout(this.updateTimer);
-				this.updateTimer = null;
-			}, 500);
-		},
-
-		emitFilelist() {
-			this.$emit('update', this.files);
-		},
-
-		handleRemove(file, fileList) {
-			debugger;
-		},
-
-		handleDelete(file) {
-			// fileName fileType 都可能一样，但 fileUrl 一定不一样
-			this.files = this.files.filter((item) => item.fileUrl != file.fileUrl);
-			this.$notify({
-				title: '成功',
-				message: '删除成功! 需点击确认保存删除结果',
-				type: 'success',
-			});
-			this.emitFilelist();
-		},
-
-		beforeUpload(file) {
-			if (this.isPicMode) {
-				return checkPic(file, this.$message) && checkSize(file, this.$message);
-			}
-			return checkSize(file, this.$message);
-		},
-
-		handleUpload() {
-			switch (this.type) {
-				case 'image':
-					break;
-				case 'asset':
-					break;
-			}
-		},
-		updateFileList(appendFilelist) {
-			// Array
-			this.$emit('update-filelist', this.appendFilelist);
-		},
-
-		async handleDownload(file) {
-			if (this.isPicMode) {
-				// this.$emit('preview', file);
-				const link = document.createElement('a');
-				link.href = file.fileUrl;
-				link.target = '_blank';
-				document.body.appendChild(link);
-				link.click();
-				document.body.removeChild(link);
-			} else {
-				// this.$emit('download', file);
-				const data = await this.$axios({
-					url: file.fileUrl,
-					method: 'get',
-					responseType: 'blob',
-				});
-				const link = document.createElement('a');
-				link.href = window.URL.createObjectURL(new Blob([data]));
-				link.download = file.fileName;
-				document.body.appendChild(link);
-				link.click();
-				document.body.removeChild(link);
-				window.URL.revokeObjectURL(link.href);
-			}
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.assets-upload {
-	position: relative;
-}
-
-.operations {
-	position: absolute;
-	top: -36px;
-	right: 0;
-	display: flex;
-	align-items: center;
-}
-
-.expand-btn,
-.preview-btn {
-	font-size: 14px;
-	line-height: 1.2;
-	display: inline-block;
-	padding-left: 20px;
-	cursor: pointer;
-	z-index: 1000;
-}
-
-.expand-btn {
-	margin-right: 12px;
-}
-
-.preview-btn {
-	color: #ccc;
-}
-
-.expand-btn,
-.preview-btn:hover,
-.preview-btn.active {
-	// color: #0042d0;
-	color: #0b58ff;
-}
-
-:deep(.equipment-upload) {
-	.el-upload-dragger {
-		width: 188px;
-		height: 128px;
-	}
-
-	.el-icon-upload {
-		margin: 12px 0;
-		font-size: 48px;
-	}
-
-	.el-upload__text {
-		font-size: 12px;
-		line-height: 2px;
-		display: flex;
-		flex-direction: column;
-
-		em {
-			margin-top: 12px;
-		}
-	}
-
-	.el-upload__tip {
-		font-size: 12px;
-		line-height: 1.5;
-		color: #d1d1d1;
-		margin: 0 0 12px;
-		transform: translateY(-12px);
-		user-select: none;
-	}
-}
-
-.equipment-upload {
-	margin-bottom: 24px;
-}
-
-.file-list {
-	padding: 12px;
-	border: 1px solid #ccc;
-}
-
-// custom
-.file-area {
-	display: grid;
-	grid-template-columns: repeat(auto-fill, 188px);
-	grid-auto-rows: 152px;
-	gap: 48px 24px;
-	overflow: hidden;
-}
-
-.file-list__item {
-	height: 128px;
-	background-color: #fff;
-	border: 1px dashed #d9d9d9;
-	border-radius: 6px;
-	-webkit-box-sizing: border-box;
-	box-sizing: border-box;
-	text-align: center;
-	cursor: pointer;
-	position: relative;
-	// overflow: hidden;
-
-	&:hover {
-		.el-icon-delete {
-			display: block;
-		}
-	}
-
-	.el-icon-delete {
-		color: #ccc;
-		position: absolute;
-		top: 8px;
-		right: 8px;
-		display: none;
-
-		&:hover {
-			color: rgb(210, 41, 41);
-		}
-	}
-}
-
-.file-list__item:hover {
-	border-color: #0b58ff;
-}
-
-.file-list__item::after {
-	content: attr(data-name);
-	position: absolute;
-	left: 0;
-	bottom: -26px;
-	font-size: 14px;
-	line-height: 2;
-	color: #616161;
-}
-
-.default-icon {
-	background: url(../../../../../assets/images/default-file-icon.png) no-repeat;
-	background-position: center;
-	background-size: 64px;
-}
-</style>
diff --git a/src/views/core/base/equipment/components/DialogForm.vue b/src/views/core/base/equipment/components/DialogForm.vue
deleted file mode 100644
index ad0f939f..00000000
--- a/src/views/core/base/equipment/components/DialogForm.vue
+++ /dev/null
@@ -1,313 +0,0 @@
-<!--
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-08-15 10:32:36
-    description: 弹窗的表单组件
--->
-
-<template>
-	<el-form
-		ref="form"
-		:model="form"
-		:label-width="`${labelWidth}px`"
-		:size="size"
-		:label-position="labelPosition"
-		v-loading="formLoading">
-		<el-row :gutter="20" v-for="(row, rindex) in rows" :key="rindex">
-			<el-col v-for="col in row" :key="col.label" :span="24 / row.length">
-				<el-form-item :label="col.label" :prop="col.prop" :rules="col.rules">
-					<el-input
-						v-if="col.input"
-						v-model="form[col.prop]"
-						@change="$emit('update', form)"
-						:placeholder="`请输入${col.label}`"
-						v-bind="col.bind" />
-					<el-input
-						v-if="col.textarea"
-						type="textarea"
-						v-model="form[col.prop]"
-						@change="$emit('update', form)"
-						:placeholder="`请输入${col.label}`"
-						v-bind="col.bind" />
-					<el-select
-						v-if="col.select"
-						v-model="form[col.prop]"
-						:placeholder="`请选择${col.label}`"
-						@change="$emit('update', form)"
-						v-bind="col.bind">
-						<el-option
-							v-for="opt in optionListOf[col.prop]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-					<el-date-picker
-						v-if="col.datetime"
-						v-model="form[col.prop]"
-						type="date"
-						:placeholder="`请选择${col.label}`"
-						value-format="timestamp"
-						v-bind="col.bind"></el-date-picker>
-					<el-upload
-						class="upload-in-dialog"
-						v-if="col.upload"
-						:file-list="uploadedFileList"
-						:action="col.url"
-						:on-success="handleUploadSuccess"
-						v-bind="col.bind">
-						<el-button
-							size="small"
-							type="primary"
-							:disabled="col.bind?.disabled || false">
-							点击上传
-						</el-button>
-						<div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
-							{{ col.uploadTips || '只能上传jpg/png文件，大小不超过2MB' }}
-						</div>
-					</el-upload>
-					<el-switch
-						v-if="col.switch"
-						v-model="form[col.prop]"
-						active-color="#0b58ff"
-						inactive-color="#e1e1e1"
-						v-bind="col.bind"></el-switch>
-					<component
-						v-if="col.subcomponent"
-						:key="col.key"
-						:is="col.subcomponent"
-						v-bind="col.bind"
-						:inlineStyle="col.style"></component>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-/**
- * 找到最长的label
- * @param {*} options
- */
-function findMaxLabelWidth(rows) {
-	let max = 0;
-	rows.forEach((row) => {
-		row.forEach((opt) => {
-			// debugger;
-			if (!opt.label) return 0;
-			if (opt.label.length > max) {
-				max = opt.label.length;
-			}
-		});
-	});
-	return max;
-}
-
-export default {
-	name: 'DialogForm',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: {},
-	props: {
-		rows: {
-			type: Array,
-			default: () => [],
-		},
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
-		labelPosition: {
-			type: String,
-			default: 'right',
-		},
-		size: {
-			type: String,
-			default: '',
-		},
-	},
-	data() {
-		return {
-			formLoading: true,
-			optionListOf: {},
-			uploadedFileList: [],
-			dataLoaded: false,
-		};
-	},
-	computed: {
-		labelWidth() {
-			let max = findMaxLabelWidth(this.rows);
-			// 每个汉字占20px
-			return max * 20;
-			// return max * 20 + 'px';
-		},
-		form: {
-			get() {
-				// if (this.dataLoaded) return this.dataForm;
-				// else return {}
-				return this.dataForm;
-			},
-			set(val) {
-				console.log('set form', val);
-			},
-		},
-	},
-	watch: {
-		rows: {
-			handler() {
-				console.log('watch triggered!');
-				this.$nextTick(() => {
-					this.handleOptions('watch');
-				});
-			},
-			deep: true,
-			immediate: false,
-		},
-	},
-	mounted() {
-		// 处理 options
-		this.handleOptions();
-	},
-	methods: {
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.form.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.form.resetFields(args);
-		},
-		// getCode
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
-		},
-		async handleOptions(trigger = 'monuted') {
-			console.log('[dialogForm:handleOptions]');
-			const promiseList = [];
-			this.rows.forEach((cols) => {
-				cols.forEach((opt) => {
-					if (opt.value && !this.form[opt.prop]) {
-						// 默认值
-						this.form[opt.prop] = opt.value;
-					}
-
-					if (opt.options) {
-						this.$set(this.optionListOf, opt.prop, opt.options);
-					} else if (opt.url) {
-						// 如果有 depends，则暂时先不获取，注册一个watcher
-						if (opt.depends) {
-							console.log('[handleOptions] setting watch');
-							this.$watch(
-								() => this.form[opt.depends],
-								(id) => {
-									console.log('<', opt.depends, '>', 'changed', id);
-									if (id == null) return;
-									// 清空原有选项
-									this.form[opt.prop] = null;
-									// 获取新的选项
-									this.$axios({
-										url: `${opt.url}?id=${id}`,
-									}).then((res) => {
-										this.$set(
-											this.optionListOf,
-											opt.prop,
-											res.data.map((item) => ({
-												label: item[opt.labelKey ?? 'name'],
-												value: item[opt.valueKey ?? 'id'],
-											}))
-										);
-									});
-								},
-								{
-									immediate: true,
-								}
-							);
-							return;
-						}
-						// 如果是下拉框，或者新增模式下的输入框，才去请求
-						if (opt.select || (opt.input && !this.form?.id)) {
-							promiseList.push(async () => {
-								const response = await this.$axios(opt.url, {
-									method: opt.method ?? 'get',
-								});
-								console.log('[dialogForm:handleOptions:response]', response);
-								if (opt.select) {
-									// 处理下拉框选项
-									const list =
-										'list' in response.data
-											? response.data.list
-											: response.data;
-									this.$set(
-										this.optionListOf,
-										opt.prop,
-										list.map((item) => ({
-											label: item[opt.labelKey ?? 'name'],
-											value: item[opt.valueKey ?? 'id'],
-										}))
-									);
-								} else if (opt.input) {
-									console.log('setting code: ', response.data);
-									// 处理输入框数据
-									this.form[opt.prop] = response.data;
-								}
-							});
-						}
-					}
-				});
-			});
-
-			console.log('[dialogForm:handleOptions] done!');
-
-			// 如果是 watch 触发的，不需要执行进一步的请求
-			if (trigger == 'watch') {
-				this.formLoading = false;
-				return;
-			}
-			try {
-				await Promise.all(promiseList.map((fn) => fn()));
-				this.formLoading = false;
-				this.dataLoaded = true;
-				// console.log("[dialogForm:handleOptions:optionListOf]", this.optionListOf)
-			} catch (error) {
-				console.log('[dialogForm:handleOptions:error]', error);
-				this.formLoading = false;
-			}
-			if (!promiseList.length) this.formLoading = false;
-		},
-		// 上传成功的特殊处理
-		beforeUpload() {},
-		// 上传前的验证规则可通过 bind 属性传入
-		handleUploadSuccess(response, file, fileList) {
-			console.log(
-				'[dialogForm:handleUploadSuccess]',
-				response,
-				file,
-				fileList,
-				this.form
-			);
-			// 保存原始文件名
-			if ('fileNames' in this.form) this.form.fileNames.push(file.name);
-			// 保存完整地址
-			if ('fileUrls' in this.form) this.form.fileUrls.push(response.data);
-			this.$modal.msgSuccess('上传成功');
-		},
-
-		getFileName(fileUrl) {
-			return fileUrl.split('/').pop();
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-</style>
diff --git a/src/views/core/base/equipment/components/EquipmentDrawer.vue b/src/views/core/base/equipment/components/EquipmentDrawer.vue
deleted file mode 100644
index 3c064771..00000000
--- a/src/views/core/base/equipment/components/EquipmentDrawer.vue
+++ /dev/null
@@ -1,539 +0,0 @@
-<!--
-    filename: EquipmentDrawer.vue
-    author: liubin
-    date: 2023-08-22 14:38:56
-    description:
--->
-
-<template>
-	<el-drawer
-		:visible="visible"
-		:show-close="false"
-		:wrapper-closable="false"
-		class="drawer"
-		custom-class="mes-drawer"
-		size="60%"
-		@closed="$emit('destroy')">
-		<SmallTitle slot="title">
-			{{
-				mode.includes('detail')
-					? '详情'
-					: mode.includes('edit')
-					? '编辑'
-					: '新增'
-			}}
-		</SmallTitle>
-
-		<div class="drawer-body flex">
-			<div class="drawer-body__content">
-				<section v-for="(section, index) in sections" :key="section.key">
-					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
-
-					<div
-						class="form-part"
-						v-if="section.key == 'base'"
-						style="margin-bottom: 32px">
-						<el-skeleton v-if="!showForm" animated />
-						<EquipmentInfoForm
-							key="drawer-dialog-form"
-							v-if="showForm"
-							:disabled="mode.includes('detail')"
-							:sync-filelist="syncFileListFlag"
-							v-model="form" />
-					</div>
-
-					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
-						<base-table
-							v-loading="attrListLoading"
-							:table-props="section.props"
-							:page="attrQuery?.params.pageNo || 1"
-							:limit="attrQuery?.params.pageSize || 10"
-							:table-data="list"
-							:add-button-show="mode.includes('detail') ? null : '添加属性'"
-							@emitButtonClick="handleAddAttr"
-							@emitFun="handleEmitFun">
-							<method-btn
-								v-if="section.tableBtn"
-								slot="handleBtn"
-								label="操作"
-								:method-list="tableBtn"
-								@clickBtn="handleTableBtnClick" />
-						</base-table>
-
-						<!-- 分页组件 -->
-						<pagination
-							v-show="total > 0"
-							:total="total"
-							:page.sync="attrQuery.params.pageNo"
-							:limit.sync="attrQuery.params.pageSize"
-							@pagination="getAttrList" />
-					</div>
-				</section>
-			</div>
-
-			<div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
-					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="handleConfirm">确定</el-button>
-				<!-- sections的第二项必须是 属性列表  -->
-				<!-- <el-button
-						v-if="sections[1].allowAdd"
-						type="primary"
-						@click="handleAddAttr">
-						添加属性
-					</el-button> -->
-			</div>
-		</div>
-
-		<!-- 属性对话框 -->
-		<base-dialog
-			v-if="sections[1].allowAdd"
-			:dialogTitle="attrTitle"
-			:dialogVisible="attrFormVisible"
-			width="35%"
-			:append-to-body="true"
-			custom-class="baseDialog"
-			@close="closeAttrForm"
-			@cancel="closeAttrForm"
-			@confirm="submitAttrForm">
-			<DialogForm
-				v-if="attrFormVisible"
-				ref="attrForm"
-				:dataForm="attrForm"
-				:rows="attrRows" />
-		</base-dialog>
-	</el-drawer>
-</template>
-
-<script>
-import DialogForm from './DialogForm';
-import EquipmentInfoForm from './EquipmentInfoForm.vue';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	components: {},
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
-
-export default {
-	components: { SmallTitle, DialogForm, EquipmentInfoForm },
-	props: ['sections', 'mode', 'dataId'], // dataId 作为一个通用的存放id的字段
-	data() {
-		return {
-			visible: false,
-			showForm: false,
-			btnLoading: false,
-			total: 0,
-			form: {},
-			list: [],
-			attrTitle: '',
-			attrForm: {
-				id: null,
-				equipmentId: null,
-				name: '',
-				value: '',
-			},
-			attrFormVisible: false,
-			attrRows: [
-				[
-					{
-						input: true,
-						label: '属性名称',
-						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '属性值',
-						prop: 'value',
-					},
-				],
-			],
-			attrQuery: {
-				params: {
-					pageNo: 1,
-					pageSize: 10,
-				},
-			}, // 属性列表的请求
-			infoQuery: null, // 基本信息的请求
-			attrFormSubmitting: false,
-			attrListLoading: false,
-			syncFileListFlag: null,
-		};
-	},
-	computed: {
-		formRows() {
-			return this.sections[0].rows.map((row) => {
-				return row.map((col) => {
-					if (col.key == 'eq-pics') {
-						// 重置图片的位置
-						return {
-							...col,
-							bind: {
-								...col.bind,
-							},
-							style: {
-								left: 0,
-								right: 'unset',
-							},
-						};
-					}
-					return {
-						...col,
-						bind: {
-							...col.bind,
-							// 详情 模式下，禁用各种输入
-							disabled: this.mode == 'detail',
-						},
-					};
-				});
-			});
-		},
-		tableBtn() {
-			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
-		},
-	},
-	mounted() {
-		for (const section of this.sections) {
-			// 请求具体信息
-			if ('url' in section) {
-				const query = {
-					url: section.url,
-					method: section.method || 'get',
-					params: section.queryParams || null,
-					data: section.data || null,
-				};
-				this.$axios(query).then(({ data }) => {
-					if (section.key == 'base') {
-						this.form = data;
-						// this.form = {
-						// 	code: 'gj',
-						// 	name: '下片机',
-						// 	enName: 'unload',
-						// 	abbr: '',
-						// 	equipmentTypeId: 21084,
-						// 	remark: '备注',
-						// 	id: '1712367395052384257',
-						// 	createTime: 1697095176000,
-						// 	enterTime: 0,
-						// 	productionTime: 0,
-						// 	files: [
-						// 		{
-						// 			fileName: '测试.xlsx',
-						// 			fileUrl: 'https://nimg.ws.126.net/?url=http%3A%2F%2Fdingyue.ws.126.net%2F2022%2F0108%2F0f0c6f30j00r5cle9000sc000hs00gtc.jpg&thumbnail=660x2147483647&quality=80&type=jpg',
-						// 			fileType: 1
-						// 		},
-						// 		{
-						// 			fileName: '测试2.xlsx',
-						// 			fileUrl: 'https://nimg.ws.126.net/?url=http%3A%2F%2Fdingyue.ws.126.net%2F2022%2F0415%2F2cd23619j00racb96000kc000hs00hsc.jpg&thumbnail=660x2147483647&quality=80&type=jpg',
-						// 			fileType: 1
-						// 		},
-						// 		{
-						// 			fileName: '测试3.xlsx',
-						// 			fileUrl: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F1fea91a0-d088-409e-b145-e0e61254b28b%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1700031689&t=2e0fe7d1de7f54adff3007efe133d67c',
-						// 			fileType: 1
-						// 		},
-						// 		{
-						// 			fileName: '测试4.xlsx',
-						// 			fileUrl: 'https://pics5.baidu.com/feed/b7003af33a87e950cdfb4b4546eed044faf2b40d.jpeg?token=1d7484cfe4b014dd201f8c8725cab945',
-						// 			fileType: 2
-						// 		},
-						// 		{
-						// 			fileName: '测试5.xlsx',
-						// 			fileUrl: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2Fe3500876-9c46-4b70-8d37-4799520cdd13%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1700031689&t=4abc1df930e62730e5361a7d3765e0f2',
-						// 			fileType: 2
-						// 		},
-						// 	],
-						// 	tvalue: 0,
-						// 	processingTime: 0,
-						// 	manufacturer: '',
-						// 	spec: '',
-						// 	description: '描述',
-						// };
-						this.showForm = true;
-						this.infoQuery = query;
-					} else if (section.key == 'attrs') {
-						this.attrQuery = query;
-						this.list = data.list;
-						this.total = data.total;
-					}
-				});
-			}
-		}
-	},
-	methods: {
-		handleTableBtnClick({ type, data }) {
-			switch (type) {
-				case 'edit':
-					this.handleEditAttr(data.id);
-					break;
-				case 'delete':
-					this.handleDeleteAttr(data.id);
-					break;
-			}
-		},
-		async handleConfirm() {
-			this.btnLoading = true;
-			this.syncFileListFlag = Math.random();
-
-			this.$nextTick(async () => {
-				const { code, data } = await this.$axios({
-					url: this.sections[0].urlUpdate,
-					method: 'put',
-					data: this.form,
-				});
-				if (code == 0) {
-					this.$modal.msgSuccess('更新成功');
-          this.$emit('refreshDataList');
-				}
-
-				this.btnLoading = false;
-				this.handleCancel();
-			});
-		},
-
-		handleEmitFun(val) {
-			console.log('handleEmitFun', val);
-		},
-
-		init() {
-			this.visible = true;
-		},
-
-		async getAttrList() {
-			this.attrListLoading = true;
-			const res = await this.$axios(this.attrQuery);
-			if (res.code == 0) {
-				this.list = res.data.list;
-				this.total = res.data.total;
-			}
-			this.attrListLoading = false;
-		},
-
-		// 保存表单
-		handleSave() {
-			this.$refs['form'][0].validate(async (valid) => {
-				if (valid) {
-					const isEdit = this.mode == 'edit';
-					await this.$axios({
-						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
-						method: isEdit ? 'put' : 'post',
-						data: this.form,
-					});
-					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
-					this.visible = false;
-					this.$emit('refreshDataList');
-				}
-			});
-		},
-
-		handleCancel() {
-			this.visible = false;
-		},
-
-		// 开启编辑
-		toggleEdit() {
-			this.$emit('update-mode', 'edit');
-		},
-
-		// 新增属性
-		handleAddAttr() {
-			if (!this.dataId) return this.$message.warning('请先创建设备信息');
-			this.attrForm = {
-				id: null,
-				equipmentId: this.dataId,
-				name: '',
-				value: '',
-			};
-			this.attrTitle = '添加设备属性';
-			this.attrFormVisible = true;
-		},
-
-		// 编辑属性
-		async handleEditAttr(attrId) {
-			const res = await this.$axios({
-				url: this.sections[1].urlDetail,
-				method: 'get',
-				params: { id: attrId },
-			});
-			if (res.code == 0) {
-				this.attrForm = res.data;
-				this.attrTitle = '编辑设备属性';
-				this.attrFormVisible = true;
-			}
-		},
-
-		// 删除属性
-		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该属性?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			})
-				.then(async () => {
-					const res = await this.$axios({
-						url: this.sections[1].urlDelete,
-						method: 'delete',
-						params: { id: attrId },
-					});
-					if (res.code == 0) {
-						this.$message({
-							message: '删除成功',
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getAttrList();
-							},
-						});
-					}
-				})
-				.catch(() => {});
-		},
-
-		// 提交属性表
-		submitAttrForm() {
-			this.$refs['attrForm'].validate(async (valid) => {
-				if (!valid) {
-					return;
-				}
-
-				try {
-					const isEdit = this.attrForm.id != null;
-					this.attrFormSubmitting = true;
-					const res = await this.$axios({
-						url: isEdit
-							? this.sections[1].urlUpdate
-							: this.sections[1].urlCreate,
-						method: isEdit ? 'put' : 'post',
-						data: this.attrForm,
-					});
-
-					if (res.code == 0) {
-						this.closeAttrForm();
-						this.$message({
-							message: `${isEdit ? '更新' : '创建'}成功`,
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getAttrList();
-							},
-						});
-					}
-					this.attrFormSubmitting = false;
-				} catch (err) {
-					this.$message({
-						message: err,
-						type: 'error',
-						duration: 1500,
-					});
-					this.attrFormSubmitting = false;
-				}
-			});
-		},
-
-		closeAttrForm() {
-			this.attrFormVisible = false;
-		},
-
-		handleClick(raw) {
-			if (raw.type === 'delete') {
-				this.$confirm(
-					`确定对${
-						raw.data.name
-							? '[名称=' + raw.data.name + ']'
-							: '[序号=' + raw.data._pageIndex + ']'
-					}进行删除操作?`,
-					'提示',
-					{
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					}
-				)
-					.then(() => {
-						deleteProductAttr(raw.data.id).then(({ data }) => {
-							this.$message({
-								message: '操作成功',
-								type: 'success',
-								duration: 1500,
-								onClose: () => {
-									this.getList();
-								},
-							});
-						});
-					})
-					.catch(() => {});
-			} else {
-				this.addNew(raw.data.id);
-			}
-		},
-	},
-};
-</script>
-
-<style scoped>
-.drawer >>> .el-drawer {
-	border-radius: 8px 0 0 8px;
-}
-
-.drawer >>> .el-drawer__header {
-	margin: 0;
-	padding: 32px 32px 24px;
-	border-bottom: 1px solid #dcdfe6;
-	margin-bottom: 0px;
-}
-
-.small-title::before {
-	content: '';
-	display: inline-block;
-	vertical-align: top;
-	width: 4px;
-	height: 22px;
-	border-radius: 1px;
-	margin-right: 8px;
-	background-color: #0b58ff;
-}
-
-.drawer-body {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-}
-
-.drawer-body__content {
-	flex: 1;
-	/* background: #eee; */
-	padding: 20px 30px;
-	overflow-y: auto;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-</style>
diff --git a/src/views/core/base/equipment/components/EquipmentInfoForm.vue b/src/views/core/base/equipment/components/EquipmentInfoForm.vue
deleted file mode 100644
index f2f9ae56..00000000
--- a/src/views/core/base/equipment/components/EquipmentInfoForm.vue
+++ /dev/null
@@ -1,338 +0,0 @@
-<!--
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-08-15 10:32:36
-    description: 弹窗的表单组件
--->
-
-<template>
-	<el-form
-		class="equipment-info-form"
-		ref="form"
-		:model="form"
-		label-width="200px"
-		label-position="top"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item
-					label="设备名称"
-					prop="name"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						v-model="form.name"
-						:disabled="disabled"
-						placeholder="请输入设备名称"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="设备编码" prop="code" :rules="[]">
-					<el-input
-						v-model="form.code"
-						:disabled="disabled"
-						placeholder="请输入设备编码"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="英文名称" prop="enName" :rules="[]">
-					<el-input
-						v-model="form.enName"
-						:disabled="disabled"
-						placeholder="请输入英文名称"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item label="缩写" prop="abbr" :rules="[]">
-					<el-input
-						v-model="form.abbr"
-						:disabled="disabled"
-						placeholder="请输入名称缩写"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="设备类型" prop="equipmentTypeId" :rules="[]">
-					<el-select
-						v-model="form.equipmentTypeId"
-						:disabled="disabled"
-						filterable
-            clearable
-						placeholder="请选择设备类型">
-						<el-option
-							v-for="eqType in eqTypeList"
-							:key="eqType.id"
-							:label="eqType.name"
-							:value="eqType.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="备注" prop="remark" :rules="[]">
-					<el-input
-						v-model="form.remark"
-						:disabled="disabled"
-						placeholder="请输入备注"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item label="生产日期" prop="productionTime" :rules="[]">
-					<el-date-picker
-						v-model="form.productionTime"
-						:disabled="disabled"
-						type="date"
-						placeholder="请选择生产日期"
-						value-format="timestamp"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="进场日期" prop="enterTime" :rules="[]">
-					<el-date-picker
-						v-model="form.enterTime"
-						:disabled="disabled"
-						type="date"
-						placeholder="请选择进场日期"
-						value-format="timestamp"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item
-					label="设备理论生产能效(片/min)"
-					prop="tvalue"
-					:rules="[
-						{ required: true, message: '不能为空', trigger: 'blur' },
-						{
-							type: 'number',
-							message: '请输入正确的数字值',
-							trigger: 'blur',
-							transform: (val) => Number(val),
-						},
-					]">
-					<el-input
-						v-model="form.tvalue"
-						:disabled="disabled"
-						placeholder="请输入"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item
-					label="产品加工时间(s)"
-					prop="processingTime"
-					:rules="[
-						{ required: true, message: '不能为空', trigger: 'blur' },
-						{
-							type: 'number',
-							message: '请输入正确的数字值',
-							trigger: 'blur',
-							transform: (val) => Number(val),
-						},
-					]">
-					<el-input
-						v-model="form.processingTime"
-						:disabled="disabled"
-						placeholder="请输入产品加工时间"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="制造商" prop="manufacturer" :rules="[]">
-					<el-input
-						v-model="form.manufacturer"
-						:disabled="disabled"
-						placeholder="请输入制造商"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="设备规格" prop="spec" :rules="[]">
-					<el-input
-						v-model="form.spec"
-						:disabled="disabled"
-						placeholder="请输入设备规格"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<!-- 功能描述  -->
-			<el-col>
-				<el-form-item label="功能描述" prop="description" :rules="[]">
-					<el-input
-						type="textarea"
-						:disabled="disabled"
-						v-model="form.description"
-						placeholder="请填写功能描述"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<!-- 上传资料  -->
-			<el-col>
-				<el-form-item label="上传资料" prop="assets" :rules="[]">
-					<AssetsUpload v-model="form.assets" :disabled="disabled" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<!-- 上传图片  -->
-			<el-col>
-				<el-form-item label="上传图片" prop="pics" :rules="[]">
-					<AssetsUpload
-						:is-pic-mode="true"
-						v-model="form.pics"
-						:disabled="disabled" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import AssetsUpload from './AssetsUpload.vue';
-
-export default {
-	name: 'EquipmentInfoForm',
-
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-
-	emits: ['update'],
-
-	components: { AssetsUpload },
-
-	props: {
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
-		syncFilelist: {
-			type: Number,
-			default: null,
-			required: false,
-		},
-	},
-
-	data() {
-		return {
-			formLoading: false,
-			form: {
-				name: '',
-				code: '',
-				enName: '',
-				abbr: '',
-				equipmentTypeId: '',
-				remark: '',
-				productionTime: '',
-				enterTime: '',
-				tvalue: '',
-				processingTime: '',
-				manufacturer: '',
-				spec: '',
-				description: '',
-				assets: [],
-				pics: [],
-			},
-			eqTypeList: [],
-			dataLoaded: false,
-		};
-	},
-
-	watch: {
-		dataForm: {
-			handler(val) {
-				// debugger;
-				this.form = JSON.parse(JSON.stringify(val));
-				this.form.assets =
-					this.form.files?.filter((item) => item.fileType == '2') || [];
-				this.form.pics =
-					this.form.files?.filter((item) => item.fileType == '1') || [];
-				delete this.form.files;
-			},
-			immediate: true,
-			deep: true,
-		},
-		syncFilelist: {
-			handler(val) {
-				if (val != null) {
-					this.updateForm();
-				}
-			},
-			immediate: true,
-		},
-	},
-
-	mounted() {
-		this.getEqTypeList();
-	},
-
-	methods: {
-		updateForm() {
-			console.log('update form ==> ');
-			this.form.files = [...this.form.assets, ...this.form.pics];
-			delete this.form.assets;
-			delete this.form.pics;
-			this.$emit('update', this.form);
-		},
-
-		async getEqTypeList() {
-			this.formLoading = true;
-			const { code, data } = await this.$axios(
-				'/base/equipment-type/page?pageNo=1&pageSize=100'
-			);
-			// debugger;
-			if (code == 0) {
-				this.eqTypeList = data.list;
-			}
-			this.formLoading = false;
-		},
-
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.form.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.form.resetFields(args);
-		},
-		// getCode
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
-		},
-		// 上传成功的特殊处理
-		beforeUpload() {},
-		// 上传前的验证规则可通过 bind 属性传入
-		handleUploadSuccess(response, file, fileList) {
-			console.log(
-				'[dialogForm:handleUploadSuccess]',
-				response,
-				file,
-				fileList,
-				this.form
-			);
-			// 保存原始文件名
-			if ('fileNames' in this.form) this.form.fileNames.push(file.name+Date.now());
-			// 保存完整地址
-			if ('fileUrls' in this.form) this.form.fileUrls.push(response.data);
-			this.$modal.msgSuccess('上传成功');
-		},
-
-		getFileName(fileUrl) {
-			return fileUrl.split('/').pop();
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-</style>
diff --git a/src/views/core/base/equipment/index.vue b/src/views/core/base/equipment/index.vue
deleted file mode 100644
index 2c029f92..00000000
--- a/src/views/core/base/equipment/index.vue
+++ /dev/null
@@ -1,647 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			@close="cancel"
-			@cancel="cancel"
-			width="60%"
-			@confirm="submitForm">
-			<DialogForm1
-				v-if="open"
-				key="index-dialog-form"
-				ref="form"
-				label-position="top"
-				size="small"
-				v-model="form"
-				:rows="computedRows"
-				:has-file="true" />
-		</base-dialog>
-
-		<!-- 设备 详情 - 编辑 -->
-		<EquipmentDrawer
-			v-if="editVisible"
-			ref="drawer"
-			:mode="editMode"
-			@update-mode="editMode = $event"
-			:data-id="form.id"
-			:sections="[
-				{
-					name: '基本信息',
-					key: 'base',
-					rows: computedRows,
-					url: '/base/equipment/get',
-					urlUpdate: '/base/equipment/update',
-					urlCreate: '/base/equipment/create',
-					queryParams: { id: form.id },
-				},
-				{
-					name: '属性列表',
-					key: 'attrs',
-					props: drawerListProps,
-					url: '/base/equipment-attr/page',
-					urlCreate: '/base/equipment-attr/create',
-					urlUpdate: '/base/equipment-attr/update',
-					urlDelete: '/base/equipment-attr/delete',
-					urlDetail: '/base/equipment-attr/get',
-					queryParams: {
-						equipmentId: form.id,
-						pageNo: 1,
-						pageSize: 20,
-					},
-					tableBtn: [
-						this.$auth.hasPermi('base:equipment-attr:update')
-							? {
-									type: 'edit',
-									btnName: '修改',
-							  }
-							: undefined,
-						this.$auth.hasPermi('base:equipment-attr:delete')
-							? {
-									type: 'delete',
-									btnName: '删除',
-							  }
-							: undefined,
-					].filter((v) => v),
-					allowAdd: true,
-				},
-			]"
-			@refreshDataList="getList"
-			@cancel="cancelEdit"
-			@destroy="cancelEdit" />
-	</div>
-</template>
-
-<script>
-import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import EquipmentDrawer from './components/EquipmentDrawer';
-import DialogForm1 from './components/DialogForm';
-
-import {
-	createEquipment,
-	updateEquipment,
-	deleteEquipment,
-	getEquipment,
-	getEquipmentPage,
-	exportEquipmentExcel,
-} from '@/api/base/equipment';
-import Editor from '@/components/Editor';
-import AssetsUpload from './components/AssetsUpload.vue';
-
-export default {
-	name: 'Equipment',
-	components: {
-		Editor,
-		EquipmentDrawer,
-		DialogForm1,
-	},
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			searchBarKeys: ['name', 'code'],
-			tableBtn: [
-				this.$auth.hasPermi(`base:equipment:update`)
-					? {
-							type: 'detail',
-							btnName: '详情',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{
-					width: 200,
-					showOverflowtooltip: true,
-					prop: 'name',
-					label: '设备名称',
-				},
-				{ width: 256, prop: 'code', label: '设备编码' },
-				{ prop: 'equipmentType', label: '设备类型' },
-				{ prop: 'enName', label: '英文名称' },
-				{ prop: 'abbr', label: '缩写' },
-				// {
-				// 	action: 'show-detail',
-				// 	label: '详情',
-				// 	subcomponent: {
-				// 		props: ['injectData'],
-				// 		render: function (h) {
-				// 			const _this = this;
-				// 			return h(
-				// 				'el-button',
-				// 				{
-				// 					props: { type: 'text', size: 'mini' },
-				// 					on: {
-				// 						click: function () {
-				// 							console.log('inejctdata', _this.injectData);
-				// 							_this.$emit('emitData', {
-				// 								action: _this.injectData.action,
-				// 								value: _this.injectData.id,
-				// 							});
-				// 						},
-				// 					},
-				// 				},
-				// 				'查看详情'
-				// 			);
-				// 		},
-				// 	},
-				// },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '名称',
-					placeholder: '请输入设备名称',
-					param: 'name',
-				},
-				{
-					type: 'input',
-					label: '编码',
-					placeholder: '请输入设备编码',
-					param: 'code',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment:export') ? 'button' : '',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment:create') ? 'button' : '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '设备名称',
-						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
-						// }
-					},
-					{
-						input: true,
-						label: '设备编码',
-						prop: 'code',
-						url: '/base/equipment/getCode',
-					},
-					{
-						input: true,
-						label: '英文名称',
-						prop: 'enName',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: true, // some condition, like detail mode...
-						// }
-					},
-				],
-				[
-					{
-						input: true,
-						label: '缩写',
-						prop: 'abbr',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: true, // some condition, like detail mode...
-						// }
-					},
-
-					{
-						select: true,
-						label: '设备类型',
-						prop: 'equipmentTypeId',
-						url: '/base/equipment-type/page?pageNo=1&pageSize=100',
-						bind: {
-							filterable: true,
-							clearable: true,
-						},
-					},
-					// {
-					// 	select: true,
-					// 	label: '设备分组',
-					// 	prop: 'groupId',
-					// 	url: '/base/equipment-group/page?pageNo=1&pageSize=100',
-					// },
-					{ input: true, label: '备注', prop: 'remark' },
-				],
-				[
-					{
-						datetime: true,
-						label: '生产日期',
-						prop: 'productionTime',
-					},
-					{
-						datetime: true,
-						label: '进厂日期',
-						prop: 'enterTime',
-					},
-					{
-						input: true,
-						prop: 'tvalue',
-						label: '设备理论生产能效(片/min)',
-						rules: [
-							{ required: true, message: '不能为空', trigger: 'blur' },
-							{
-								type: 'number',
-								message: '请输入正确的数字值',
-								trigger: 'blur',
-								transform: (val) => Number(val),
-							},
-						],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '产品加工时间（s）',
-						prop: 'processingTime',
-						rules: [
-							{ required: true, message: '不能为空', trigger: 'blur' },
-							{
-								type: 'number',
-								message: '请输入正确的数字值',
-								trigger: 'blur',
-								transform: (val) => Number(val),
-							},
-						],
-					},
-
-					{
-						input: true,
-						label: '制造商',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						prop: 'manufacturer',
-					},
-					{
-						input: true,
-						label: '设备规格',
-						prop: 'spec',
-					},
-				],
-				[
-					{
-						textarea: true,
-						label: '功能描述',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						prop: 'description',
-					},
-				],
-				// [
-				// 	{
-				// 		assetUpload: true,
-				// 		label: '上传资料',
-				// 		fieldName: 'assets',
-				// 		subcomponent: AssetsUpload
-				// 	},
-				// ],
-				// [
-				// 	{
-				// 		assetUpload: true,
-				// 		label: '上传图片',
-				// 		fieldName: 'images',
-				// 		subcomponent: AssetsUpload
-				// 	},
-				// ],
-				// [
-				// 	{
-				// 		upload: true,
-				// 		label: '上传资料',
-				// 		prop: 'uploadFiles',
-				// 		url: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload', // 请求地址
-				// 		uploadFnName: 'assetsUpload', // 上传方法名
-				// 		bind: {
-				// 			headers: { Authorization: 'Bearer ' + getAccessToken() },
-				// 			'show-file-list': false,
-				// 		},
-				// 	},
-				// 	{
-				// 		diy: true,
-				// 		key: 'eq-assets',
-				// 		label: '设备资料',
-				// 		prop: 'fileNames',
-				// 		subcomponent: EquipmentAssets,
-				// 	},
-				// ],
-				// [
-				// {
-				// 		upload: true,
-				// 		label: '上传图片',
-				// 		prop: 'uploadImages',
-				// 		url: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload', // 请求地址
-				// 		uploadFnName: 'imagesUpload', // 上传方法名
-				// 		bind: {
-				// 			headers: { Authorization: 'Bearer ' + getAccessToken() },
-				// 			'show-file-list': false,
-				// 		},
-				// 	},
-				// 	{
-				// 		diy: true,
-				// 		key: 'eq-pics',
-				// 		label: '设备图片',
-				// 		prop: 'fileUrls',
-				// 		subcomponent: EquipmentPics,
-				// 		pictures: async () => {
-				// 			// some async request
-				// 			return [];
-				// 		},
-				// 	},
-				// ],
-				// [
-				// 	{
-				// 		diy: true,
-				// 		key: 'eq-pics',
-				// 		label: '设备图片',
-				// 		prop: 'fileUrls',
-				// 		subcomponent: EquipmentPics,
-				// 		pictures: async () => {
-				// 			// some async request
-				// 			return [];
-				// 		},
-				// 	},
-				// ],
-			],
-			editVisible: false,
-			editMode: 'edit', // 'edit', 'detail'
-			// drawer 里的设备属性列表配置项
-			drawerListProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ prop: 'name', label: '属性名称' },
-				{ prop: 'value', label: '属性值' },
-			],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				code: '',
-				name: '',
-			},
-			// 表单参数
-			form: {
-				id: null,
-			},
-			showUploadComponents: false, // 是否显示上传组件
-		};
-	},
-	created() {
-		this.getList();
-	},
-	computed: {
-		computedRows() {
-			return this.showUploadComponents
-				? [
-						...this.rows,
-						[
-							{
-								assetUpload: true,
-								key: 'eq-assets', // 用于区分不同的上传组件
-								label: '上传资料',
-								fieldName: 'assets',
-								subcomponent: AssetsUpload,
-								prop: 'uploadedAssets',
-								default: [],
-								bind: {
-									'is-pic-mode': false,
-								},
-							},
-						],
-						[
-							{
-								assetUpload: true,
-								key: 'eq-pics', // 用于区分不同的上传组件
-								label: '上传图片',
-								fieldName: 'images',
-								subcomponent: AssetsUpload,
-								// prop: '',
-								// default: [],
-								bind: {
-									'is-pic-mode': true,
-								},
-							},
-						],
-				  ]
-				: this.rows;
-		},
-	},
-	methods: {
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		cancelEdit() {
-			this.showUploadComponents = false;
-			this.editVisible = false;
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				code: undefined,
-				name: undefined,
-				enName: undefined,
-				abbr: undefined,
-				enterTime: undefined,
-				productionTime: undefined,
-				equipmentTypeId: undefined,
-				groupId: undefined,
-				tvalue: undefined,
-				processingTime: undefined,
-				manufacturer: undefined,
-				spec: undefined,
-				description: undefined,
-				remark: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.showUploadComponents = false;
-			this.title = '添加设备';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			this.showUploadComponents = true;
-			const id = row.id;
-			getEquipment(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipment(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				this.form.files = [];
-				createEquipment(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除设备名称为"' + row.name + '"的数据项?')
-				.then(function () {
-					return deleteEquipment(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-		// 查看详情
-		viewDetail(id) {
-			this.reset();
-			this.editMode = 'detail';
-			this.showUploadComponents = true;
-			this.form.id = id;
-			this.editVisible = true;
-			this.$nextTick(() => {
-				this.$refs['drawer'].init();
-			});
-		},
-		// overwrite basicPageMixin 里的 处理表格按钮 方法
-		handleTableBtnClick({ data, type }) {
-			switch (type) {
-				case 'edit':
-					this.reset();
-					this.editMode = 'edit';
-					this.showUploadComponents = true;
-					this.form.id = data.id;
-					this.editVisible = true;
-					this.$nextTick(() => {
-						this.$refs['drawer'].init();
-					});
-					break;
-				case 'delete':
-					this.handleDelete(data);
-					break;
-				case 'detail':
-					const { id } = data;
-					this.viewDetail(id);
-					break;
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/core/base/equipmentType/index.vue b/src/views/core/base/equipmentType/index.vue
deleted file mode 100644
index 627ded47..00000000
--- a/src/views/core/base/equipmentType/index.vue
+++ /dev/null
@@ -1,304 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:rows="rows"
-				:has-file="true" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-
-import {
-	createEquipmentType,
-	updateEquipmentType,
-	deleteEquipmentType,
-	getEquipmentType,
-	getEquipmentTypePage,
-	exportEquipmentTypeExcel,
-} from '@/api/base/equipmentType';
-
-// import { getAccessToken } from '@/utils/auth';
-
-export default {
-	name: 'EquipmentType',
-	components: {},
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			searchBarKeys: ['name'],
-			tableBtn: [
-				this.$auth.hasPermi('base:equipment-type:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-type:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ prop: 'name', label: '设备类型名称' },
-				{ prop: 'code', label: '检测类型编码' },
-				{ prop: 'remark', label: '备注' },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '设备类型',
-					placeholder: '请输入设备类型名称',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment-type:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:quality-inspection-type:export')
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '设备类型名称',
-						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: true, // some condition, like detail mode...
-						// }
-					},
-					{
-						input: true,
-						label: '设备类型编码',
-						prop: 'code',
-						url: '/base/equipment-type/getCode',
-					},
-				],
-				[
-					{
-						select: true,
-						label: '父类',
-						prop: 'parentId',
-						url: '/base/equipment-type/page?pageNo=1&pageSize=100',
-						bind: {
-							clearable: true, // some condition, like detail mode...
-						}
-					},
-					{},
-				],
-				[
-					{
-						upload: true,
-						label: '上传资料',
-						prop: 'files',
-					},
-				],
-				[{ input: true, label: '备注', prop: 'remark' }],
-			],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				name: '',
-			},
-			// 表单参数
-			form: {},
-		};
-	},
-	watch: {
-		// form: {
-		// 	handler: function (val, oldVal) {
-		// 		console.log('[watch:form]', val, oldVal);
-		// 	},
-		// 	deep: true,
-		// },
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentTypePage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				code: undefined,
-				name: undefined,
-				parentId: undefined,
-				remark: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备类型';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentType(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备类型';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentType(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentType(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除设备类型"' + row.name + '"?')
-				.then(function () {
-					return deleteEquipmentType(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备类型数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentTypeExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备类型.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/core/base/factory/add-or-updata.vue b/src/views/core/base/factory/add-or-updata.vue
deleted file mode 100644
index ef05b5f0..00000000
--- a/src/views/core/base/factory/add-or-updata.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
- * @LastEditTime: 2023-10-16 11:16:48
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="工厂编码" prop="code">
-					<el-input
-						v-model="dataForm.code"
-						clearable
-						placeholder="请输入工厂编码" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="工厂名称" prop="name">
-					<el-input
-						v-model="dataForm.name"
-						clearable
-						placeholder="请输入工厂名称" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="地址" prop="address">
-					<el-input v-model="dataForm.address" clearable placeholder="请输入地址" />
-				</el-form-item>
-			</el-col>
-		<!-- <el-form-item label="启用状态" prop="enabled">
-			<el-select
-				v-model="dataForm.enabled"
-				placeholder="请选择启用状态">
-				<el-option
-					v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-					:key="dict.value"
-					:label="dict.label"
-					:value="dict.value" />
-			</el-select>
-		</el-form-item> -->
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '../../mixins/basic-add';
-import { createFactory, updateFactory, getFactory, getCode } from "@/api/core/base/factory";
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-			  isGetCode: true,
-        codeURL: getCode,
-				createURL: createFactory,
-				updateURL: updateFactory,
-				infoURL: getFactory,
-			},
-			dataForm: {
-        id: undefined,
-        code: undefined,
-        name: undefined,
-        address: undefined,
-        remark: undefined,
-			},
-			dataRule: {
-        code: [{ required: true, message: "工厂编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "工厂名称不能为空", trigger: "blur" }],
-      }
-		};
-	},
-	methods: {
-	},
-};
-</script>
diff --git a/src/views/core/base/factory/index.vue b/src/views/core/base/factory/index.vue
deleted file mode 100644
index d03a3b4e..00000000
--- a/src/views/core/base/factory/index.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import {
-	deleteFactory,
-	getFactoryPage,
-	exportFactoryExcel,
-} from '@/api/core/base/factory';
-
-const tableProps = [
-	{
-		prop: 'code',
-		label: '工厂编码'
-	},
-	{
-		prop: 'name',
-		label: '工厂名称'
-	},
-	{
-		prop: 'address',
-		label: '地址'
-	},
-	{
-		prop: 'remark',
-		label: '备注'
-	},
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getFactoryPage,
-				deleteURL: deleteFactory,
-				exportURL: exportFactoryExcel,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi(`base:factory:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-          this.$auth.hasPermi(`base:factory:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v)=>v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
-					label: '工厂编码',
-					placeholder: '工厂编码',
-					param: 'code',
-				},
-				{
-					type: 'input',
-					label: '工厂名称',
-					placeholder: '工厂名称',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:factory:create') ? 'button' : '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name;
-					this.listQuery.code = val.code;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/core/base/lineBindProcess/index.vue b/src/views/core/base/lineBindProcess/index.vue
deleted file mode 100644
index 34278a24..00000000
--- a/src/views/core/base/lineBindProcess/index.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-02 15:12:42
- * @LastEditors: zwq
- * @LastEditTime: 2024-11-29 13:25:51
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="[{ label: '产线在制工艺', type: 'title' }]"
-			ref="searchBarForm" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			@emitFun="inputChange" />
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
-</template>
-
-<script>
-import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import { getLineBindProcessPage } from '@/api/core/base/lineBindProcess';
-import selectProduct from './selectProduct';
-
-const tableProps = [
-	{
-		prop: 'lineName',
-		label: '产线'
-	},
-	{
-		prop: 'processDictName',
-		label: '在制工艺',
-		list: [],
-		subcomponent: selectProduct,
-	},
-	{
-		prop: 'recordTime',
-		label: '开始时间',
-		filter: parseTime,
-	},
-];
-
-export default {
-	mixins: [basicPage, selectProduct],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getLineBindProcessPage,
-			},
-			tableProps,
-			tableData: [],
-			// formConfig: [
-			// 	{
-			// 		type: 'button',
-			// 		btnName: '同步',
-			// 		name: 'search',
-			// 		color: 'primary',
-			// 	},
-			// ],
-		};
-	},
-	components: {},
-	created() {
-	},
-	methods: {
-    // 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data;
-        this.dataListLoading = false;
-      });
-    },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		inputChange() {
-			this.getDataList();
-		},
-	},
-};
-</script>
diff --git a/src/views/core/base/lineBindProcess/selectProduct.vue b/src/views/core/base/lineBindProcess/selectProduct.vue
deleted file mode 100644
index 2c16d10d..00000000
--- a/src/views/core/base/lineBindProcess/selectProduct.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-03 14:09:18
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-24 15:21:07
- * @Description:
--->
-<template>
-	<div class="tableInner">
-		<el-popover
-			placement="top"
-			title="切换在制工艺"
-			width="160"
-			v-model="visible">
-			<el-select v-model="list.processDict" style="margin: 5px" filterable>
-				<el-option
-					v-for="opt in getDictDatas(DICT_TYPE.PROCESS_TYPE)"
-					:key="opt.value"
-					:label="opt.label"
-					:value="opt.value"></el-option>
-			</el-select>
-			<div style="text-align: right; margin: 0">
-				<el-button size="mini" type="text" @click="visible = false">
-					取消
-				</el-button>
-				<el-button type="primary" size="mini" @click="changeInput">
-					确定
-				</el-button>
-			</div>
-			<el-button type="text" slot="reference">
-				<svg-icon icon-class="changelogo" />
-			</el-button>
-		</el-popover>
-		<el-input
-			readonly
-			v-model="list.processDictName"
-			style="width: 50%; margin-left: 5px"></el-input>
-	</div>
-</template>
-<script>
-import { switchLineBindProcess } from '@/api/core/base/lineBindProcess';
-
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			list: this.injectData,
-			visible: false,
-		};
-	},
-	mounted() {
-  },
-	methods: {
-		changeInput() {
-      const processDictName = this.getDictDatas(this.DICT_TYPE.PROCESS_TYPE).find(item=>
-        item.value == this.list.processDict
-    )
-			const data = {
-				id: this.list.id,
-				processDict: this.list.processDict,
-				processDictName: processDictName.label,
-			};
-			switchLineBindProcess(data).then((response) => {
-				this.$modal.msgSuccess('修改成功');
-				this.visible = false;
-				this.$emit('emitData');
-			});
-		},
-	},
-};
-</script>
-<style scoped>
-.tableInner .el-input__inner {
-	border: none;
-	padding: 0;
-	height: 33px;
-}
-</style>
diff --git a/src/views/core/base/lineBindProcessLog/index.vue b/src/views/core/base/lineBindProcessLog/index.vue
deleted file mode 100644
index b4465be7..00000000
--- a/src/views/core/base/lineBindProcessLog/index.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData" />
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
-</template>
-
-<script>
-import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import { getLineBindProcessLogPage } from '@/api/core/base/lineBindProcess';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
-import { getPdList } from '@/api/core/monitoring/auto';
-import { getFactoryPage } from '@/api/core/base/factory';
-
-const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂'
-	},
-	{
-		prop: 'lineName',
-		label: '产线',
-	},
-	{
-		prop: 'processDictName',
-		label: '在制工艺',
-	},
-	{
-		prop: 'recordTime',
-		label: '开始时间',
-		filter: parseTime,
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getLineBindProcessLogPage,
-			},
-			tableProps,
-			tableData: [],
-			optionArrUrl: [getFactoryPage,getProductionLinePage],
-			listQuery: {
-				productionLineId: [],
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'productionLineId',
-					multiple: true,
-				},
-				{
-					type: 'select',
-					label: '在制工艺',
-					selectOptions: this.getDictDatas(this.DICT_TYPE.PROCESS_TYPE),
-					labelField: 'label',
-					valueField: 'value',
-					param: 'processDict',
-					defaultSelect: '',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'startTime',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'button',
-					btnName: '重置',
-					name: 'reset',
-				},
-			],
-		};
-	},
-	components: {},
-	created() {
-		this.getArr();
-	},
-	methods: {
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.productionLineId = [];
-			this.$refs.searchBarForm.formInline.productionLineId = undefined;
-			getPdList(value).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
-		getArr() {
-			const params = {
-				page: 1,
-				limit: 500,
-			};
-			this.optionArrUrl.forEach((item, index) => {
-				item(params).then((response) => {
-					this.formConfig[index].selectOptions = response.data.list;
-				});
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.productionLineId = val.productionLineId || [];
-					this.listQuery.processDict = val.processDict;
-					this.listQuery.recordTime = val.startTime
-						? [val.startTime[0], val.startTime[1].substr(0, 10) + ' 23:59:59']
-						: null;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/core/base/lineBindProduct/changeStatus.vue b/src/views/core/base/lineBindProduct/changeStatus.vue
deleted file mode 100644
index 09387a1e..00000000
--- a/src/views/core/base/lineBindProduct/changeStatus.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2023-01-31 14:12:10
- * @LastEditTime: 2024-11-29 10:49:37
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<span>
-		<el-switch
-			@change="changeStatus"
-			v-model="injectData.allowAuto"
-			:active-value="true"
-			:inactive-value="false"></el-switch>
-	</span>
-</template>
-
-<script>
-import { switchAutoProduct } from '@/api/core/base/lineBindProduct';
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			urlOptions: {
-				submitURL: switchAutoProduct,
-			},
-		};
-	},
-	methods: {
-		// 子级
-		changeStatus() {
-			// 路由参数
-			let obj = {
-				allowAuto: this.injectData.allowAuto,
-				id: this.injectData.id,
-			};
-			this.urlOptions.submitURL(obj).then((res) => {
-        console.log(res)
-				if (res.code !== 0) {
-					return this.$message.error(res.msg);
-				}
-				this.$modal.msgSuccess('切换状态成功');
-				this.$emit('emitData');
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/core/base/lineBindProduct/index.vue b/src/views/core/base/lineBindProduct/index.vue
deleted file mode 100644
index a5dc0d3a..00000000
--- a/src/views/core/base/lineBindProduct/index.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-02 15:12:42
- * @LastEditors: zwq
- * @LastEditTime: 2024-11-29 10:47:46
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="[{ label: '产线在制产品', type: 'title' }]"
-			ref="searchBarForm" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			@emitFun="inputChange" />
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
-</template>
-
-<script>
-import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import { getLineBindProductPage } from '@/api/core/base/lineBindProduct';
-import selectProduct from './selectProduct';
-import changeStatus from './changeStatus';
-import { getProductPage } from '@/api/core/base/product';
-
-const tableProps = [
-	{
-		prop: 'lineName',
-		label: '产线'
-	},
-	{
-		prop: 'productName',
-		label: '在制产品',
-		list: [],
-		subcomponent: selectProduct,
-	},
-	{
-		prop: 'allowAuto',
-		label: '允许自动',
-		subcomponent: changeStatus,
-	},
-	{
-		prop: 'recordTime',
-		label: '开始时间',
-		filter: parseTime,
-	},
-];
-
-export default {
-	mixins: [basicPage, selectProduct],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getLineBindProductPage,
-			},
-			tableProps,
-			tableData: [],
-			// formConfig: [
-			// 	{
-			// 		type: 'button',
-			// 		btnName: '同步',
-			// 		name: 'search',
-			// 		color: 'primary',
-			// 	},
-			// ],
-		};
-	},
-	components: {},
-	created() {
-		const params = {
-			pageSize: 100,
-			pageNo: 1,
-		};
-		getProductPage(params).then((response) => {
-			this.tableProps[1].list = response.data.list;
-			console.log('打印', this.tableProps[1].list)
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		inputChange() {
-			this.getDataList();
-		},
-	},
-};
-</script>
diff --git a/src/views/core/base/lineBindProduct/selectProduct.vue b/src/views/core/base/lineBindProduct/selectProduct.vue
deleted file mode 100644
index d0442ac2..00000000
--- a/src/views/core/base/lineBindProduct/selectProduct.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-03 14:09:18
- * @LastEditors: DY
- * @LastEditTime: 2023-10-13 16:47:25
- * @Description:
--->
-<template>
-	<div class="tableInner">
-		<el-popover
-    placement="top"
-    title="切换在制产品"
-    width="160"
-    v-model="visible">
-			<el-select v-model="list.string" style="margin: 5px;" filterable>
-				<el-option
-					v-for="item in injectData.list"
-					:key="item.id"
-					:label="item.name"
-					:value="item.id + '+' + item.name"></el-option>
-			</el-select>
-			<div style="text-align: right; margin: 0">
-				<el-button size="mini" type="text" @click="visible = false">
-					取消
-				</el-button>
-				<el-button type="primary" size="mini" @click="changeInput">
-					确定
-				</el-button>
-			</div>
-			<el-button type="text" slot="reference">
-				<svg-icon icon-class="changelogo"/>
-			</el-button>
-		</el-popover>
-		<el-input readonly v-model="list.productName" style="width: 50%;margin-left: 5px" ></el-input>
-	</div>
-</template>
-<script>
-import { switchLineBindProduct } from '@/api/core/base/lineBindProduct';
-
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			list: this.injectData,
-			visible: false,
-		};
-	},
-	mounted() {
-		console.log('hello', this.list)
-	},
-	methods: {
-		changeInput() {
-			const data = {
-				id: this.list.id,
-				productId: this.list.string.split('+')[0],
-				productName: this.list.string.split('+')[1],
-			};
-			switchLineBindProduct(data).then((response) => {
-				this.$modal.msgSuccess('修改成功');
-				this.visible = false;
-				this.list.productName = this.list.string.split('+')[1]
-				this.$emit('emitData');
-			});
-		},
-	},
-};
-</script>
-<style scoped>
-.tableInner .el-input__inner {
-	border: none;
-	padding: 0;
-	height: 33px;
-}
-</style>
diff --git a/src/views/core/base/lineBindProductLog/index.vue b/src/views/core/base/lineBindProductLog/index.vue
deleted file mode 100644
index e92393c4..00000000
--- a/src/views/core/base/lineBindProductLog/index.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData" />
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
-</template>
-
-<script>
-import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import { getLineBindProductLogPage } from '@/api/core/base/lineBindProductLog';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
-import { getProductPage } from '@/api/core/base/product';
-import { getFactoryPage } from '@/api/core/base/factory';
-import { getPdList } from '@/api/core/monitoring/auto';
-
-const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂'
-	},
-	{
-		prop: 'productionLineName',
-		label: '产线',
-	},
-	{
-		prop: 'productName',
-		label: '在制产品',
-	},
-	{
-		prop: 'startTime',
-		label: '开始时间',
-		filter: parseTime,
-	},
-	{
-		prop: 'endTime',
-		label: '结束时间',
-		filter: parseTime,
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getLineBindProductLogPage,
-			},
-			tableProps,
-			tableData: [],
-			listQuery: {
-				productionLineId: [],
-			},
-			optionArrUrl: [getFactoryPage,getProductionLinePage, getProductPage],
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'productionLineId',
-					multiple: true,
-				},
-				{
-					type: 'select',
-					label: '在制产品',
-					selectOptions: [],
-					param: 'productId',
-					defaultSelect: '',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'startTime',
-					valueFormat: 'timestamp',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'button',
-					btnName: '重置',
-					name: 'reset',
-				},
-			],
-		};
-	},
-	components: {},
-	created() {
-		this.getArr();
-	},
-	methods: {
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.productionLineId = [];
-			this.$refs.searchBarForm.formInline.productionLineId = undefined;
-			getPdList(value).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
-		getArr() {
-			const params = {
-				page: 1,
-				limit: 500,
-			};
-			this.optionArrUrl.forEach((item, index) => {
-				item(params).then((response) => {
-					this.formConfig[index].selectOptions = response.data.list;
-				});
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.productionLineId = val.productionLineId || [];
-					this.listQuery.productId = val.productId;
-					this.listQuery.startTime = val.startTime ? val.startTime : null;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/core/base/product/SmallTitle.vue b/src/views/core/base/product/SmallTitle.vue
deleted file mode 100644
index 93b4a18f..00000000
--- a/src/views/core/base/product/SmallTitle.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 15:27:31
- * @LastEditors: zwq
- * @LastEditTime: 2023-08-01 16:25:54
- * @Description:
--->
-<template>
-	<div :class="[className, { 'p-0': noPadding }]">
-		<slot />
-	</div>
-</template>
-
-<script>
-export default {
-	props: {
-		size: {
-			// 取值范围:  xl lg md sm
-			type: String,
-			default: 'de',
-			validator: function (val) {
-				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
-			},
-		},
-		noPadding: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	computed: {
-		className: function () {
-			return `${this.size}-title`;
-		},
-	},
-};
-</script>
-
-<style lang="scss" scoped>
-$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
-$mgr: 8px;
-@each $size, $height in $pxls {
-	.#{$size}-title {
-		font-size: 18px;
-		line-height: $height;
-		color: #000;
-		font-weight: 500;
-		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
-
-		&::before {
-			content: '';
-			display: inline-block;
-			vertical-align: top;
-			width: 4px;
-			height: $height + 2px;
-			border-radius: 1px;
-			margin-right: $mgr;
-			background-color: #0b58ff;
-		}
-	}
-}
-
-.p-0 {
-	padding: 0;
-}
-</style>
diff --git a/src/views/core/base/product/add-or-updata.vue b/src/views/core/base/product/add-or-updata.vue
deleted file mode 100644
index 8376d694..00000000
--- a/src/views/core/base/product/add-or-updata.vue
+++ /dev/null
@@ -1,447 +0,0 @@
-<template>
-  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="false" class="drawer" size="60%">
-    <small-title slot="title" :no-padding="true">
-      {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
-    </small-title>
-
-    <div class="content">
-      <div class="visual-part">
-        <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px" label-position="top"
-          @keyup.enter.native="dataFormSubmit">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="产品编码" prop="code">
-                <el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入产品编码" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="产品名称" prop="name">
-                <el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入产品名称" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="产品类型" prop="typeDictValue">
-                <el-select v-model="dataForm.typeDictValue" style="width: 100%" :disabled="isdetail"
-                  placeholder="请选择产品类型">
-                  <el-option v-for="dict in getDictDatas(DICT_TYPE.PRODUCT_TYPE)" :key="dict.value" :label="dict.label"
-                    :value="dict.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="单位" prop="unitDictValue">
-                <el-select v-model="dataForm.unitDictValue" style="width: 100%" :disabled="isdetail"
-                  placeholder="请选择单位">
-                  <el-option v-for="dict in getDictDatas(DICT_TYPE.UNIT_DICT)" :key="dict.value" :label="dict.label"
-                    :value="dict.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="原片规格" prop="originalSpecifications">
-                <el-input :disabled="isdetail" v-model="dataForm.originalSpecifications" placeholder="请输入原片规格" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="原片单位平方数" prop="originalArea">
-                <el-input :disabled="isdetail" v-model="dataForm.originalArea" placeholder="请输入原片单位平方数" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="深加工规格" prop="specifications">
-                <el-input :disabled="isdetail" v-model="dataForm.specifications" placeholder="请输入深加工规格" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="深加工单位平方数" prop="area">
-                <el-input :disabled="isdetail" v-model="dataForm.area" placeholder="请输入深加工单位平方数" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="完成单位产品用时" prop="processTime">
-                <el-input :disabled="isdetail" v-model="dataForm.processTime" placeholder="请输入完成单位产品用时" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="	加工属性" prop="processType">
-                <el-select v-model="dataForm.processType" clearable style="width: 100%" :disabled="isdetail"
-                  placeholder="请选择加工属性">
-                  <el-option v-for="dict in processTypeList" :key="dict.id" :label="dict.label"
-                    :value="dict.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-
-        <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
-          产品属性列表
-        </small-title>
-
-        <div class="attr-list">
-          <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
-            :add-button-show="isdetail ? null : '添加属性'" @emitButtonClick="addNew()" :table-data="productAttributeList">
-            <method-btn v-if="!isdetail" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-              @clickBtn="handleClick" />
-          </base-table>
-          <pagination v-show="listQuery.total > 0" :total="listQuery.total" :page.sync="listQuery.pageNo"
-            :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
-        </div>
-      </div>
-    </div>
-
-    <!-- <div style="position: absolute; bottom: 24px; right: 24px">
-			<el-button style="margin-right: 10px" @click="goback()">返回</el-button>
-			<el-button v-if="isdetail" type="primary" @click="goEdit()">
-				编辑
-			</el-button>
-			<span v-if="!isdetail">
-				<el-button type="primary" @click="dataFormSubmit()">保存</el-button>
-				<el-button
-					v-if="dataForm.id && !isdetail"
-					type="primary"
-					@click="addNew()">
-					添加属性
-				</el-button>
-			</span>
-		</div> -->
-
-    <div class="drawer-body__footer">
-      <el-button style="" @click="goback()">取消</el-button>
-      <el-button v-if="isdetail" type="primary" @click="goEdit()">
-        编辑
-      </el-button>
-      <el-button v-else type="primary" @click="dataFormSubmit()">
-        确定
-      </el-button>
-    </div>
-
-    <product-attr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :product-id="dataForm.id"
-      @refreshDataList="getList" />
-  </el-drawer>
-</template>
-
-<script>
-import {
-	deleteProductAttr,
-	getProductAttrPage,
-} from '@/api/core/base/productAttr';
-
-import {
-	createProduct,
-	updateProduct,
-	getProduct,
-	getCode,
-} from '@/api/core/base/product';
-import productAttrAdd from './attr-add';
-import { parseTime } from '../../mixins/code-filter';
-import SmallTitle from './SmallTitle';
-
-const tableBtn = [
-	{
-		type: 'edit',
-		btnName: '编辑',
-	},
-	{
-		type: 'delete',
-		btnName: '删除',
-	},
-];
-const tableProps = [
-	{
-		prop: 'createTime',
-		label: '添加时间',
-		filter: parseTime,
-	},
-	{
-		prop: 'name',
-		label: '属性名',
-	},
-	{
-		prop: 'value',
-		label: '属性值',
-	},
-];
-
-export default {
-	components: { productAttrAdd, SmallTitle },
-	data() {
-		return {
-			visible: false,
-			addOrUpdateVisible: false,
-			tableBtn,
-			tableProps,
-			productAttributeList: [],
-			dataForm: {
-				id: null,
-				name: '', // 产品名称
-				code: '', // 产品编码
-				area: 0, // 深加工单位平方数(float only)
-				typeDictValue: null, // 产品类型id
-				processTime: null, // 单位产品用时 (s)
-				specifications: '', // 深加工规格
-				unitDictValue: '', // 单位id
-				originalSpecifications: '', // 原片规格
-        originalArea: 0, // 原片单位平方数
-        processType:undefined,
-			},
-			listQuery: {
-				pageSize: 10,
-				pageNo: 1,
-				total: 0,
-      },
-      processTypeList: [
-        {
-          id: '0',
-          label:'压花丝印'
-        },
-        {
-          id: '1',
-          label: '无印打孔'
-        },
-        {
-          id: '2',
-          label: '单层镀膜'
-        }, {
-          id: '3',
-          label: '双层镀膜'
-        }
-      ],
-			dataRule: {
-				code: [
-					{
-						required: true,
-						message: '产品编码不能为空',
-						trigger: 'blur',
-					},
-					// {
-					// 	type: 'number',
-					// 	message: '产品编码为数字类型',
-					// 	trigger: 'blur',
-					// 	transfom: 'val => Number(val)',
-					// },
-				],
-				name: [
-					{
-						required: true,
-						message: '产品名称不能为空',
-						trigger: 'blur',
-					},
-				],
-				typeDictValue: [
-					{
-						required: true,
-						message: '产品类型不能为空',
-						trigger: 'blur',
-					},
-				],
-				area: [
-					{
-						type: 'number',
-						message: '请输入正确的数值',
-						trigger: 'change',
-						transform: (val) => Number(val),
-					},
-				],
-				processTime: [
-					{
-						required: true,
-						message: '完成单位产品用时不能为空',
-						trigger: 'blur',
-					},
-					{
-						type: 'number',
-						message: '请输入正确的数值',
-						trigger: 'blur',
-						transform: (val) => Number(val),
-					},
-				],
-			},
-			isdetail: false,
-		};
-	},
-	methods: {
-		initData() {
-			this.productAttributeList.splice(0);
-			this.listQuery.total = 0;
-		},
-		init(id, isdetail) {
-			this.initData();
-			this.isdetail = isdetail || false;
-			this.dataForm.id = id || null;
-			this.visible = true;
-
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-
-				if (this.dataForm.id) {
-					// 获取产品详情
-					getProduct(id).then((response) => {
-						this.dataForm = response.data;
-					});
-					// 获取产品的属性列表
-					this.getList();
-				} else {
-					getCode().then((res) => {
-						this.dataForm.code = res.data;
-					});
-				}
-			});
-		},
-
-		getList() {
-			// 获取产品的属性列表
-			getProductAttrPage({
-				...this.listQuery,
-				productId: this.dataForm.id,
-			}).then((response) => {
-				this.productAttributeList = response.data.list;
-				this.listQuery.total = response.data.total;
-			});
-		},
-		handleClick(raw) {
-			if (raw.type === 'delete') {
-				this.$confirm(
-					`确定对${
-						raw.data.name
-							? '[名称=' + raw.data.name + ']'
-							: '[序号=' + raw.data._pageIndex + ']'
-					}进行删除操作?`,
-					'提示',
-					{
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					}
-				)
-					.then(() => {
-						deleteProductAttr(raw.data.id).then(({ data }) => {
-							this.$message({
-								message: '操作成功',
-								type: 'success',
-								duration: 1500,
-								onClose: () => {
-									this.getList();
-								},
-							});
-						});
-					})
-					.catch(() => {});
-			} else {
-				this.addNew(raw.data.id);
-			}
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (valid) {
-					// 修改的提交
-					if (this.dataForm.id) {
-						updateProduct(this.dataForm).then((response) => {
-							this.$modal.msgSuccess('修改成功');
-							this.visible = false;
-							this.$emit('refreshDataList');
-						});
-						return;
-					}
-					// 添加的提交
-					createProduct(this.dataForm).then((response) => {
-						this.$modal.msgSuccess('新增成功');
-						this.$confirm(`是否新增产品属性?`, '系统提示', {
-							confirmButtonText: '确定',
-							cancelButtonText: '取消',
-							type: 'warning',
-						})
-							.then(() => {
-                this.dataForm.id = response.data
-								this.addNew();
-							})
-							.catch(() => {
-								this.visible = false;
-								this.$emit('refreshDataList');
-							});
-					});
-				}
-			});
-		},
-		goEdit() {
-			this.isdetail = false;
-		},
-		// 新增 / 修改
-		addNew(id) {
-			if (this.dataForm.id) {
-				this.addOrUpdateVisible = true;
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(id);
-				});
-			} else {
-				this.$message('请先创建产品!');
-			}
-		},
-		goback() {
-			this.$emit('refreshDataList');
-			this.visible = false;
-			this.initData();
-		},
-	},
-};
-</script>
-
-<style scoped>
-.drawer >>> .el-drawer {
-	border-radius: 8px 0 0 8px;
-	display: flex;
-	flex-direction: column;
-}
-
-.drawer >>> .el-form-item__label {
-	padding: 0;
-}
-
-.drawer >>> .el-drawer__header {
-	margin: 0;
-	padding: 32px 32px 24px;
-	border-bottom: 1px solid #dcdfe6;
-}
-.drawer >>> .el-drawer__body {
-	flex: 1;
-	height: 1px;
-	display: flex;
-	flex-direction: column;
-}
-
-.drawer >>> .content {
-	padding: 30px 24px;
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	/* height: 100%; */
-}
-
-.drawer >>> .visual-part {
-	flex: 1 auto;
-	max-height: 76vh;
-	overflow: hidden;
-	overflow-y: scroll;
-	padding-right: 10px; /* 调整滚动条样式 */
-}
-
-.drawer >>> .el-form,
-.drawer >>> .attr-list {
-	padding: 0 16px;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-</style>
diff --git a/src/views/core/base/product/attr-add.vue b/src/views/core/base/product/attr-add.vue
deleted file mode 100644
index d5c46d11..00000000
--- a/src/views/core/base/product/attr-add.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-	<el-dialog
-		:visible.sync="visible"
-		:width="'35%'"
-		:append-to-body="true"
-		:close-on-click-modal="false"
-		class="dialog">
-		<template #title>
-			<slot name="title">
-				<div class="titleStyle">
-					{{ !dataForm.id ? '新增' : '编辑' }}
-				</div>
-			</slot>
-		</template>
-
-		<el-form
-			ref="dataForm"
-			:model="dataForm"
-			:rules="dataRule"
-			label-width="100px"
-			@keyup.enter.native="dataFormSubmit()">
-			<el-form-item label="属性名" prop="name">
-				<el-input
-					v-model="dataForm.name"
-					placeholder="请输入属性名"
-					clearable />
-			</el-form-item>
-			<el-form-item label="属性值" prop="value">
-				<el-input
-					v-model="dataForm.value"
-					placeholder="请输入属性值"
-					clearable />
-			</el-form-item>
-		</el-form>
-
-		<el-row style="text-align: right">
-			<el-button @click="visible = false">取消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-		</el-row>
-	</el-dialog>
-</template>
-
-<script>
-import {
-	createProductAttr,
-	updateProductAttr,
-	getProductAttr,
-} from '@/api/core/base/productAttr';
-
-export default {
-	props: {
-		productId: {
-			type: String,
-			default: '',
-		},
-	},
-	data() {
-		return {
-			visible: false,
-			dataForm: {
-				id: 0,
-				name: '',
-				value: '',
-			},
-			dataRule: {
-				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-			},
-		};
-	},
-	methods: {
-		init(id) {
-			this.dataForm.id = id || '';
-			this.visible = true;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				if (this.dataForm.id) {
-					getProductAttr(this.dataForm.id).then((res) => {
-						const { name, value } = res.data;
-						this.dataForm.name = name;
-						this.dataForm.value = value;
-					});
-				}
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (valid) {
-					// 修改的提交
-					if (this.dataForm.id) {
-						updateProductAttr({
-							...this.dataForm,
-							productId: this.productId,
-						}).then((response) => {
-							this.$modal.msgSuccess('修改成功');
-							this.visible = false;
-							this.$emit('refreshDataList');
-						});
-						return;
-					}
-					// 添加的提交
-					createProductAttr({
-						...this.dataForm,
-						productId: this.productId,
-					}).then((response) => {
-						this.$modal.msgSuccess('新增成功');
-						this.visible = false;
-						this.$emit('refreshDataList');
-					});
-				}
-			});
-		},
-	},
-};
-</script>
-
-<style scoped>
-.dialog >>> .el-dialog__body {
-	padding: 30px 24px;
-}
-.dialog >>> .el-dialog__header {
-	font-size: 16px;
-	color: rgba(0, 0, 0, 0.85);
-	font-weight: 500;
-	padding: 13px 24px;
-	border-bottom: 1px solid #e9e9e9;
-}
-.dialog >>> .el-dialog__header .titleStyle::before {
-	content: '';
-	display: inline-block;
-	width: 4px;
-	height: 16px;
-	background-color: #0b58ff;
-	border-radius: 1px;
-	margin-right: 8px;
-	position: relative;
-	top: 2px;
-}
-</style>
diff --git a/src/views/core/base/product/index.vue b/src/views/core/base/product/index.vue
deleted file mode 100644
index 678ef723..00000000
--- a/src/views/core/base/product/index.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 14:55:51
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-24 16:06:59
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<add-or-update
-			v-if="addOrUpdateVisible"
-			ref="addOrUpdate"
-			@refreshDataList="getDataList" />
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import unitDict from './unitDict';
-import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import {
-	deleteProduct,
-	getProductPage,
-	exportProductExcel,
-} from '@/api/core/base/product';
-
-const tableProps = [
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime
-	},
-	{
-		prop: 'name',
-		label: '产品名称'
-	},
-	{
-		prop: 'code',
-		label: '产品编码'
-	},
-	{
-		prop: 'originalSpecifications',
-		label: '原片规格'
-	},
-	{
-		prop: 'specifications',
-		label: '深加工规格'
-	},
-	{
-		prop: 'unitDictValue',
-		label: '单位',
-		subcomponent: unitDict,
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getProductPage,
-				deleteURL: deleteProduct,
-				exportURL: exportProductExcel,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi(`base:product:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`base:product:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`base:product:update`)
-					? {
-							type: 'detail',
-							btnName: '详情',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
-					label: '产品编码',
-					placeholder: '产品编码',
-					param: 'code',
-				},
-				{
-					type: 'input',
-					label: '产品名称',
-					placeholder: '产品名称',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:product:create') ? 'button' : '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-				// {
-				// 	type: 'separate',
-				// 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('base:product:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name;
-					this.listQuery.code = val.code;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		otherMethods(val) {
-			this.addOrUpdateVisible = true;
-			this.addOrEditTitle = '详情';
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(val.data.id, true);
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/core/base/product/unitDict.vue b/src/views/core/base/product/unitDict.vue
deleted file mode 100644
index 94702ab4..00000000
--- a/src/views/core/base/product/unitDict.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-  <dict-tag
-    :type="DICT_TYPE.UNIT_DICT"
-    :value="injectData.unitDictValue" />
-</template>
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-};
-</script>
diff --git a/src/views/core/base/productAttr/index.vue b/src/views/core/base/productAttr/index.vue
deleted file mode 100644
index a78e71b2..00000000
--- a/src/views/core/base/productAttr/index.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="产品id,关联产品表" prop="productId">
-        <el-input v-model="queryParams.productId" placeholder="请输入产品id,关联产品表" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="属性值" prop="value">
-        <el-input v-model="queryParams.value" placeholder="请输入属性值" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:product-attr:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:product-attr:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="产品id,关联产品表" align="center" prop="productId" />
-      <el-table-column label="属性值" align="center" prop="value" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:product-attr:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:product-attr:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入名称" />
-        </el-form-item>
-        <el-form-item label="产品id,关联产品表" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入产品id,关联产品表" />
-        </el-form-item>
-        <el-form-item label="属性值" prop="value">
-          <el-input v-model="form.value" placeholder="请输入属性值" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { createProductAttr, updateProductAttr, deleteProductAttr, getProductAttr, getProductAttrPage, exportProductAttrExcel } from "@/api/core/base/productAttr";
-
-export default {
-  name: "ProductAttr",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 产品属性列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        name: null,
-        productId: null,
-        value: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-        productId: [{ required: true, message: "产品id,关联产品表不能为空", trigger: "blur" }],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getProductAttrPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        name: undefined,
-        productId: undefined,
-        value: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加产品属性";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getProductAttr(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改产品属性";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateProductAttr(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createProductAttr(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id;
-      this.$modal.confirm('是否确认删除产品属性编号为"' + id + '"的数据项?').then(function() {
-          return deleteProductAttr(id);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有产品属性数据项?').then(() => {
-          this.exportLoading = true;
-          return exportProductAttrExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '产品属性.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/core/base/productionLine/add-or-updata.vue b/src/views/core/base/productionLine/add-or-updata.vue
deleted file mode 100644
index 9536c714..00000000
--- a/src/views/core/base/productionLine/add-or-updata.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 13:52:10
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-24 15:32:45
- * @Description:
--->
-<template>
-	<el-form
-		class="dialog-inner__form"
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-    label-position="top"
-		label-width="90px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="产线编码" prop="code">
-					<el-input
-						v-model="dataForm.code"
-						clearable
-						placeholder="请输入产线编码" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="产线名称" prop="name">
-					<el-input
-						v-model="dataForm.name"
-						clearable
-						placeholder="请输入产线名称" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item prop="factoryId" label="工厂名称">
-					<el-select
-						v-model="dataForm.factoryId"
-						filterable
-						clearable
-						placeholder="请选择工厂">
-						<el-option
-							v-for="item in urlOptions.optionArr.arr0"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="产线理论生产能效(片/min)" prop="tvalue">
-					<el-input
-						v-model="dataForm.tvalue"
-						clearable
-						placeholder="请输入数量" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="额外编码" prop="externalCode">
-					<el-input
-						v-model="dataForm.externalCode"
-						clearable
-						placeholder="请输入额外编码" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item prop="pdType" label="产线类型">
-					<el-select
-						v-model="dataForm.pdType"
-						filterable
-						clearable
-						placeholder="请选择产线类型">
-						<el-option
-							v-for="item in pdTypeArr"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-
-		<el-row>
-			<el-col :span="24">
-				<el-form-item label="描述" prop="description">
-					<el-input
-						v-model="dataForm.description"
-						type="textarea"
-						placeholder="请输入内容" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="dataForm.remark"
-						clearable
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '../../mixins/basic-add';
-import {
-	createProductionLine,
-	updateProductionLine,
-	getProductionLine,
-	getCode,
-} from '@/api/core/base/productionLine';
-import { getFactoryPage } from '@/api/core/base/factory';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				getOption: true,
-				isGetCode: true,
-				codeURL: getCode,
-				createURL: createProductionLine,
-				updateURL: updateProductionLine,
-				infoURL: getProductionLine,
-				optionArrUrl: [getFactoryPage],
-			},
-			dataForm: {
-				id: undefined,
-				code: undefined,
-				name: undefined,
-				tvalue: undefined,
-				factoryId: undefined,
-				externalCode: undefined,
-				remark: undefined,
-				description: undefined,
-        pdType: undefined,
-			},
-      pdTypeArr: [
-        {
-          id: '0',
-          name: '深加工'
-        },
-        {
-          id: '1',
-          name: '原片'
-        }
-      ],
-			dataRule: {
-				code: [
-					{ required: true, message: '产线编码不能为空', trigger: 'blur' },
-				],
-				name: [
-					{ required: true, message: '产线名称不能为空', trigger: 'blur' },
-				],
-				factoryId: [
-					{ required: true, message: '工厂不能为空', trigger: 'change' },
-				],
-				tvalue: [
-					{
-            required: true,
-						type: 'number',
-						message: '请输入正确的数字',
-						trigger: 'change',
-						transform: (val) => Number(val),
-					},
-				],
-			},
-		};
-	},
-	methods: {},
-};
-</script>
-
-<style scoped>
-.dialog-inner__form >>> .el-select {
-	width: 100%;
-}
-</style>
diff --git a/src/views/core/base/productionLine/index.vue b/src/views/core/base/productionLine/index.vue
deleted file mode 100644
index e1245921..00000000
--- a/src/views/core/base/productionLine/index.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="90"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '../../mixins/basic-page';
-import codeFilter from '../../mixins/code-filter';
-import { parseTime } from '../../mixins/code-filter';
-import {
-	deleteProductionLine,
-	getProductionLinePage,
-	exportProductionLineExcel,
-	getStatus,
-} from '@/api/core/base/productionLine';
-import { getFactoryPage } from '@/api/core/base/factory';
-
-const tableProps = [
-	{
-		prop: 'code',
-		label: '产线编码',
-		width: 160,
-	},
-	{
-		prop: 'name',
-		label: '产线名称'
-	},
-	{
-		prop: 'factoryName',
-		label: '工厂'
-	},
-	{
-		prop: 'externalCode',
-		label: '额外编码'
-	},
-	{
-		prop: 'pdType',
-		label: '产线类型',
-		filter: codeFilter('pdType'),
-	},
-	{
-		prop: 'status',
-		label: '当前状态',
-		filter: codeFilter('lineStatus'),
-	},
-	{
-		prop: 'description',
-		label: '描述',
-		showOverflowtooltip: true,
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-		showOverflowtooltip: true,
-	},
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime,
-		width: 160,
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getProductionLinePage,
-				deleteURL: deleteProductionLine,
-				exportURL: exportProductionLineExcel,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi(`base:production-line:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`base:production-line:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'input',
-					label: '产线名称',
-					placeholder: '产线名称',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:production-line:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:production-line:create') ? 'separate' : '',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('base:production-line:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-    },
-	methods: {
-		// 获取数据列表
-		getDataList() {
-			this.dataListLoading = true;
-			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
-				this.listQuery.total = response.data.total;
-				this.getStatus(response.data.list);
-				this.dataListLoading = false;
-			});
-		},
-		getStatus(list) {
-			const ids = list.map((i) => {
-				return i.id;
-			});
-			getStatus(ids).then((response) => {
-				response.forEach((a) => {
-					list.forEach((b) => {
-						if (b.id === a.id) b.status = a.status;
-					});
-				});
-				this.tableData = list;
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.name = val.name;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/core/base/productionLineRecDay/index.vue b/src/views/core/base/productionLineRecDay/index.vue
deleted file mode 100644
index 6b09138a..00000000
--- a/src/views/core/base/productionLineRecDay/index.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="产线id" prop="productionLineId">
-        <el-input v-model="queryParams.productionLineId" placeholder="请输入产线id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="上一次记录时间至该条记录时间段内上片数量" prop="inputNum">
-        <el-input v-model="queryParams.inputNum" placeholder="请输入上一次记录时间至该条记录时间段内上片数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="上一次记录时间至该条记录时间段内下片数量" prop="outputNum">
-        <el-input v-model="queryParams.outputNum" placeholder="请输入上一次记录时间至该条记录时间段内下片数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="该记录时间点的累计上片数量" prop="sumInputNum">
-        <el-input v-model="queryParams.sumInputNum" placeholder="请输入该记录时间点的累计上片数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="该记录时间点的累计下片数量" prop="sumOutputNum">
-        <el-input v-model="queryParams.sumOutputNum" placeholder="请输入该记录时间点的累计下片数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="记录时间" prop="recordTime">
-        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="合格率（%）" prop="passRate">
-        <el-input v-model="queryParams.passRate" placeholder="请输入合格率（%）" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:production-line-rec-day:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:production-line-rec-day:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="产线id" align="center" prop="productionLineId" />
-      <el-table-column label="上一次记录时间至该条记录时间段内上片数量" align="center" prop="inputNum" />
-      <el-table-column label="上一次记录时间至该条记录时间段内下片数量" align="center" prop="outputNum" />
-      <el-table-column label="该记录时间点的累计上片数量" align="center" prop="sumInputNum" />
-      <el-table-column label="该记录时间点的累计下片数量" align="center" prop="sumOutputNum" />
-      <el-table-column label="记录时间" align="center" prop="recordTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recordTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="合格率（%）" align="center" prop="passRate" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:production-line-rec-day:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:production-line-rec-day:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="产线id" prop="productionLineId">
-          <el-input v-model="form.productionLineId" placeholder="请输入产线id" />
-        </el-form-item>
-        <el-form-item label="上一次记录时间至该条记录时间段内上片数量" prop="inputNum">
-          <el-input v-model="form.inputNum" placeholder="请输入上一次记录时间至该条记录时间段内上片数量" />
-        </el-form-item>
-        <el-form-item label="上一次记录时间至该条记录时间段内下片数量" prop="outputNum">
-          <el-input v-model="form.outputNum" placeholder="请输入上一次记录时间至该条记录时间段内下片数量" />
-        </el-form-item>
-        <el-form-item label="该记录时间点的累计上片数量" prop="sumInputNum">
-          <el-input v-model="form.sumInputNum" placeholder="请输入该记录时间点的累计上片数量" />
-        </el-form-item>
-        <el-form-item label="该记录时间点的累计下片数量" prop="sumOutputNum">
-          <el-input v-model="form.sumOutputNum" placeholder="请输入该记录时间点的累计下片数量" />
-        </el-form-item>
-        <el-form-item label="记录时间" prop="recordTime">
-          <el-date-picker clearable v-model="form.recordTime" type="date" value-format="timestamp" placeholder="选择记录时间" />
-        </el-form-item>
-        <el-form-item label="合格率（%）" prop="passRate">
-          <el-input v-model="form.passRate" placeholder="请输入合格率（%）" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { createProductionLineRecDay, updateProductionLineRecDay, deleteProductionLineRecDay, getProductionLineRecDay, getProductionLineRecDayPage, exportProductionLineRecDayExcel } from "@/api/core/base/productionLineRecDay";
-
-export default {
-  name: "ProductionLineRecDay",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 产线生产定时记录表 一天添加一次数据列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        productionLineId: null,
-        inputNum: null,
-        outputNum: null,
-        sumInputNum: null,
-        sumOutputNum: null,
-        recordTime: [],
-        passRate: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        inputNum: [{ required: true, message: "上一次记录时间至该条记录时间段内上片数量不能为空", trigger: "blur" }],
-        outputNum: [{ required: true, message: "上一次记录时间至该条记录时间段内下片数量不能为空", trigger: "blur" }],
-        sumInputNum: [{ required: true, message: "该记录时间点的累计上片数量不能为空", trigger: "blur" }],
-        sumOutputNum: [{ required: true, message: "该记录时间点的累计下片数量不能为空", trigger: "blur" }],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getProductionLineRecDayPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        productionLineId: undefined,
-        inputNum: undefined,
-        outputNum: undefined,
-        sumInputNum: undefined,
-        sumOutputNum: undefined,
-        recordTime: undefined,
-        passRate: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加产线生产定时记录表 一天添加一次数据";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getProductionLineRecDay(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改产线生产定时记录表 一天添加一次数据";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateProductionLineRecDay(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createProductionLineRecDay(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id;
-      this.$modal.confirm('是否确认删除产线生产定时记录表 一天添加一次数据编号为"' + id + '"的数据项?').then(function() {
-          return deleteProductionLineRecDay(id);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有产线生产定时记录表 一天添加一次数据数据项?').then(() => {
-          this.exportLoading = true;
-          return exportProductionLineRecDayExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '产线生产定时记录表 一天添加一次数据.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/core/base/productionLineRecSch/index.vue b/src/views/core/base/productionLineRecSch/index.vue
deleted file mode 100644
index 5801e932..00000000
--- a/src/views/core/base/productionLineRecSch/index.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="产线id" prop="productionLineId">
-        <el-input v-model="queryParams.productionLineId" placeholder="请输入产线id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="上一次记录时间至该条记录时间端内上片数量" prop="inputNum">
-        <el-input v-model="queryParams.inputNum" placeholder="请输入上一次记录时间至该条记录时间端内上片数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="上一次记录时间至该条记录时间端内下片数量" prop="outputNum">
-        <el-input v-model="queryParams.outputNum" placeholder="请输入上一次记录时间至该条记录时间端内下片数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="该记录时间点的累计上片数量" prop="sumInputNum">
-        <el-input v-model="queryParams.sumInputNum" placeholder="请输入该记录时间点的累计上片数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="该记录时间点的累计下片数量" prop="sumOutputNum">
-        <el-input v-model="queryParams.sumOutputNum" placeholder="请输入该记录时间点的累计下片数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="记录时间" prop="recordTime">
-        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="合格率（%）" prop="passRate">
-        <el-input v-model="queryParams.passRate" placeholder="请输入合格率（%）" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:production-line-rec-sch:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:production-line-rec-sch:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="产线id" align="center" prop="productionLineId" />
-      <el-table-column label="上一次记录时间至该条记录时间端内上片数量" align="center" prop="inputNum" />
-      <el-table-column label="上一次记录时间至该条记录时间端内下片数量" align="center" prop="outputNum" />
-      <el-table-column label="该记录时间点的累计上片数量" align="center" prop="sumInputNum" />
-      <el-table-column label="该记录时间点的累计下片数量" align="center" prop="sumOutputNum" />
-      <el-table-column label="记录时间" align="center" prop="recordTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recordTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="合格率（%）" align="center" prop="passRate" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:production-line-rec-sch:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:production-line-rec-sch:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="产线id" prop="productionLineId">
-          <el-input v-model="form.productionLineId" placeholder="请输入产线id" />
-        </el-form-item>
-        <el-form-item label="上一次记录时间至该条记录时间端内上片数量" prop="inputNum">
-          <el-input v-model="form.inputNum" placeholder="请输入上一次记录时间至该条记录时间端内上片数量" />
-        </el-form-item>
-        <el-form-item label="上一次记录时间至该条记录时间端内下片数量" prop="outputNum">
-          <el-input v-model="form.outputNum" placeholder="请输入上一次记录时间至该条记录时间端内下片数量" />
-        </el-form-item>
-        <el-form-item label="该记录时间点的累计上片数量" prop="sumInputNum">
-          <el-input v-model="form.sumInputNum" placeholder="请输入该记录时间点的累计上片数量" />
-        </el-form-item>
-        <el-form-item label="该记录时间点的累计下片数量" prop="sumOutputNum">
-          <el-input v-model="form.sumOutputNum" placeholder="请输入该记录时间点的累计下片数量" />
-        </el-form-item>
-        <el-form-item label="记录时间" prop="recordTime">
-          <el-date-picker clearable v-model="form.recordTime" type="date" value-format="timestamp" placeholder="选择记录时间" />
-        </el-form-item>
-        <el-form-item label="合格率（%）" prop="passRate">
-          <el-input v-model="form.passRate" placeholder="请输入合格率（%）" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { createProductionLineRecSch, updateProductionLineRecSch, deleteProductionLineRecSch, getProductionLineRecSch, getProductionLineRecSchPage, exportProductionLineRecSchExcel } from "@/api/core/base/productionLineRecSch";
-
-export default {
-  name: "ProductionLineRecSch",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 产线生产定时记录表 一小时添加一次数据	至少需要一个上片设备和下片设备才会自动添加列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        productionLineId: null,
-        inputNum: null,
-        outputNum: null,
-        sumInputNum: null,
-        sumOutputNum: null,
-        recordTime: [],
-        passRate: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        inputNum: [{ required: true, message: "上一次记录时间至该条记录时间端内上片数量不能为空", trigger: "blur" }],
-        outputNum: [{ required: true, message: "上一次记录时间至该条记录时间端内下片数量不能为空", trigger: "blur" }],
-        sumInputNum: [{ required: true, message: "该记录时间点的累计上片数量不能为空", trigger: "blur" }],
-        sumOutputNum: [{ required: true, message: "该记录时间点的累计下片数量不能为空", trigger: "blur" }],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getProductionLineRecSchPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        productionLineId: undefined,
-        inputNum: undefined,
-        outputNum: undefined,
-        sumInputNum: undefined,
-        sumOutputNum: undefined,
-        recordTime: undefined,
-        passRate: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加产线生产定时记录表 一小时添加一次数据	至少需要一个上片设备和下片设备才会自动添加";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getProductionLineRecSch(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改产线生产定时记录表 一小时添加一次数据	至少需要一个上片设备和下片设备才会自动添加";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateProductionLineRecSch(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createProductionLineRecSch(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id;
-      this.$modal.confirm('是否确认删除产线生产定时记录表 一小时添加一次数据	至少需要一个上片设备和下片设备才会自动添加编号为"' + id + '"的数据项?').then(function() {
-          return deleteProductionLineRecSch(id);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有产线生产定时记录表 一小时添加一次数据	至少需要一个上片设备和下片设备才会自动添加数据项?').then(() => {
-          this.exportLoading = true;
-          return exportProductionLineRecSchExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '产线生产定时记录表 一小时添加一次数据	至少需要一个上片设备和下片设备才会自动添加.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/core/base/workshopSection/add-or-updata.vue b/src/views/core/base/workshopSection/add-or-updata.vue
deleted file mode 100644
index d0b5afc9..00000000
--- a/src/views/core/base/workshopSection/add-or-updata.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 13:52:10
- * @LastEditors: DY
- * @LastEditTime: 2023-10-16 13:40:00
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="90px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="工段编码" prop="code">
-					<el-input
-						v-model="dataForm.code"
-						clearable
-						placeholder="请输入工段编码" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="工段名称" prop="name">
-					<el-input
-						v-model="dataForm.name"
-						clearable
-						placeholder="请输入工段名称" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item prop="productionLineId" label="产线">
-					<el-select
-					v-model="dataForm.productionLineId" filterable clearable placeholder="请选择产线">
-						<el-option
-							v-for="item in urlOptions.optionArr.arr0"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"
-						>
-						</el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="排序" prop="sort">
-					<el-input-number v-model="dataForm.sort" :min="1" :max="100" clearable placeholder="请输入排序" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-form-item label="备注" prop="remark">
-			<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
-		</el-form-item>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '../../mixins/basic-add';
-import {
-	createWorkshopSection,
-	updateWorkshopSection,
-	getWorkshopSection,
-	getCode,
-} from '@/api/core/base/workshopSection';
-import {
-	getProductionLinePage,
-} from '@/api/core/base/productionLine';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-        getOption: true,
-			  isGetCode: true,
-        codeURL: getCode,
-				createURL: createWorkshopSection,
-				updateURL: updateWorkshopSection,
-				infoURL: getWorkshopSection,
-        optionArrUrl: [getProductionLinePage],
-			},
-			dataForm: {
-				id: undefined,
-				code: undefined,
-				productionLineId: undefined,
-				sort: undefined,
-				name: undefined,
-				remark: undefined,
-			},
-			dataRule: {
-				code: [
-					{ required: true, message: '工段编码不能为空', trigger: 'blur' },
-				],
-				name: [
-					{ required: true, message: '工段名称不能为空', trigger: 'blur' },
-				],
-				sort: [
-					{ required: true, message: '排序不能为空', trigger: 'blur' },
-				],
-        productionLineId: [
-					{ required: true, message: '产线不能为空', trigger: 'change' },
-				],
-			},
-		};
-	},
-	methods: {
-	},
-};
-</script>
diff --git a/src/views/core/base/workshopSection/index.vue b/src/views/core/base/workshopSection/index.vue
deleted file mode 100644
index 32e741fd..00000000
--- a/src/views/core/base/workshopSection/index.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
-			@headBtnClick="buttonClick" />
-		<base-table
-      v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import {
-  deleteWorkshopSection,
-  getWorkshopSectionPage,
-  exportWorkshopSectionExcel
-} from "@/api/core/base/workshopSection";
-import { getPdList } from '@/api/core/monitoring/auto';
-import { getFactoryPage } from '@/api/core/base/factory';
-
-const tableProps = [
-	{
-		prop: 'code',
-		label: '工段编码'
-	},
-	{
-		prop: 'name',
-		label: '工段名称'
-	},
-	{
-		prop: 'factoryName',
-		label: '工厂'
-	},
-	{
-		prop: 'productionLineName',
-		label: '产线'
-	},
-	{
-		prop: 'sort',
-		label: '排序'
-	},
-	{
-		prop: 'remark',
-		label: '备注'
-	},
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getWorkshopSectionPage,
-				deleteURL: deleteWorkshopSection,
-				exportURL: exportWorkshopSectionExcel,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi(`base:workshop-section:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-          this.$auth.hasPermi(`base:workshop-section:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v)=>v),
-			listQuery: {
-				lineId: [],
-			},
-			tableData: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'lineId',
-					multiple: true,
-				},
-				{
-					type: 'input',
-					label: '工段名称',
-					placeholder: '工段名称',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:workshop-section:create') ? 'button' : '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:workshop-section:create') ? 'separate' : '',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('base:workshop-section:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {
-		this.getPdLineList();
-	},
-	methods: {
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.lineId = [];
-			this.$refs.searchBarForm.formInline.lineId = undefined;
-			getPdList(value).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name;
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.lineId = val.lineId || [];
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/core/mixins/basic-add.js b/src/views/core/mixins/basic-add.js
deleted file mode 100644
index 0b9acd23..00000000
--- a/src/views/core/mixins/basic-add.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * @Author: zwq
- * @Date: 2022-08-24 11:19:43
- * @LastEditors: zwq
- * @LastEditTime: 2023-08-03 14:21:04
- * @Description:
- */
-export default {
-  data() {
-    /* eslint-disable */
-    return {
-      urlOptions: {
-        createURL: '',
-        updateURL: '',
-        infoURL: '',
-        codeURL: '',
-        getOption: false,
-        isGetCode: false,
-        optionArrUrl: [],
-        optionArr: {}
-      },
-      visible: false,
-      setData: false
-    }
-  },
-  created() {
-  },
-  activated() {
-  },
-  methods: {
-    init(id) {
-      this.dataForm.id = id || "";
-      this.visible = true;
-      if (this.urlOptions.getOption) {
-        this.getArr()
-      }
-      this.$nextTick(() => {
-        this.$refs["dataForm"].resetFields();
-        if (this.dataForm.id) {
-          this.urlOptions.infoURL(id).then(response => {
-            this.dataForm = response.data;
-            if (this.setData) {
-              this.setDataForm()
-            }
-          });
-        } else {
-          if (this.urlOptions.isGetCode) {
-            this.getCode()
-          }
-				}
-      });
-    },
-		getCode() {
-			this.urlOptions.codeURL()
-				.then(({ data: res }) => {
-					this.dataForm.code = res;
-				})
-				.catch(() => {});
-		},
-    getArr() {
-      const params = {
-        pageSize: 100,
-        pageNo: 1,
-      }
-      this.urlOptions.optionArrUrl.forEach((item, index) => {
-        item(params).then(({ data: res }) => {
-          this.$set(this.urlOptions.optionArr, `arr${index}`, res.list)
-        })
-          .catch(() => {
-          });
-      });
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs["dataForm"].validate((valid) => {
-        if (!valid) {
-          return false;
-        }
-        // 修改的提交
-        if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.visible = false;
-            this.$emit("refreshDataList");
-          });
-          return;
-        }
-        // 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.visible = false;
-          this.$emit("refreshDataList");
-        });
-      });
-    },
-    formClear() {
-      this.$refs.dataForm.resetFields()
-    }
-  }
-}
diff --git a/src/views/core/mixins/basic-page.js b/src/views/core/mixins/basic-page.js
deleted file mode 100644
index fe4a22cf..00000000
--- a/src/views/core/mixins/basic-page.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * @Author: zwq
- * @Date: 2022-08-24 11:19:43
- * @LastEditors: DY
- * @LastEditTime: 2023-09-21 16:02:07
- * @Description:
- */
-export default {
-  data() {
-    /* eslint-disable */
-    return {
-      urlOptions: {
-        getDataListURL: '',
-        deleteURL: '',
-        statusUrl: '',
-        exportURL: ''
-      },
-      tableData: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-      },
-      exportLoading: false,
-      dataListLoading: false,
-      addOrEditTitle: '',
-      addOrUpdateVisible: false,
-    }
-  },
-  created() {
-  },
-  mounted() {
-    this.getDataList()
-  },
-  methods: {
-    // 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list;
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-    // 新增 / 修改
-    addOrUpdateHandle(id) {
-      this.addOrUpdateVisible = true;
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id);
-      });
-    },
-    cancel(id) {
-      this.$refs["popover-" + id].showPopper = false;
-    },
-    //改变状态
-    changeStatus(id) {
-      this.$http
-        .post(this.urlOptions.statusUrl, { id })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.warning(res.msg);
-          }
-          this.$refs["popover-" + id].showPopper = false;
-          this.$message({
-            message: this.$t("prompt.success"),
-            type: "success",
-            duration: 500,
-            onClose: () => {
-              this.getDataList();
-            },
-          });
-        })
-        .catch(() => { });
-    },
-    //tableBtn点击
-    handleClick(val) {
-      if (val.type === "edit") {
-        this.addOrUpdateVisible = true;
-        this.addOrEditTitle = "编辑";
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(val.data.id);
-        });
-      } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
-      } else if (val.type === "change") {
-        this.changeStatus(val.data.id)
-      } else {
-        this.otherMethods(val)
-      }
-    },
-    // 删除
-    deleteHandle(id, name, index) {
-      this.$confirm(`确定对${name ? '[名称=' + name + ']' : '[序号=' + index + ']'}进行删除操作?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.urlOptions.deleteURL(id).then(({ data }) => {
-            this.$message({
-              message: "操作成功",
-              type: "success",
-              duration: 1500,
-              onClose: () => {
-                this.getDataList();
-              },
-            });
-          });
-        })
-        .catch(() => { });
-    },
-    //search-bar点击
-    buttonClick(val) {
-      switch (val.btnName) {
-        case "search":
-          this.listQuery.xm1 = val.xm1;
-          this.listQuery.xm2 = val.xm2;
-          this.listQuery.pageNo = 1;
-          this.getDataList();
-          break;
-        case "add":
-          this.addOrEditTitle = '新增'
-          this.addOrUpdateVisible = true;
-          this.addOrUpdateHandle()
-          break;
-        default:
-          console.log(val)
-      }
-    },
-    handleCancel() {
-      this.$refs.addOrUpdate.formClear()
-      this.addOrUpdateVisible = false
-      this.addOrEditTitle = ''
-    },
-    handleConfirm() {
-      this.$refs.addOrUpdate.dataFormSubmit()
-    },
-    successSubmit() {
-      this.handleCancel()
-      this.getDataList()
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = { ...this.queryParams };
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
-        this.exportLoading = true;
-        return this.urlOptions.exportURL(params);
-      }).then(response => {
-        this.$download.excel(response, '工厂.xls');
-        this.exportLoading = false;
-      }).catch(() => { });
-    }
-  }
-}
diff --git a/src/views/core/mixins/code-filter.js b/src/views/core/mixins/code-filter.js
deleted file mode 100644
index 1d3d10d8..00000000
--- a/src/views/core/mixins/code-filter.js
+++ /dev/null
@@ -1,73 +0,0 @@
-
-/*
- * @Date: 2020-12-29 16:49:28
- * @LastEditors: DY
- * @LastEditTime: 2023-09-12 11:13:34
- * @FilePath: \basic-admin\src\filters\basicData\index.js
- * @Description:
- */
-
-const table = {
-  lineStatus: {
-    1: '生产中',
-    2: '停止',
-    3: '未知',
-  },
-  reportType: {
-    1: '日',
-    2: '周',
-    3: '月'
-  },
-  pdType: {
-    1: '原片',
-    0: '深加工',
-  },
-}
-
-// 日期格式化
-export function parseTime(time, pattern) {
-  if (arguments.length === 0 || !time) {
-    return null
-  }
-  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
-  let date
-  if (typeof time === 'object') {
-    date = time
-  } else {
-    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
-      time = parseInt(time)
-    } else if (typeof time === 'string') {
-      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm),'');
-    }
-    if ((typeof time === 'number') && (time.toString().length === 10)) {
-      time = time * 1000
-    }
-    date = new Date(time)
-  }
-  const formatObj = {
-    y: date.getFullYear(),
-    m: date.getMonth() + 1,
-    d: date.getDate(),
-    h: date.getHours(),
-    i: date.getMinutes(),
-    s: date.getSeconds(),
-    a: date.getDay()
-  }
-  const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
-    let value = formatObj[key]
-    // Note: getDay() returns 0 on Sunday
-    if (key === 'a') {
-      return ['日', '一', '二', '三', '四', '五', '六'][value]
-    }
-    if (result.length > 0 && value < 10) {
-      value = '0' + value
-    }
-    return value || 0
-  })
-  return time_str
-}
-export default function (dictTable) {
-  return function (val) {
-    return table?.[dictTable]?.[val]
-  }
-}
diff --git a/src/views/core/monitoring/auto/index.vue b/src/views/core/monitoring/auto/index.vue
deleted file mode 100644
index f659016c..00000000
--- a/src/views/core/monitoring/auto/index.vue
+++ /dev/null
@@ -1,346 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2024-12-02 13:59:32
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-  <div class="app-container">
-
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table v-if="showData.length" class="right-aside" v-loading="dataListLoading" :table-props="tableProps"
-      :page="listQuery.pageNo" :limit="listQuery.pageSize" :selectWidth="55" :table-data="showData"
-      @selection-change="selectChange">
-    </base-table>
-    <div v-else class="no-data-bg"></div>
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-      @pagination="getDataList" />
-    <!-- <div v-show="false" ref="pdf">
-			<base-table
-				v-loading="dataListLoading"
-				:table-props="tableProps"
-				:page="listQuery.pageNo"
-				:limit="listQuery.pageSize"
-				:table-data="selectedList"
-			/>
-		</div> -->
-    <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
-      <el-button type="primary" @click="exportXlsx">xlsx</el-button>
-      <el-button type="success" @click="exportPdf">pdf</el-button>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { parseTime } from '../../mixins/code-filter';
-import { getPdlAutoReport, getPdList } from '@/api/core/monitoring/auto'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
-// import codeFilter from '../../mixins/code-filter'
-import * as XLSX from 'xlsx'
-import FileSaver from 'file-saver'
-
-const tableProps = [
-	{
-		prop: 'reportType',
-		label: '报表类型'
-	},
-	{
-		prop: 'reportStartTime',
-		label: '统计开始时间',
-		filter: parseTime,
-	},
-	{
-		prop: 'reportEndTime',
-		label: '统计结束时间',
-		filter: parseTime,
-	},
-	{
-		prop: 'proLineName',
-		label: '产线名称'
-	},
-	{
-		prop: 'inputNum',
-		label: '投入数量/片'
-	},
-	{
-		prop: 'outputNum',
-		label: '产出数量/片'
-	},
-	{
-		prop: 'outputArea',
-		label: '产出面积/㎡',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'lossNum',
-		label: '损耗数量/片'
-	},
-	{
-		prop: 'lossArea',
-		label: '损耗面积/㎡',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'lossRatio',
-		label: '损耗比例%',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	}
-];
-
-export default {
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getPdlAutoReport
-			},
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-      },
-			fileName: '',
-      exportLoading: false,
-      dataListLoading: false,
-			dialogVisible: false,
-      addOrEditTitle: '',
-      addOrUpdateVisible: false,
-			tableProps,
-			tableBtn: [],
-			showData: [],
-			selectedList: [],
-			// tableBtn: [
-			// 	this.$auth.hasPermi(`base:factory:update`)
-			// 		? {
-			// 				type: 'edit',
-			// 				btnName: '编辑',
-			// 		  }
-			// 		: undefined,
-      //     this.$auth.hasPermi(`base:factory:delete`)
-			// 		? {
-			// 				type: 'delete',
-			// 				btnName: '删除',
-			// 		  }
-			// 		: undefined,
-			// ].filter((v)=>v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-          param: 'line'
-				},
-				{
-					type: 'select',
-					label: '报表类型',
-					selectOptions: [
-						{
-							id: 1,
-							name: '日'
-						},
-						{
-							id: 2,
-							name: '周'
-						},
-						{
-							id: 3,
-							name: '月'
-						}
-					],
-					param: 'reportType',
-				},
-				{
-          type: 'datePicker',
-          label: '统计开始时间',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "yyyy-MM-ddTHH:mm:ss",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          width: 350
-        },
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				}
-			],
-		};
-  },
-
-	created() {
-		this.getDataList()
-		this.getPdLineList()
-	},
-	methods: {
-		test() {
-			var target = document.getElementsByClassName("right-aside")[0]
-			target.style.background = '#FFFFFF'
-			var that = this
-			setTimeout(() => {
-				html2canvas(target).then(function(canvas) {
-						var contentWidth = canvas.width
-						var contentHeight = canvas.height
-
-						// 一页pdf显示html页面生成的canvas高度
-						var pageHeight = contentHeight / 592.28 * 841.89
-						// 未生成pdf的html页面高度
-						var leftHeight = contentHeight
-						// 页面偏移
-						var position = 0
-						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-						var imgWidth = 595.28
-						var imgHeight = 592.28 / contentWidth * contentHeight
-
-						var pageData = canvas.toDataURL('image/jpeg', 1.0)
-
-						console.log('nihc URL', leftHeight, pageHeight)
-
-						var pdf = new jsPDF('', 'pt', 'a4')
-
-						if (leftHeight < pageHeight) {
-							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
-						} else {
-							while(leftHeight > 0) {
-								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
-								leftHeight -= pageHeight
-								position -= 841.89
-								// 避免空白页
-								if (leftHeight > 0) {
-									pdf.addPage()
-								}
-							}
-						}
-
-						pdf.save(that.fileName + '产线产量.pdf')
-				})
-			}, 300)
-		},
-		exportPdf() {
-			this.test()
-			setTimeout(() =>{
-				this.dialogVisible = false
-				this.showData = this.tableData
-			}, 600)
-
-		},
-		exportXlsx() {
-			this.exportECL()
-			this.dialogVisible = false
-			this.showData = this.tableData
-		},
-		handleClose(done) {
-			this.$confirm('确认关闭？')
-				.then(_ => {
-					done();
-				})
-				.catch(_ => {});
-		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true)
-			const fix = tables.querySelector('.el-table__fixed')
-			const fixRight = tables.querySelector('.el-table__fixed-right')
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let exportTable = XLSX.utils.table_to_book(tables)
-
-      var exportTableOut = XLSX.write(exportTable, {
-        bookType: 'xlsx', bookSST: true, type: 'array'
-      })
-      // sheetjs.xlsx为导出表格的标题名称
-      try {
-        FileSaver.saveAs(new Blob([exportTableOut], {
-          type: 'application/octet-stream'
-        }), this.fileName + '产线产量.xlsx')
-      } catch (e) {
-        if (typeof console !== 'undefined') console.log(e, exportTableOut)
-      }
-      return exportTableOut
-    },
-		selectChange(val) {
-      console.log(val)
-      this.selectedList = val
-			console.log('勾选数据', this.selectedList)
-    },
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[0].selectOptions = res.data || []
-			})
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.lineId = val.line ? val.line : undefined;
-					this.listQuery.reportType = val.reportType ? val.reportType : undefined;
-					this.listQuery.reportStartTime = val.timeVal ? [new Date(val.timeVal[0]).getTime(),new Date(val.timeVal[1]).getTime()] : undefined;
-					//this.listQuery.reportEndTime = val.timeVal ? [new Date(val.timeVal[1]).getTime()] : undefined;
-					if (val.timeVal && val.timeVal.length > 0) {
-						this.fileName = val.timeVal[0].slice(0, 10) + '-' + val.timeVal[1].slice(0, 10) + '_'
-          }
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list.map((item, index) => {
-					item.reportType = item.reportType === 1 ? '日' : item.reportType === 2 ? '周' : '月'
-					return item
-				});
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-				this.showData = this.tableData
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-		handleExport() {
-			if (this.selectedList.length > 0) {
-				this.showData = this.selectedList
-			}
-			this.dialogVisible = true
-    }
-	},
-};
-</script>
diff --git a/src/views/core/monitoring/components/buttonNav.vue b/src/views/core/monitoring/components/buttonNav.vue
deleted file mode 100644
index 39f5f081..00000000
--- a/src/views/core/monitoring/components/buttonNav.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2024-10-21 08:43:35
- * @LastEditTime: 2024-10-21 09:10:09
- * @LastEditors: zhp
- * @Description: Vue2版本的标签切换组件
--->
-
-<template>
-  <!-- 按钮切换 -->
-  <div v-if="buttonMode" class="button-nav">
-    <button v-for="m in menus" :key="m" :class="{ active: m === currentMenu }" :data-text="m"
-      @click="handleMenuChange(m)"></button>
-  </div>
-  <!-- 标签切换 -->
-  <div v-else class="custom-tabs" style="height: 100%; width: 100%">
-    <el-tabs v-model="currentMenu" class="tag-nav" style="height: 100%">
-      <el-tab-pane v-for="(m, idx) in menus" :key="m" :label="idx == 0 ? `\u2002${m}\u2002` : `\u3000${m}\u3000`"
-        :name="m">
-        <slot :name="`tab${idx + 1}`"></slot>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    menus: {
-      type: Array,
-      required: true,
-      default: () => [],
-      validator(val) {
-        return val.length > 0;
-      }
-    },
-    buttonMode: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      currentMenu: this.menus[0] || ''
-    };
-  },
-  methods: {
-    handleMenuChange(menu) {
-      this.currentMenu = menu;
-      this.$emit('change', menu);
-    }
-  },
-  watch: {
-    currentMenu(val) {
-      this.$emit('change', val);
-    }
-  },
-  mounted() {
-    if (this.menus.length > 0) {
-      this.currentMenu = this.menus[0];
-    }
-  }
-};
-</script>
-
-<style scoped>
-.button-nav {
-  width: 100%;
-  padding: 12px 0;
-  display: flex;
-  gap: 12px;
-}
-
-.button-nav * {
-  user-select: none;
-}
-
-.button-nav button {
-  cursor: pointer;
-  appearance: none;
-  outline: none;
-  border: none;
-  background: #fff;
-  border-radius: 8px;
-  border-bottom-left-radius: 5px;
-  border-bottom-right-radius: 5px;
-  padding: 20px;
-  color: #888;
-  letter-spacing: 2px;
-  flex: 1;
-  box-sizing: padding-box;
-  position: relative;
-}
-
-.button-nav button::after {
-  content: attr(data-text);
-  position: absolute;
-  top: 10px;
-  left: 50%;
-  font-size: 18px;
-  font-weight: 500;
-  transform: translate(-50%);
-}
-
-.button-nav button.active {
-  color: #111;
-  border-bottom: 4px solid #0b58ff;
-}
-
-.custom-tabs /deep/ .el-tabs__header {
-  margin-bottom: 8px;
-  display: inline-block;
-}
-
-.custom-tabs /deep/ .el-tabs__item {
-  padding-left: 0px !important;
-  padding-right: 0px !important;
-  line-height: 36px !important;
-  height: 36px;
-}
-
-.custom-tabs /deep/ .el-tabs__content {
-  height: calc(100% - 42px);
-}
-
-.custom-tabs /deep/ .el-tab-pane {
-  box-sizing: border-box;
-  height: 100%;
-  padding: 20px;
-  border: 10px solid #f002;
-}
-</style>
diff --git a/src/views/core/monitoring/data/BarChart.vue b/src/views/core/monitoring/data/BarChart.vue
deleted file mode 100644
index c7eab889..00000000
--- a/src/views/core/monitoring/data/BarChart.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-<template>
-	<div
-		:class="className"
-		:style="{ height: height, width: width, marginLeft: '10px' }" />
-</template>
-
-<script>
-import * as echarts from 'echarts';
-require('echarts/theme/macarons'); // echarts theme
-import resize from '@/utils/chartMixins/resize';
-
-const animationDuration = 1000;
-export default {
-	mixins: [resize],
-	props: {
-		className: {
-			type: String,
-			default: 'chart',
-		},
-		title: {
-			type: String,
-			default: '',
-		},
-		width: {
-			type: String,
-			default: '100%',
-		},
-		height: {
-			type: String,
-			default: '300px',
-		},
-		barData: {
-			type: Array,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			chart: null,
-			targetId: '',
-		};
-	},
-	beforeDestroy() {
-		if (!this.chart) {
-			return;
-		}
-		this.chart.dispose();
-		this.chart = null;
-	},
-	methods: {
-		initChart() {
-			this.chart = echarts.init(this.$el, 'macarons');
-			const _this = this;
-			this.chart.setOption({
-				title: {
-					text: this.title
-						? '{space|}{tip|}{space|}{value|' + this.title + '}'
-						: '',
-					textStyle: {
-						rich: {
-							tip: {
-								width: 6,
-								height: 6,
-								borderRadius: 50,
-								backgroundColor: '#288AFF',
-							},
-							space: {
-								width: 8,
-							},
-							value: {
-								fontSize: 14,
-								color: 'black',
-							},
-						},
-					},
-				},
-				color: ['#288AFF', '#8EF0AB', '#FFDC94'],
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'cross',
-						crossStyle: {
-							color: '#999',
-						},
-					},
-				},
-				legend: {
-					data: ['投入', '产出', '加工成品率'],
-				},
-				grid: {
-					containLabel: true,
-				},
-				xAxis: {
-					type: 'category',
-					data: this.barData.map((item) => {
-						return item.lineName;
-					}),
-					axisPointer: {
-						type: 'shadow',
-					},
-				},
-				yAxis: [
-					{
-						type: 'value',
-						name: '投入/产出 片',
-						min: 0,
-						axisLabel: {
-							formatter: '{value}',
-						},
-					},
-					{
-						type: 'value',
-						name: '加工成品率',
-						min: 0,
-						max: 100,
-						interval: 10,
-						axisLabel: {
-							formatter: '{value} %',
-						},
-					},
-				],
-				series: [
-					{
-						name: '投入',
-						type: 'bar',
-						barWidth: '20',
-						data: this.barData.map((item) => {
-							return item.inputNum;
-						}),
-						tooltip: {
-							valueFormatter: function (value) {
-								return value + ' 片';
-							},
-						},
-						animationDuration,
-					},
-					{
-						name: '产出',
-						type: 'bar',
-						barWidth: '20',
-						data: this.barData.map((item) => {
-							return item.outputNum;
-						}),
-						tooltip: {
-							valueFormatter: function (value) {
-								return value + ' 片';
-							},
-						},
-						animationDuration,
-					},
-					{
-						name: '加工成品率',
-						type: 'line',
-						yAxisIndex: 1,
-						tooltip: {
-							valueFormatter: function (value) {
-								return value + ' %';
-							},
-						},
-						data: this.barData.map((item) => {
-							return item.processingRatio;
-						}),
-					},
-				],
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/core/monitoring/data/baseTable.vue b/src/views/core/monitoring/data/baseTable.vue
deleted file mode 100644
index 4b292da6..00000000
--- a/src/views/core/monitoring/data/baseTable.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-	<div class="baseTable">
-		<el-table
-			:ref="id"
-			:data="renderData"
-			v-bind="$attrs"
-			:border="cancelBorder ? false : true"
-			@current-change="currentChange"
-			@selection-change="handleSelectionChange"
-			style="width: 100%"
-			:header-cell-style="{
-				background: '#F2F4F9',
-				color: '#606266',
-			}">
-			<!-- 多选 -->
-			<el-table-column
-				v-if="selectWidth"
-				type="selection"
-				:width="selectWidth" />
-			<!-- 序号 -->
-			<el-table-column
-				v-if="page && limit"
-				prop="_pageIndex"
-				:width="pageWidth"
-				align="center"
-				:fixed="cancelPageFixed ? false : true">
-				<template slot="header">
-					<el-popover placement="bottom-start" width="300" trigger="click">
-						<div
-							class="setting-box"
-							style="max-height: 400px; overflow-y: auto">
-							<el-checkbox
-								v-for="(item, index) in tableProps"
-								:key="'cb' + index"
-								v-model="selectedBox[index]"
-								:label="item.label" />
-						</div>
-						<i slot="reference" class="el-icon-s-tools" />
-					</el-popover>
-				</template>
-			</el-table-column>
-
-			<el-table-column
-				v-for="item in renderTableHeadList"
-				:key="item.prop"
-				v-bind="item"
-				:label="item.label"
-				:prop="item.prop"
-				:fixed="item.fixed || false"
-				:show-overflow-tooltip="item.showOverflowtooltip || false"
-				:sortable="item.sortable || false">
-				<template slot="header">
-					<span>{{ item.label }}</span>
-				</template>
-				<!-- 多表头 -->
-				<template v-if="item.children">
-					<el-table-column
-						v-for="sub in item.children"
-						:prop="sub.prop"
-						:key="sub.prop"
-						v-bind="sub"
-						:label="sub.label">
-						<template v-if="sub.children">
-							<el-table-column
-								v-for="ssub in sub.children"
-								:prop="ssub.prop"
-								:key="ssub.prop"
-								v-bind="ssub"
-								:label="ssub.label">
-								<template slot-scope="sscopeInner">
-									<component
-										:is="ssub.subcomponent"
-										v-if="ssub.subcomponent"
-										:key="sscopeInner.row.id"
-										:inject-data="{ ...sscopeInner.row, ...ssub }"
-										@emitData="emitData" />
-									<span v-else>
-										{{ sscopeInner.row[ssub.prop] | commonFilter(ssub.filter) }}
-									</span>
-								</template>
-							</el-table-column>
-						</template>
-						<template slot-scope="scopeInner">
-							<component
-								:is="sub.subcomponent"
-								v-if="sub.subcomponent"
-								:key="scopeInner.row.id"
-								:inject-data="{ ...scopeInner.row, ...sub }"
-								@emitData="emitData" />
-							<span v-else>
-								{{ scopeInner.row[sub.prop] | commonFilter(sub.filter) }}
-							</span>
-						</template>
-					</el-table-column>
-				</template>
-				<template slot-scope="scope">
-					<component
-						:is="item.subcomponent"
-						v-if="item.subcomponent"
-						:key="scope.row.id"
-						:itemProp="item.prop"
-						:inject-data="{ ...scope.row, ...item }"
-						@emitData="emitData" />
-					<span v-else>
-						{{ scope.row[item.prop] | commonFilter(item.filter) }}
-					</span>
-				</template>
-			</el-table-column>
-			<slot name="handleBtn" />
-		</el-table>
-		<!-- 表格底部加号 -->
-		<el-button
-			v-if="addButtonShow"
-			class="addButton"
-			icon="el-icon-plus"
-			@click="emitButtonClick">
-			{{ addButtonShow }}
-		</el-button>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'BaseTable',
-	filters: {
-		commonFilter: (source, filterType = (a) => a) => {
-			return filterType(source);
-		},
-	},
-	props: {
-		cancelBorder: {
-			type: Boolean,
-			default: false,
-		},
-		cancelPageFixed: {
-			type: Boolean,
-			default: false,
-		},
-		tableData: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-		tableProps: {
-			type: Array,
-			default: () => {
-				return [];
-			},
-		},
-		id: {
-			type: String,
-			required: false,
-			default: '',
-		},
-		page: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		pageWidth: {
-			type: Number,
-			required: false,
-			default: 70,
-		},
-		limit: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		selectWidth: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		addButtonShow: {
-			type: String,
-			required: false,
-			default: '',
-		},
-	},
-	data() {
-		return {
-			selectedBox: new Array(100).fill(true),
-		};
-	},
-	computed: {
-		renderTableHeadList() {
-			return this.tableProps.filter((item, index) => {
-				return this.selectedBox[index];
-			});
-		},
-		renderData() {
-			return this.tableData.map((item, index) => {
-				return {
-					...item,
-					_pageIndex: (this.page - 1) * this.limit + index + 1,
-				};
-			});
-		},
-	},
-	beforeMount() {
-		this.selectedBox = new Array(100).fill(true);
-	},
-	methods: {
-		currentChange(newVal, oldVal) {
-			this.$emit('current-change', { newVal, oldVal });
-		},
-		handleSelectionChange(val) {
-			this.$emit('selection-change', val);
-		},
-		emitData(val) {
-			this.$emit('emitFun', val);
-		},
-		emitButtonClick() {
-			this.$emit('emitButtonClick');
-		},
-		setCurrent(name, index) {
-			let _this = this;
-			let obj = _this.$refs[name].data[index];
-			_this.$refs[name].setCurrentRow(obj);
-		},
-		doLayout(name) {
-			this.$refs[name].doLayout();
-		},
-	},
-};
-</script>
-<style scoped>
-.baseTable .show-col-btn {
-	margin-right: 5px;
-	line-height: inherit;
-	cursor: pointer;
-}
-.baseTable .el-icon-refresh {
-	cursor: pointer;
-}
-</style>
-<style>
-.baseTable .el-table__body tr.current-row > td.el-table__cell {
-	background-color: #eaf1fc;
-}
-.baseTable .el-table .el-table__cell {
-	padding: 0;
-	height: 35px;
-}
-.baseTable .addButton {
-	width: 100%;
-	height: 35px;
-	border-top: none;
-	color: #0b58ff;
-	border-color: #ebeef5;
-	border-radius: 0;
-}
-.baseTable .addButton:hover {
-	color: #0b58ff;
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-.baseTable .addButton:focus {
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-
-.el-tooltip__popper.is-dark {
-	background: rgba(0, 0, 0, 0.6) !important;
-}
-.el-tooltip__popper .popper__arrow,
-.el-tooltip__popper .popper__arrow::after {
-	border-top-color: rgba(0, 0, 0, 0.4) !important;
-}
-</style>
diff --git a/src/views/core/monitoring/data/index-old.vue b/src/views/core/monitoring/data/index-old.vue
deleted file mode 100644
index 92723381..00000000
--- a/src/views/core/monitoring/data/index-old.vue
+++ /dev/null
@@ -1,314 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2024-12-02 13:43:57
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-if="showData.length"
-			class="right-aside"
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:selectWidth="55"
-			:table-data="showData"
-			@selection-change="selectChange"
-			>
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<div v-else class="no-data-bg"></div>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<el-dialog
-			title="提示"
-			:visible.sync="dialogVisible"
-			width="30%"
-			:before-close="handleClose">
-			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
-  		<el-button type="success" @click="exportPdf">pdf</el-button>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-			</span>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-import { getPdlDataSearch, getPdList } from '@/api/core/monitoring/data'
-import * as XLSX from 'xlsx'
-import FileSaver from 'file-saver'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
-
-const tableProps = [
-	{
-		prop: 'proLineName',
-		label: '产线名称'
-	},
-	{
-		prop: 'inputNum',
-		label: '投入数量/片'
-	},
-	{
-		prop: 'outputNum',
-		label: '产出数量/片'
-	},
-	{
-		prop: 'outputArea',
-		label: '产出面积/㎡',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'lossNum',
-		label: '损耗数量/片'
-	},
-	{
-		prop: 'lossArea',
-		label: '损耗面积/㎡',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'lossRate',
-		label: '损耗比例%',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	}
-];
-
-export default {
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getPdlDataSearch
-			},
-      tableData: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-				proLineId: undefined
-      },
-      exportLoading: false,
-      dataListLoading: false,
-			dialogVisible: false,
-      addOrEditTitle: '',
-      addOrUpdateVisible: false,
-			tableProps,
-			tableBtn: [],
-			showData: [],
-			tableData: [],
-			selectedList: [],
-			fileName: '',
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-          param: 'line'
-				},
-				{
-          type: 'datePicker',
-          label: '时间范围',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "yyyy-MM-ddTHH:mm:ss",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultSelect: [],
-          width: 350
-        },
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				}
-			],
-		};
-	},
-	created() {
-		if (this.$route.params.startTime) {
-			this.formConfig[1].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime]
-		}
-		// const time = new Date()
-		// this.formConfig[1].defaultSelect = [time, time]
-		this.getDataList()
-		this.getPdLineList()
-	},
-	methods: {
-		test() {
-			var target = document.getElementsByClassName("right-aside")[0]
-			target.style.background = '#FFFFFF'
-			var that = this
-			setTimeout(() => {
-				html2canvas(target).then(function(canvas) {
-						var contentWidth = canvas.width
-						var contentHeight = canvas.height
-
-						// 一页pdf显示html页面生成的canvas高度
-						var pageHeight = contentHeight / 592.28 * 841.89
-						// 未生成pdf的html页面高度
-						var leftHeight = contentHeight
-						// 页面偏移
-						var position = 0
-						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-						var imgWidth = 595.28
-						var imgHeight = 592.28 / contentWidth * contentHeight
-
-						var pageData = canvas.toDataURL('image/jpeg', 1.0)
-
-						console.log('nihc URL', leftHeight, pageHeight)
-
-						var pdf = new jsPDF('', 'pt', 'a4')
-
-						if (leftHeight < pageHeight) {
-							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
-						} else {
-							while(leftHeight > 0) {
-								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
-								leftHeight -= pageHeight
-								position -= 841.89
-								// 避免空白页
-								if (leftHeight > 0) {
-									pdf.addPage()
-								}
-							}
-						}
-
-						pdf.save(that.fileName + '产线产量.pdf')
-				})
-			}, 300)
-		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true)
-			const fix = tables.querySelector('.el-table__fixed')
-			const fixRight = tables.querySelector('.el-table__fixed-right')
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let exportTable = XLSX.utils.table_to_book(tables)
-
-      var exportTableOut = XLSX.write(exportTable, {
-        bookType: 'xlsx', bookSST: true, type: 'array'
-      })
-      // sheetjs.xlsx为导出表格的标题名称
-      try {
-        FileSaver.saveAs(new Blob([exportTableOut], {
-          type: 'application/octet-stream'
-        }), this.fileName + '产线产量.xlsx')
-      } catch (e) {
-        if (typeof console !== 'undefined') console.log(e, exportTableOut)
-      }
-      return exportTableOut
-    },
-		exportPdf() {
-			this.test()
-			setTimeout(() =>{
-				this.dialogVisible = false
-				this.showData = this.tableData
-			}, 600)
-
-		},
-		exportXlsx() {
-			this.exportECL()
-			this.dialogVisible = false
-			this.showData = this.tableData
-		},
-		handleClose(done) {
-			this.$confirm('确认关闭？')
-				.then(_ => {
-					done();
-				})
-				.catch(_ => {});
-		},
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[0].selectOptions = res.data || []
-			})
-		},
-		selectChange(val) {
-      console.log(val)
-      this.selectedList = val
-    },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.proLineId = val.line ? val.line : undefined;
-					this.listQuery.startTime = val.timeVal ? new Date(val.timeVal[0]).getTime() : undefined;
-					this.listQuery.endTime = val.timeVal ? new Date(val.timeVal[1]).getTime() : undefined;
-					if (val.timeVal && val.timeVal.length > 0) {
-						this.fileName = val.timeVal[0].slice(0, 10) + '-' + val.timeVal[1].slice(0, 10) + '_'
-          }
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data;
-        this.listQuery.total = response.data.length;
-        this.dataListLoading = false;
-				this.showData = this.tableData
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-		handleExport() {
-			if (this.selectedList.length > 0) {
-				this.showData = this.selectedList
-			}
-			this.dialogVisible = true
-    }
-	},
-};
-</script>
diff --git a/src/views/core/monitoring/data/index.vue b/src/views/core/monitoring/data/index.vue
deleted file mode 100644
index c2a8447a..00000000
--- a/src/views/core/monitoring/data/index.vue
+++ /dev/null
@@ -1,574 +0,0 @@
-<template>
-	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['当前', '历史']" @change="currentMenu">
-				<template v-slot:tab1>
-					<div>当前</div>
-				</template>
-				<template v-slot:tab2>
-					<div>历史</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div class="app-container energyOverlimitLog">
-			<div v-show="activeName === 'his'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig"
-					ref="searchBarForm"
-					@select-changed="handleSearchBarChanged"
-					@headBtnClick="buttonClick" />
-			</div>
-			<div v-show="activeName === 'now'"></div>
-			<!-- 列表 -->
-			<div v-if="activeName === 'his'">
-				<base-table-s
-					:page="1"
-					:limit="100"
-					:table-props="tableProps"
-					:table-data="tableData"
-					:max-height="tableH / 2"></base-table-s>
-				<div v-if="listQuery.lineId.length !== 1 && tableData.length > 0">
-					<barChart
-						style="margin-top: 50px"
-						ref="barChart"
-						height="600px"
-						:bar-data="tableData" />
-				</div>
-			</div>
-			<div v-if="activeName === 'now'">
-				<span class="blue-block"></span>
-				<span class="tip">当班数据</span>
-				<base-table-s
-					:page="1"
-					:limit="100"
-					:table-props="tableProps"
-					:table-data="tableData2"
-					:max-height="tableH / 2" />
-				<span class="blue-block"></span>
-				<span class="tip">当天数据</span>
-				<base-table-s
-					:page="1"
-					:limit="100"
-					:table-props="tableProps"
-					:table-data="tableData3"
-					:max-height="tableH / 2" />
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-import {
-	getPdlAutoReportNewSearch,
-	getPdlAutoReportNewSearchNow,
-} from '@/api/core/monitoring/data';
-import { getPdList } from '@/api/core/monitoring/auto';
-import { getFactoryPage } from '@/api/core/base/factory';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import ButtonNav from '@/components/ButtonNav';
-import baseTableS from './baseTable.vue';
-import barChart from './BarChart.vue';
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
-
-const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂',
-    fixed: true
-	},
-	{
-		prop: 'lineName',
-		label: '产线',
-    fixed: true
-	},
-	{
-		prop: 'sizes',
-		label: '规格',
-		width: 105,
-		showOverflowtooltip: true,
-    fixed: true
-	},
-
-	{
-		prop: 'inputN',
-		label: '投入',
-    align: 'center',
-		children: [ 
-			{
-				prop: 'inputNum',
-				label: '投入数量/片',
-			},
-			{
-				prop: 'inputArea',
-				label: '投入面积/m²',
-			},
-		],
-	},
-	{
-		prop: 'outputN',
-		label: '产出',
-    align: 'center',
-		children: [
-			{
-				prop: 'outputNum',
-				label: '产出数量/片',
-			},
-			{
-				prop: 'outputArea',
-				label: '产出面积/㎡',
-				filter: (val) => (val != null ? val.toFixed(2) : '-'),
-			},
-		],
-	},
-	{
-		prop: 'lossN',
-		label: '不良',
-    align: 'center',
-		children: [
-			{
-				prop: 'lossNum',
-				label: '不良数量/片',
-			},
-			{
-				prop: 'lossArea',
-				label: '不良面积/㎡',
-				filter: (val) => (val != null ? val.toFixed(2) : '-'),
-			},
-		],
-	},
-	{
-		prop: 'lossRatio',
-		label: '不良率/%',
-		filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'outputRatio',
-		label: '投入产出率/%',
-		filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'processingRatio',
-		label: '加工成品率/%',
-		filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'lossD',
-		label: '不良详情',
-    align: 'center',
-		children: [
-			{
-				prop: 'original',
-				label: '原片',
-        align: 'center',
-				children: [
-					{
-						prop: 'originalLossNum',
-						label: '原片不良/片',
-					},
-					{
-						prop: 'originalLossArea',
-						label: '原片不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-			{
-				prop: 'edge',
-				label: '磨边',
-        align: 'center',
-				children: [
-					{
-						prop: 'edgeLossNum',
-						label: '磨边不良/片',
-					},
-					{
-						prop: 'edgeLossArea',
-						label: '磨边不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-			{
-				prop: 'drill',
-				label: '打孔',
-        align: 'center',
-				children: [
-					{
-						prop: 'drillLossNum',
-						label: '打孔不良/片',
-					},
-					{
-						prop: 'drillLossArea',
-						label: '打孔不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-			{
-				prop: 'coating',
-				label: '镀膜',
-        align: 'center',
-				children: [
-					{
-						prop: 'coatingLossNum',
-						label: '镀膜不良/片',
-					},
-					{
-						prop: 'coatingLossArea',
-						label: '镀膜不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-			{
-				prop: 'silk',
-				label: '丝印',
-        align: 'center',
-				children: [
-					{
-						prop: 'silkLossNum',
-						label: '丝印不良/片',
-					},
-					{
-						prop: 'silkLossArea',
-						label: '丝印不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-			{
-				prop: 'tempering',
-				label: '钢化',
-        align: 'center',
-				children: [
-					{
-						prop: 'temperingLossNum',
-						label: '钢化不良/片',
-					},
-					{
-						prop: 'temperingLossArea',
-						label: '钢化不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-			{
-				prop: 'packing',
-				label: '包装',
-        align: 'center',
-				children: [
-					{
-						prop: 'packingLossNum',
-						label: '包装不良/片',
-					},
-					{
-						prop: 'packingLossArea',
-						label: '包装不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-					},
-				],
-			},
-		],
-	},
-];
-export default {
-	name: '',
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getPdlAutoReportNewSearch,
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'lineId',
-					multiple: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'timestamp',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'timeVal',
-					width: 350,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			listQuery: {
-				lineId: [],
-			},
-			activeName: 'now',
-			tableProps,
-			tableData: [],
-			tableData2: [],
-			tableData3: [],
-		};
-	},
-	components: {
-		ButtonNav,
-		baseTableS,
-		barChart,
-	},
-	created() {
-		this.getPdLineList();
-	},
-	methods: {
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.lineId = val.lineId || [];
-					this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined;
-					this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined;
-					if (this.activeName === 'his') {
-						this.getDataList();
-					} else {
-						this.getDataList2();
-					}
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		currentMenu(val) {
-			this.activeName = val === '历史' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.factoryId = undefined;
-				this.listQuery.lineId = [];
-				// 获取当前时间
-				const now = new Date();
-				// 获取前一天的同一时间
-				const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000);
-				// 设置为00:00:00
-				yesterday.setHours(0, 0, 0, 0);
-				// 设置为23:59:59
-				const end = new Date(yesterday.getTime());
-				end.setHours(23, 59, 59, 59);
-				this.listQuery.startTime = yesterday.getTime();
-				this.listQuery.endTime = end.getTime();
-				this.$nextTick(() => {
-					this.$refs.searchBarForm.formInline.timeVal = [
-						yesterday.getTime(),
-						end.getTime(),
-					];
-				});
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-		},
-		// 获取数据列表
-		getDataList() {
-			if (this.listQuery.startTime) {
-				this.dataListLoading = true;
-				this.urlOptions.getDataListURL(this.listQuery).then((response) => {
-					this.tableData = response.data.map((item, index) => {
-						item.originalLossNum = item.original?.lossNum;
-						item.originalLossArea = item.original?.lossArea;
-						item.edgeLossNum = item.edge?.lossNum;
-						item.edgeLossArea = item.edge?.lossArea;
-						item.drillLossNum = item.drill?.lossNum;
-						item.drillLossArea = item.drill?.lossArea;
-						item.coatingLossNum = item.coating?.lossNum;
-						item.coatingLossArea = item.coating?.lossArea;
-						item.silkLossNum = item.silk?.lossNum;
-						item.silkLossArea = item.silk?.lossArea;
-						item.temperingLossNum = item.tempering?.lossNum;
-						item.temperingLossArea = item.tempering?.lossArea;
-						item.packingLossNum = item.packing?.lossNum;
-						item.packingLossArea = item.packing?.lossArea;
-						return item;
-					});
-					this.$nextTick(() => {
-            if(this.tableData.length>0){
-              this.$refs.barChart.initChart();
-            }
-					});
-					this.dataListLoading = false;
-				});
-			} else {
-				this.$message.warning('请选择时间范围');
-			}
-		},
-		// 获取数据2列表
-		getDataList2() {
-			getPdlAutoReportNewSearchNow().then((response) => {
-				this.tableData2 = response.data.classData.map((item, index) => {
-					item.originalLossNum = item.original?.lossNum;
-					item.originalLossArea = item.original?.lossArea;
-					item.edgeLossNum = item.edge?.lossNum;
-					item.edgeLossArea = item.edge?.lossArea;
-					item.drillLossNum = item.drill?.lossNum;
-					item.drillLossArea = item.drill?.lossArea;
-					item.coatingLossNum = item.coating?.lossNum;
-					item.coatingLossArea = item.coating?.lossArea;
-					item.silkLossNum = item.silk?.lossNum;
-					item.silkLossArea = item.silk?.lossArea;
-					item.temperingLossNum = item.tempering?.lossNum;
-					item.temperingLossArea = item.tempering?.lossArea;
-					item.packingLossNum = item.packing?.lossNum;
-					item.packingLossArea = item.packing?.lossArea;
-					return item;
-				});
-				this.tableData3 = response.data.todayData.map((item, index) => {
-					item.originalLossNum = item.original?.lossNum;
-					item.originalLossArea = item.original?.lossArea;
-					item.edgeLossNum = item.edge?.lossNum;
-					item.edgeLossArea = item.edge?.lossArea;
-					item.drillLossNum = item.drill?.lossNum;
-					item.drillLossArea = item.drill?.lossArea;
-					item.coatingLossNum = item.coating?.lossNum;
-					item.coatingLossArea = item.coating?.lossArea;
-					item.silkLossNum = item.silk?.lossNum;
-					item.silkLossArea = item.silk?.lossArea;
-					item.temperingLossNum = item.tempering?.lossNum;
-					item.temperingLossArea = item.tempering?.lossArea;
-					item.packingLossNum = item.packing?.lossNum;
-					item.packingLossArea = item.packing?.lossArea;
-					return item;
-				});
-			});
-		},
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.lineId = [];
-			this.$refs.searchBarForm.formInline.lineId = undefined;
-			getPdList(value).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
-		/** 导出按钮操作 */
-
-		handleExport() {
-			let tables = document.querySelector('.el-table').cloneNode(true);
-			const fix = tables.querySelector('.el-table__fixed');
-			const fixRight = tables.querySelector('.el-table__fixed-right');
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'));
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'));
-			}
-			let exportTable = XLSX.utils.table_to_book(tables);
-      exportTable.Sheets.Sheet1.A1.v = '序号' //导出表格第一列表头为序号
-
-			var exportTableOut = XLSX.write(exportTable, {
-				bookType: 'xlsx',
-				bookSST: true,
-				type: 'array',
-			});
-			// sheetjs.xlsx为导出表格的标题名称
-			try {
-				FileSaver.saveAs(
-					new Blob([exportTableOut], {
-						type: 'application/octet-stream',
-					}),
-					'产线统计数据.xlsx'
-				);
-			} catch (e) {
-				if (typeof console !== 'undefined') console.log(e, exportTableOut);
-			}
-			return exportTableOut;
-		},
-	},
-};
-</script>
-<style lang="scss">
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-	.blue-block {
-		float: left;
-		display: inline-block;
-		width: 4px;
-		height: 16px;
-		background-color: #0b58ff;
-		border-radius: 1px;
-		margin-right: 8px;
-		margin-top: 12px;
-	}
-	.tip {
-		display: inline-block;
-		font-size: 16px;
-		margin-right: 8px;
-		margin-top: 10px;
-	}
-}
-</style>
diff --git a/src/views/core/monitoring/data24/index.vue b/src/views/core/monitoring/data24/index.vue
deleted file mode 100644
index 4aa67999..00000000
--- a/src/views/core/monitoring/data24/index.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-08-04 14:44:58
-    description: 设备24小时生产记录
--->
-<template>
-	<div class="app-container">
-		<SearchBar
-			:formConfigs="[{ label: '近24小时产线生产数据', type: 'title' }]"
-			ref="search-bar" />
-		<el-skeleton v-if="initing" :rows="6" animated />
-		<!-- :span-method="mergeColumnHandler" -->
-		<div v-else :class="{ 'no-data-bg': !tableData || tableData.length == 0 }">
-		<base-table
-		v-if="tableData && tableData.length > 0"
-			:table-props="tableProps"
-			:table-data="tableData"
-							:max-height="tableH"
-			@emitFun="handleEmitFun"
-		/>
-		</div>
-	</div>
-</template>
-
-<script>
-import { getPdlDataOneDay } from '@/api/core/monitoring/data24'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-
-export default {
-	name: 'productionLineData24',
-	components: {},
-	props: {},
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-      urlOptions: {
-				getDataListURL: getPdlDataOneDay
-			},
-			initing: false,
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-			},
-			list: [],
-			arr: [],
-			spanArr: [],
-			timeList: [],
-			tableData: [],
-			tableProps: [],
-			spanInfo: {},
-		};
-	},
-	computed: {},
-	mounted() {
-		this.getList();
-	},
-	methods: {
-		/** 构建tableProps - 依据第一个元素所提供的信息 */
-		buildProps(plData) {
-			plData.forEach(item => {
-				this.timeList.push(item.name)
-			})
-			const timeArray = Array.from(new Set(this.timeList))
-			console.log('nihc', timeArray)
-			for (const times of timeArray) {
-				if (times !== '投入数量' && times !== '产出数量' && times !== '报废数量' && times !== '产出面积') {
-					const subprop = {
-						label: times.slice(0, 10) + ' ' + times.slice(11),
-						align: 'center',
-						children: [
-							{ prop: times + '_in', label: '投入数量',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'), },
-							{ prop: times + '_out', label: '产出数量',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'), },
-							{ prop: times + '_junk', label: '报废数量',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'), },
-							{ prop: times + '_area', label: '产出面积',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'), }
-						]
-					}
-					this.arr.push(subprop)
-				}
-			}
-			this.tableProps = this.arr
-		},
-		setRowSpan(arr) {
-      let count = 0
-      arr.forEach((item, index) => {
-        if(index === 0) {
-          this.spanArr.push(1)
-        } else {
-          if (item === arr[index - 1]) {
-            this.spanArr[count] += 1
-            this.spanArr.push(0)
-          } else {
-            count = index
-            this.spanArr.push(1)
-          }
-        }
-      })
-      console.log('打印数组长度', this.spanArr)
-    },
-
-		/** 把 list 里的数据转换成 tableProps 对应的格式 */
-		convertList(list) {
-			let sectionArr= []
-			console.log('打印看下数据list', list)
-			list.forEach((ele, index) => {
-				let tempData = []
-				ele.data.forEach(item => {
-					item.children.forEach(params => {
-						if (params.dynamicName === '投入数量') {
-							tempData[item.dynamicName + '_in'] = params.dynamicValue
-						} else if (params.dynamicName === '产出数量') {
-							tempData[item.dynamicName + '_out'] = params.dynamicValue
-						} else if (params.dynamicName === '报废数量') {
-							tempData[item.dynamicName + '_junk'] = params.dynamicValue
-						} else {
-							tempData[item.dynamicName + '_area'] = params.dynamicValue
-						}
-					})
-				})
-				tempData['proLineName'] = ele.proLineName
-				tempData['spec'] = ele.spec
-				this.tableData.push(tempData)
-				console.log('看看数据', this.tableData, tempData)
-				const { proLineName } = tempData
-				sectionArr.push(proLineName)
-			})
-			this.setRowSpan(sectionArr)
-			console.log('工段名称列表', sectionArr)
-		},
-
-		buildData(data) {
-			this.convertList(data);
-		},
-
-		/** 合并table列的规则 */
-		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
-			if (columnIndex == 0) {
-				if (this.spanArr[rowIndex]) {
-					return [
-						this.spanArr[rowIndex], // row span
-						1, // col span
-					];
-				} else {
-					return [0, 0];
-				}
-			}
-		},
-
-		async getList() {
-      this.urlOptions.getDataListURL().then(res => {
-        console.log('看看数据', res)
-				this.arr = [
-          {
-            prop: 'proLineName',
-            label: '生产线',
-						fixed: 'left',
-						showOverflowTooltip: true
-          },
-          {
-            prop: 'spec',
-            label: '产品规格',
-						fixed: 'left',
-						showOverflowTooltip: true
-          }
-				]
-				this.buildProps(res.data.nameData);
-				this.buildData(res.data.data);
-      })
-
-			// // const data = this.res.data;
-			// // console.log('recent-24', data);
-
-			// this.initing = true;
-
-			// this.queryParams.pageSize = this.list.length;
-
-			// setTimeout(() => {
-			// 	this.initing = false;
-			// }, 1000);
-		},
-
-		handleEmitFun(payload) {
-			console.log('payload', payload);
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-::-webkit-scrollbar {
-	display: none;
-}
-
-pre {
-	margin: 10px;
-	background: #f6f8faf6;
-	border: 1px solid #e1e4e8;
-	padding: 12px;
-	border-radius: 12px;
-	position: fixed;
-	// top: 15vh;
-	top: 10vh;
-	left: 0;
-	max-height: 80vh;
-	overflow-y: auto;
-	z-index: 100000;
-	box-shadow: 0 0 32px 12px #0001;
-}
-
-code {
-	font-family: 'IntelOne Mono', 'Ubuntu', 'Courier New', Courier, monospace;
-}
-</style>
diff --git a/src/views/core/monitoring/lineAuto/BarChart.vue b/src/views/core/monitoring/lineAuto/BarChart.vue
deleted file mode 100644
index d823cedd..00000000
--- a/src/views/core/monitoring/lineAuto/BarChart.vue
+++ /dev/null
@@ -1,272 +0,0 @@
-<template>
-  <div :class="className" :style="{ height: height, width: width, marginLeft: '10px' }" />
-</template>
-
-<script>
-import * as echarts from 'echarts';
-require('echarts/theme/macarons'); // 引入主题
-import resize from '@/utils/chartMixins/resize';
-
-const animationDuration = 1000;
-
-export default {
-  mixins: [resize], // 混入 resize 逻辑（自适应窗口）
-  props: {
-    className: {
-      type: String,
-      default: 'chart',
-    },
-    title: {
-      type: String,
-      default: '',
-    },
-    width: {
-      type: String,
-      default: '100%',
-    },
-    height: {
-      type: String,
-      default: '300px',
-    },
-    barData: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data() {
-    return {
-      chart: null, // 图表实例
-    };
-  },
-  watch: {
-    // 监听 barData 变化（深度监听数组内部元素）
-    barData: {
-      deep: true,
-      handler: 'handleBarDataChange', // 调用处理方法
-    },
-  },
-  mounted() {
-    // 组件挂载后初始化图表（确保 DOM 已就绪）
-    this.$nextTick(() => {
-      this.initChart();
-    });
-  },
-  beforeDestroy() {
-    // 组件销毁前清理图表实例
-    if (this.chart) {
-      this.chart.dispose();
-      this.chart = null;
-    }
-  },
-  methods: {
-    // barData 变化时的处理方法
-    handleBarDataChange() {
-      // 确保 DOM 存在再更新图表
-      this.$nextTick(() => {
-        // 如果图表未初始化，先初始化；否则直接更新数据
-        if (!this.chart) {
-          this.initChart();
-        } else {
-          this.updateChart();
-        }
-      });
-    },
-
-    // 初始化图表
-    initChart() {
-      // 避免重复初始化（先销毁旧实例）
-      if (this.chart) {
-        this.chart.dispose();
-      }
-
-      // 确保 DOM 元素存在
-      if (!this.$el) {
-        console.error('图表容器 DOM 元素不存在');
-        return;
-      }
-
-      // 初始化图表实例
-      this.chart = echarts.init(this.$el, 'macarons');
-      // 设置图表配置
-      this.setChartOption();
-    },
-
-    // 更新图表数据（复用配置逻辑）
-    updateChart() {
-      if (!this.chart) return;
-      this.setChartOption();
-    },
-
-    // 图表配置项（抽离为单独方法，方便初始化和更新复用）
-    setChartOption() {
-      const dataValues = this.barData.flatMap(item => [item.inputNum || 0, item.outputNum || 0]);
-      const maxData = Math.max(...dataValues, 0); // 加 0 确保无数据时 maxData 为 0
-
-      // 2. 计算 Y 轴最大值（留 10% 余量，避免数据顶到顶部）
-      let yMax = 0;
-      if (maxData > 0) {
-        yMax = Math.ceil(maxData * 1.1); // 向上取整，确保刻度为整数
-      } else {
-        yMax = 100; // 无数据时默认最大值为 100，避免 Y 轴消失
-      }
-
-      // 3. 计算 interval（5 个刻度对应 4 个间隔，向上取整确保间隔为整数）
-      const yInterval = Math.ceil((yMax - 0) / 4); // min 固定为 0，直接减 0
-
-      this.chart.setOption({
-        title: {
-          text: this.title
-            ? '{space|}{tip|}{space|}{value|' + this.title + '}'
-            : '',
-          textStyle: {
-            rich: {
-              tip: {
-                width: 6,
-                height: 6,
-                borderRadius: 50,
-                backgroundColor: '#288AFF',
-              },
-              space: {
-                width: 8,
-              },
-              value: {
-                fontSize: 14,
-                color: 'black',
-              },
-            },
-          },
-        },
-        color: ['#288AFF', '#8EF0AB', '#FFDC94'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross',
-            crossStyle: {
-              color: '#999',
-            },
-          },
-        },
-        legend: {
-          data: ['投入', '产出', '加工成品率'],
-        },
-        grid: {
-          left: 20,
-          right: 30,
-          top:40,
-          bottom: 10,
-
-          containLabel: true,
-          splitArea: {
-            show: false // 关键：关闭网格背景分区（去掉间隔色块）
-          }
-        },
-        xAxis: {
-          type: 'category',
-          data: this.barData.map((item) => item.lineName),
-          axisLine: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, 0.45)',
-              width: 1 // 轴线宽度（可选，默认 1，可按需调整）
-            }
-          },
-          // 2. 控制 X 轴刻度线颜色（与轴线颜色保持一致，视觉统一）
-          axisTick: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, 0.45)', // 刻度线颜色，需与轴线颜色匹配
-              width: 1 // 刻度线宽度（可选）
-            },
-            alignWithLabel: true // 可选：让刻度线与文字对齐（避免文字偏移时刻度线错位）
-          },
-          // 3. 控制 X 轴文字颜色（如：深灰色 rgba(0, 0, 0, 0.45)）
-          axisLabel: {
-            color: 'rgba(0, 0, 0, 0.45)6', // 文字颜色，可自定义
-            fontSize: 12, // 可选：调整文字大小（默认 12，按需修改）
-            // 可选：文字过长时换行/省略（避免文字重叠，按需开启）
-            formatter: (value) => {
-              // 示例：文字超过 6 个字符时换行（可根据需求调整字符数）
-              if (value.length > 6) {
-                return value.slice(0, 6) + '\n' + value.slice(6);
-              }
-              return value;
-            }
-          },
-          // 原有配置（若需保留可解开注释）
-          // axisPointer: {
-          //   type: 'shadow',
-          // }
-        },
-        yAxis: [
-          {
-            type: 'value',
-            name: '投入/产出 片',
-            min: 0, // 最小值固定为 0
-            max: yMax,
-            interval: yInterval,
-            splitArea: {
-              show: false
-            },
-            axisLabel: {
-              formatter: '{value}',
-              color: 'rgba(0, 0, 0, 0.45)'
-            },
-
-            // 可选：修改 Y 轴名称颜色（与文字颜色保持一致）
-            nameTextStyle: {
-              color: 'rgba(0, 0, 0, 0.45)'
-            }
-          },
-          {
-            type: 'value',
-            name: '加工成品率',
-            min: 0,
-            max: 100, // 成品率固定 0-100%
-            interval: 25, // 100 / 4 = 25，刚好 5 个刻度（0、25、50、75、100）
-            axisLabel: {
-              formatter: '{value} %',
-              color: 'rgba(0, 0, 0, 0.45)'
-            },
-            splitArea: {
-              show: false
-            },
-            // 可选：修改 Y 轴名称颜色
-            nameTextStyle: {
-              color: 'rgba(0, 0, 0, 0.45)'
-            }
-          },
-        ],
-        series: [
-          {
-            name: '投入',
-            type: 'bar',
-            barWidth: '20',
-            data: this.barData.map((item) => item.inputNum),
-            tooltip: {
-              valueFormatter: (value) => `${value} 片`,
-            },
-            animationDuration,
-          },
-          {
-            name: '产出',
-            type: 'bar',
-            barWidth: '20',
-            data: this.barData.map((item) => item.outputNum),
-            tooltip: {
-              valueFormatter: (value) => `${value} 片`,
-            },
-            animationDuration,
-          },
-          {
-            name: '加工成品率',
-            type: 'line',
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: (value) => `${value} %`,
-            },
-            data: this.barData.map((item) => item.processingRatio),
-          },
-        ],
-      });
-    },
-  },
-};
-</script>
diff --git a/src/views/core/monitoring/lineAuto/baseTable.vue b/src/views/core/monitoring/lineAuto/baseTable.vue
deleted file mode 100644
index 4b292da6..00000000
--- a/src/views/core/monitoring/lineAuto/baseTable.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-	<div class="baseTable">
-		<el-table
-			:ref="id"
-			:data="renderData"
-			v-bind="$attrs"
-			:border="cancelBorder ? false : true"
-			@current-change="currentChange"
-			@selection-change="handleSelectionChange"
-			style="width: 100%"
-			:header-cell-style="{
-				background: '#F2F4F9',
-				color: '#606266',
-			}">
-			<!-- 多选 -->
-			<el-table-column
-				v-if="selectWidth"
-				type="selection"
-				:width="selectWidth" />
-			<!-- 序号 -->
-			<el-table-column
-				v-if="page && limit"
-				prop="_pageIndex"
-				:width="pageWidth"
-				align="center"
-				:fixed="cancelPageFixed ? false : true">
-				<template slot="header">
-					<el-popover placement="bottom-start" width="300" trigger="click">
-						<div
-							class="setting-box"
-							style="max-height: 400px; overflow-y: auto">
-							<el-checkbox
-								v-for="(item, index) in tableProps"
-								:key="'cb' + index"
-								v-model="selectedBox[index]"
-								:label="item.label" />
-						</div>
-						<i slot="reference" class="el-icon-s-tools" />
-					</el-popover>
-				</template>
-			</el-table-column>
-
-			<el-table-column
-				v-for="item in renderTableHeadList"
-				:key="item.prop"
-				v-bind="item"
-				:label="item.label"
-				:prop="item.prop"
-				:fixed="item.fixed || false"
-				:show-overflow-tooltip="item.showOverflowtooltip || false"
-				:sortable="item.sortable || false">
-				<template slot="header">
-					<span>{{ item.label }}</span>
-				</template>
-				<!-- 多表头 -->
-				<template v-if="item.children">
-					<el-table-column
-						v-for="sub in item.children"
-						:prop="sub.prop"
-						:key="sub.prop"
-						v-bind="sub"
-						:label="sub.label">
-						<template v-if="sub.children">
-							<el-table-column
-								v-for="ssub in sub.children"
-								:prop="ssub.prop"
-								:key="ssub.prop"
-								v-bind="ssub"
-								:label="ssub.label">
-								<template slot-scope="sscopeInner">
-									<component
-										:is="ssub.subcomponent"
-										v-if="ssub.subcomponent"
-										:key="sscopeInner.row.id"
-										:inject-data="{ ...sscopeInner.row, ...ssub }"
-										@emitData="emitData" />
-									<span v-else>
-										{{ sscopeInner.row[ssub.prop] | commonFilter(ssub.filter) }}
-									</span>
-								</template>
-							</el-table-column>
-						</template>
-						<template slot-scope="scopeInner">
-							<component
-								:is="sub.subcomponent"
-								v-if="sub.subcomponent"
-								:key="scopeInner.row.id"
-								:inject-data="{ ...scopeInner.row, ...sub }"
-								@emitData="emitData" />
-							<span v-else>
-								{{ scopeInner.row[sub.prop] | commonFilter(sub.filter) }}
-							</span>
-						</template>
-					</el-table-column>
-				</template>
-				<template slot-scope="scope">
-					<component
-						:is="item.subcomponent"
-						v-if="item.subcomponent"
-						:key="scope.row.id"
-						:itemProp="item.prop"
-						:inject-data="{ ...scope.row, ...item }"
-						@emitData="emitData" />
-					<span v-else>
-						{{ scope.row[item.prop] | commonFilter(item.filter) }}
-					</span>
-				</template>
-			</el-table-column>
-			<slot name="handleBtn" />
-		</el-table>
-		<!-- 表格底部加号 -->
-		<el-button
-			v-if="addButtonShow"
-			class="addButton"
-			icon="el-icon-plus"
-			@click="emitButtonClick">
-			{{ addButtonShow }}
-		</el-button>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'BaseTable',
-	filters: {
-		commonFilter: (source, filterType = (a) => a) => {
-			return filterType(source);
-		},
-	},
-	props: {
-		cancelBorder: {
-			type: Boolean,
-			default: false,
-		},
-		cancelPageFixed: {
-			type: Boolean,
-			default: false,
-		},
-		tableData: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-		tableProps: {
-			type: Array,
-			default: () => {
-				return [];
-			},
-		},
-		id: {
-			type: String,
-			required: false,
-			default: '',
-		},
-		page: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		pageWidth: {
-			type: Number,
-			required: false,
-			default: 70,
-		},
-		limit: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		selectWidth: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		addButtonShow: {
-			type: String,
-			required: false,
-			default: '',
-		},
-	},
-	data() {
-		return {
-			selectedBox: new Array(100).fill(true),
-		};
-	},
-	computed: {
-		renderTableHeadList() {
-			return this.tableProps.filter((item, index) => {
-				return this.selectedBox[index];
-			});
-		},
-		renderData() {
-			return this.tableData.map((item, index) => {
-				return {
-					...item,
-					_pageIndex: (this.page - 1) * this.limit + index + 1,
-				};
-			});
-		},
-	},
-	beforeMount() {
-		this.selectedBox = new Array(100).fill(true);
-	},
-	methods: {
-		currentChange(newVal, oldVal) {
-			this.$emit('current-change', { newVal, oldVal });
-		},
-		handleSelectionChange(val) {
-			this.$emit('selection-change', val);
-		},
-		emitData(val) {
-			this.$emit('emitFun', val);
-		},
-		emitButtonClick() {
-			this.$emit('emitButtonClick');
-		},
-		setCurrent(name, index) {
-			let _this = this;
-			let obj = _this.$refs[name].data[index];
-			_this.$refs[name].setCurrentRow(obj);
-		},
-		doLayout(name) {
-			this.$refs[name].doLayout();
-		},
-	},
-};
-</script>
-<style scoped>
-.baseTable .show-col-btn {
-	margin-right: 5px;
-	line-height: inherit;
-	cursor: pointer;
-}
-.baseTable .el-icon-refresh {
-	cursor: pointer;
-}
-</style>
-<style>
-.baseTable .el-table__body tr.current-row > td.el-table__cell {
-	background-color: #eaf1fc;
-}
-.baseTable .el-table .el-table__cell {
-	padding: 0;
-	height: 35px;
-}
-.baseTable .addButton {
-	width: 100%;
-	height: 35px;
-	border-top: none;
-	color: #0b58ff;
-	border-color: #ebeef5;
-	border-radius: 0;
-}
-.baseTable .addButton:hover {
-	color: #0b58ff;
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-.baseTable .addButton:focus {
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-
-.el-tooltip__popper.is-dark {
-	background: rgba(0, 0, 0, 0.6) !important;
-}
-.el-tooltip__popper .popper__arrow,
-.el-tooltip__popper .popper__arrow::after {
-	border-top-color: rgba(0, 0, 0, 0.4) !important;
-}
-</style>
diff --git a/src/views/core/monitoring/lineAuto/index.vue b/src/views/core/monitoring/lineAuto/index.vue
deleted file mode 100644
index 6ca68b83..00000000
--- a/src/views/core/monitoring/lineAuto/index.vue
+++ /dev/null
@@ -1,1362 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 1. 顶部导航栏（固定高度） -->
-    <div class="top-nav">
-      <ButtonNav ref="buttonNav" :menus="['按产线监控', '按产品监控']" @change="currentMenu">
-        <template v-slot:tab1>
-          <div>按产线监控</div>
-        </template>
-        <template v-slot:tab2>
-          <div>按产品监控</div>
-        </template>
-      </ButtonNav>
-    </div>
-
-    <!-- 2. 搜索栏（固定高度，占自身空间） -->
-    <div class="search-container energyOverlimitLog">
-      <span class="blue-block"></span>
-      <span class="tip">生产监控</span>
-      <search-bar :isFold="true" removeBlue :formConfigs="formConfig" ref="searchBarForm"
-        @select-changed="handleSearchBarChanged" @headBtnClick="buttonClick" />
-    </div>
-
-    <!-- 3. 内容区外层容器（占满剩余空间，Flex垂直布局） -->
-    <div v-if="activeName === 'productLine'">
-      <div class="content-wrapper">
-        <!-- 3.1 时间维度为“当天”时的内容（两个平分高度的div） -->
-        <div class="content-inner" v-if="listQuery.timeType === 1">
-          <!-- 当班数据（占1/2剩余高度） -->
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip">当班数据</span>
-            <el-row style="margin-top: 10px;">
-              <el-col class="custom-tabs">
-                <el-tabs v-model="activeLabel" :stretch="true" @tab-click="handleTabClick">
-                  <el-tab-pane :label="'全部数据'" name="table">
-                    <base-table-s ref="lineCurrentShiftTable" style="margin-bottom: 16px;" v-if="activeLabel == 'table'"
-                      :page="1" :limit="100" :table-props="tableProps" :table-data="tableData" :max-height="210" />
-                  </el-tab-pane>
-                  <el-tab-pane :label="'\u3000当天生产折线图\u3000'" name="graph">
-                    <div style="height: 230px;" v-if="activeLabel == 'graph'" class="graph">
-                      <barChart v-if="tableData && tableData.length > 0" ref="barChart" height="230px"
-                        :bar-data="tableData" />
-                      <div v-else class="no-data-bg"></div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </el-col>
-            </el-row>
-          </div>
-
-          <!-- 当天数据（占1/2剩余高度） -->
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip">当天数据</span>
-            <el-row style="margin-top: 10px;">
-              <el-col class="custom-tabs">
-                <el-tabs v-model="activeLabelDay" :stretch="true" @tab-click="handleTabClick">
-                  <el-tab-pane :label="'全部数据'" name="table">
-                    <base-table-s ref="lineTodayTable" style="margin-bottom: 16px;" v-if="activeLabelDay == 'table'"
-                      :page="1" :limit="100" :table-props="tableProps" :table-data="tableData2" :max-height="210" />
-                  </el-tab-pane>
-                  <el-tab-pane :label="'\u3000当天生产折线图\u3000'" name="graph">
-                    <div style="height: 230px;" v-if="activeLabelDay == 'graph'" class="graph">
-                      <barChart v-if="tableData2 && tableData2.length > 0" ref="barChart" height="230px"
-                        :bar-data="tableData2" />
-                      <div v-else class="no-data-bg"></div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </el-col>
-            </el-row>
-          </div>
-        </div>
-
-        <!-- 3.2 时间维度为“自定义”时的内容（两个平分高度的div） -->
-        <div class="content-inner" v-else>
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip" v-if="listQuery.startTime && listQuery.endTime">
-              <span>{{ reportTypeMap[listQuery.reportType] }}</span>
-              <span>
-                {{ parseTime(listQuery.startTime) }} 至{{
-                  parseTime(listQuery.endTime) }}
-              </span>
-            </span>
-            <span class="tip" v-else>生产表格数据 </span>
-            <div class="graph">
-              <base-table-s ref="lineCustomTable" style="margin-bottom: 16px;" v-if="activeLabel == 'table'" :page="1"
-                :limit="100" :table-props="tableProps" :max-height="210" :table-data="tableDataCustom" />
-            </div>
-          </div>
-
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip">生产折线图</span>
-            <div style="width: 100%;height: 100%;" class="graph">
-              <barChart v-if="tableDataCustom && tableDataCustom.length > 0" ref="barChart"
-                :bar-data="tableDataCustom" />
-              <div v-else class="no-data-bg"></div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div v-else>
-      <div v-if="this.listQuery.timeType === 1" class="content-wrapper">
-        <!-- 3.1 时间维度为“当天”时的内容（两个平分高度的div） -->
-        <div class="content-inner">
-          <!-- 当班数据（占1/2剩余高度） -->
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip">当班数据</span>
-            <base-table-s ref="productCurrentShiftTable" style="margin-bottom: 16px;" v-if="activeLabel == 'table'"
-              :page="1" :limit="100" :table-props="productTableProps" :table-data="productTableData"
-              :max-height="210" />
-          </div>
-
-          <!-- 当天数据（占1/2剩余高度） -->
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip">当天数据</span>
-            <base-table-s ref="productTodayTable" style="margin-bottom: 16px;" v-if="activeLabelDay == 'table'"
-              :page="1" :limit="100" :table-props="productTablePropsDay" :table-data="productTableDataDay"
-              :max-height="210" />
-          </div>
-        </div>
-      </div>
-
-      <div v-else class="content-wrapper">
-        <!-- 3.1 时间维度为“当天”时的内容（两个平分高度的div） -->
-        <div class="content-inner">
-          <!-- 当班数据（占1/2剩余高度） -->
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip" v-if="listQuery.startTime && listQuery.endTime">
-              <span>{{ reportTypeMap[listQuery.reportType] }}</span>
-              <span>
-                {{ parseTime(listQuery.startTime) }} 至{{
-                  parseTime(listQuery.endTime) }}
-              </span>
-            </span>
-            <span class="tip" v-else>生产表格数据 </span>
-            <base-table-s ref="productCustomTable" style="margin-bottom: 16px;" v-if="activeLabel == 'table'" :page="1"
-              :limit="100" :table-props="productTableProps" :table-data="productTableData" :max-height="210" />
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { parseTime } from '@/filter/code-filter';
-import {
-  getLineAuto, getPdList, getPdlAutoReportNewSearchNow, getProductAuto,
-  getProcessAutoReportGroup, getProcessAutoReportDay, getProcessAutoReportNew
-} from '@/api/core/monitoring/auto';
-import { getFactoryPage } from '@/api/core/base/factory';
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
-import baseTableS from './baseTable.vue';
-import barChart from './BarChart.vue';
-import ButtonNav from '@/components/ButtonNav';
-import { listData } from '@/api/system/dict/data';
-// 表格列配置
-const tableProps = [
-  // {
-  //   prop: 'factoryName',
-  //   label: '工厂',
-  //   fixed: true
-  // },
-  {
-    prop: 'lineName',
-    label: '产线',
-    fixed: true
-  },
-  {
-    prop: 'sizes',
-    label: '规格',
-    width: 105,
-    showOverflowtooltip: true,
-    fixed: true
-  },
-  {
-    prop: 'process',
-    label: '产品工艺',
-    fixed: true
-  },
-  {
-    prop: 'inputN',
-    label: '投入',
-    align: 'center',
-    children: [
-      { prop: 'inputNum', label: '投入数量/片' },
-      {
-        prop: 'inputArea',
-        label: '投入面积/m²',
-        filter: (val) => (val != null ? val.toFixed(2) : '-')
-      }
-    ]
-  },
-  {
-    prop: 'outputN',
-    label: '产出',
-    align: 'center',
-    children: [
-      { prop: 'outputNum', label: '产出数量/片' },
-      {
-        prop: 'outputArea',
-        label: '产出面积/㎡',
-        filter: (val) => (val != null ? val.toFixed(2) : '-')
-      }
-    ]
-  },
-  {
-    prop: 'lossN',
-    label: '不良',
-    align: 'center',
-    children: [
-      { prop: 'lossNum', label: '不良数量/片' },
-      {
-        prop: 'lossArea',
-        label: '不良面积/㎡',
-        filter: (val) => (val != null ? val.toFixed(2) : '-')
-      }
-    ]
-  },
-  {
-    prop: 'lossRatio',
-    label: '不良率/%',
-    filter: (val) => (val != null ? val.toFixed(2) : '-')
-  },
-  {
-    prop: 'outputRatio',
-    label: '投入产出率/%',
-    filter: (val) => (val != null ? val.toFixed(2) : '-')
-  },
-  {
-    prop: 'processingRatio',
-    label: '加工成品率/%',
-    filter: (val) => (val != null ? val.toFixed(2) : '-')
-  },
-  {
-    label: '不良详情',
-    align: 'center',
-    children: [
-      {
-        label: '原片',
-        align: 'center',
-        children: [
-          { prop: 'originalLossNum', label: '原片不良/片' },
-          {
-            prop: 'originalLossArea',
-            label: '原片不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      },
-      {
-        label: '磨边',
-        align: 'center',
-        children: [
-          { prop: 'edgeLossNum', label: '磨边不良/片' },
-          {
-            prop: 'edgeLossArea',
-            label: '磨边不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      },
-      {
-        label: '打孔',
-        align: 'center',
-        children: [
-          { prop: 'drillLossNum', label: '打孔不良/片' },
-          {
-            prop: 'drillLossArea',
-            label: '打孔不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      },
-      {
-        label: '镀膜',
-        align: 'center',
-        children: [
-          { prop: 'coatingLossNum', label: '镀膜不良/片' },
-          {
-            prop: 'coatingLossArea',
-            label: '镀膜不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      },
-      {
-        label: '丝印',
-        align: 'center',
-        children: [
-          { prop: 'silkLossNum', label: '丝印不良/片' },
-          {
-            prop: 'silkLossArea',
-            label: '丝印不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      },
-      {
-        label: '钢化',
-        align: 'center',
-        children: [
-          { prop: 'temperingLossNum', label: '钢化不良/片' },
-          {
-            prop: 'temperingLossArea',
-            label: '钢化不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      },
-      {
-
-        label: '包装',
-        align: 'center',
-        children: [
-          { prop: 'packingLossNum', label: '包装不良/片' },
-          {
-            prop: 'packingLossArea',
-            label: '包装不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      }
-    ]
-  }
-];
-
-export default {
-  components: { barChart, ButtonNav, baseTableS },
-  data() {
-    return {
-      urlOptions: { getDataListURL: getLineAuto },
-      listQuery: {
-        lineId: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-        timeType: 1 // 1-当天，2-自定义
-      },
-      reportTypeMap: {
-        1: '日报',
-        2: '周报',
-        3: '月报',
-        4: '年报'
-      },
-      activeLabel: 'table', // 当班数据tab
-      activeLabelDay: 'table', // 当天数据tab
-      fileName: '',
-      dataListLoading: false,
-      tableProps,
-      factoryColumns: [],
-      factoryColumnsDay: [],
-      activeName: 'product',
-      tableBtn: [],
-      showData: [],
-      tableData: [],
-      tableData2: [], // 示例数据，实际从接口获取
-      productTableData: [],
-      productTableDataDay: [],
-      tableDataCustom: [],
-      list: [], // 折线图数据
-      formConfig: [
-        {
-          type: 'select',
-          label: '时间维度',
-          selectOptions: [
-            { id: 1, name: '当天' },
-            { id: 2, name: '自定义' }
-          ],
-          width: 80,
-          onchange: true,
-          // defaultSelect: 1,
-          clearable: false,
-          param: 'timeType'
-        },
-        {
-          type: '',
-          label: '查询类型',
-          selectOptions: [
-            { id: 1, name: '统计数据' },
-            { id: 2, name: '周期性汇总报表' }
-          ],
-          width: 120,
-          onchange: true,
-          param: 'searchType'
-        },
-        {
-          type: 'select',
-          label: '工厂',
-          selectOptions: [],
-          param: 'factoryId',
-          multiple: true,
-          onchange: true
-        },
-        {
-          type: 'select',
-          label: '产线',
-          selectOptions: [],
-          param: 'lineId',
-          multiple: true,
-          onchange: true
-        },
-        {
-          type: 'select',
-          label: '产品工艺',
-          selectOptions: [],
-          param: 'process',
-          multiple: true,
-          labelField: 'label',
-          valueField: 'label',
-        },
-        {
-          type: '',
-          label: '产品类型',
-          selectOptions: [
-            { id: 1, name: '面板' },
-            { id: 2, name: '背板' },
-          ],
-          multiple: true,
-          param: 'processType',
-        },
-        {
-          type: '',
-          label: '报表类型',
-          selectOptions: [
-            { id: 1, name: '日' },
-            { id: 2, name: '周' },
-            { id: 3, name: '月' },
-            { id: 4, name: '年' }
-          ],
-          width: 80,
-          param: 'reportType'
-        },
-        {
-          type: '',
-          label: '时间范围',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: 'timestamp',
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          width: 350
-        },
-        { type: 'button', btnName: '查询', name: 'search', color: 'primary' },
-        { type: 'separate' },
-        { type: 'button', btnName: '导出', name: 'export', color: 'warning' },
-        {
-          type: 'button',
-          btnName: '重置',
-          name: 'reset',
-        },
-      ]
-    };
-  },
-  computed: {
-    productTableProps() {
-      // 当班数据的完整表头（基础列 + 当班动态表头）
-      const baseColumns = [
-        {
-          prop: 'process',
-          label: '产品工艺',
-          fixed: true
-        },
-        {
-          prop: 'processType',
-          label: '产品类型',
-          filter: (val) => (val != 1 ? '面板' : '背板'),
-          fixed: true
-        },
-        {
-          prop: 'factoryName',
-          label: '工厂',
-          fixed: true
-        }
-      ];
-      return [...baseColumns, ...this.factoryColumns];
-    },
-    productTablePropsDay() {
-      // 当天数据的完整表头（基础列 + 当天动态表头）
-      const baseColumns = [
-        {
-          prop: 'process',
-          label: '产品工艺',
-          fixed: true
-        },
-        {
-          prop: 'processType',
-          label: '产品类型',
-          filter: (val) => (val != 1 ? '面板' : '背板'),
-          fixed: true
-        },
-        {
-          prop: 'factoryName',
-          label: '工厂',
-          fixed: true
-        }
-      ];
-      return [...baseColumns, ...this.factoryColumnsDay];
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      if (this.$refs.buttonNav) {
-        this.$refs.buttonNav.currentMenu = '按产线监控';
-      }
-      if (this.$refs.searchBarForm) {
-        // this.$refs.searchBarForm.formInline.timeVal = [
-        //   yesterday.getTime(),
-        //   end.getTime()
-        // ];
-        this.$refs.searchBarForm.formInline.timeType = 1
-      }
-    });
-
-    this.getDayDataList();
-    this.getPdLineList();
-    const queryParams = {
-      pageNo: 1,
-      pageSize: 99,
-      dictType: 'process_type',
-    };
-    listData(queryParams).then((response) => {
-      this.formConfig[4].selectOptions = response.data.list;
-    });
-  },
-  methods: {
-    // 切换按产线/按产品监控
-    currentMenu(val) {
-      // 1. 确定当前激活的类型（产线/产品）
-      const isProductLine = val === '按产线监控';
-      this.activeName = isProductLine ? 'productLine' : 'product';
-
-      // 2. 提取公共重置逻辑（无论切换到哪个标签，都需要执行的操作）
-      const resetCommon = () => {
-        // 重置搜索表单的筛选条件
-        if (this.$refs.searchBarForm) {
-          const form = this.$refs.searchBarForm.formInline;
-          form.timeVal = undefined;
-          form.timeType = 1;
-          form.reportType = undefined;
-          form.searchType = undefined;
-          form.lineId = undefined;
-          form.factoryId = undefined;
-          form.process = undefined;
-          form.processType = undefined;
-        }
-        // 重置查询参数
-        this.listQuery = {
-          ...this.listQuery, // 保留分页等基础参数
-          factoryId: undefined,
-          process: undefined,
-          lineId: undefined,
-          processType: undefined,
-          reportType: undefined,
-          timeType: 1,
-          searchType: undefined,
-          startTime: undefined,
-          endTime: undefined
-        };
-        // 重置表单配置中公共隐藏的项
-        this.formConfig[1].type = ''; // 隐藏查询类型
-        this.formConfig[6].type = ''; // 隐藏报表类型
-        this.formConfig[7].type = ''; // 隐藏时间范围
-      };
-
-      // 3. 执行公共重置
-      resetCommon();
-
-      // 4. 根据类型设置差异化的表单配置（仅处理不同的部分）
-      if (isProductLine) {
-        // 按产线监控：显示产线，隐藏产品工艺和类型
-        this.formConfig[3].type = 'select'; // 显示产线
-        this.formConfig[4].type = ''; // 隐藏产品工艺
-        this.formConfig[5].type = ''; // 隐藏产品类型
-      } else {
-        // 按产品监控：显示产品工艺和类型，隐藏产线
-        this.formConfig[3].type = ''; // 隐藏产线
-        this.formConfig[4].type = 'select'; // 显示产品工艺
-        this.formConfig[5].type = 'select'; // 显示产品类型
-      }
-    },
-
-    // 导出表格
-    handleExport() {
-      // 按产线监控
-      if (this.activeName === 'productLine') {
-        if (this.listQuery.timeType === 1) {
-          // 产线-当天：导出当班 + 当天两个表格（自定义汇总文件名）
-          this.exportMultipleTables([
-            { ref: 'lineCurrentShiftTable', name: '产线监控_当班数据' },
-            { ref: 'lineTodayTable', name: '产线监控_当天数据' }
-          ], '产线监控_当班及当天数据汇总'); // 传入自定义汇总文件名
-        } else {
-          // 产线-自定义：导出一个表格（自定义文件名）
-          this.exportSingleTable('lineCustomTable', '产线监控_自定义时间数据');
-        }
-      }
-      // 按产品监控
-      else {
-        if (this.listQuery.timeType === 1) {
-          // 产品-当天：导出当班 + 当天两个表格（自定义汇总文件名）
-          this.exportMultipleTables([
-            { ref: 'productCurrentShiftTable', name: '产品监控_当班数据' },
-            { ref: 'productTodayTable', name: '产品监控_当天数据' }
-          ], '产品监控_当班及当天数据汇总'); // 传入自定义汇总文件名
-        } else {
-          // 产品-自定义：导出一个表格（自定义文件名）
-          this.exportSingleTable('productCustomTable', '产品监控_自定义时间数据');
-        }
-      }
-    },
-
-    // 导出单个表格（保持原有逻辑，文件名由调用方传入，已区分不同场景）
-    exportSingleTable(refName, fileName) {
-      const table = this.getTableDom(refName);
-      if (!table) return;
-
-      const clonedTable = table.cloneNode(true);
-      this.adjustTableForExport(clonedTable);
-
-      const workbook = XLSX.utils.table_to_book(clonedTable);
-      const fullName = `${fileName}_${this.formatDate()}.xlsx`;
-      XLSX.writeFile(workbook, fullName);
-    },
-
-    // 导出多个表格（新增自定义汇总文件名参数，适配不同选项卡）
-    exportMultipleTables(tables, customSummaryName) {
-      const workbook = XLSX.utils.book_new();
-      let hasValidTable = false;
-
-      tables.forEach(({ ref, name }) => {
-        const table = this.getTableDom(ref);
-        if (!table) return;
-
-        hasValidTable = true;
-        const clonedTable = table.cloneNode(true);
-        this.adjustTableForExport(clonedTable);
-
-        const worksheet = XLSX.utils.table_to_sheet(clonedTable);
-        XLSX.utils.book_append_sheet(workbook, worksheet, name);
-      });
-
-      if (!hasValidTable) {
-        this.$message.warning('未找到有效表格数据');
-        return;
-      }
-
-      // 动态生成汇总文件名：自定义名称 + 日期
-      const fullName = `${customSummaryName}_${this.formatDate()}.xlsx`;
-      XLSX.writeFile(workbook, fullName);
-    },
-    // 辅助方法：获取表格DOM元素（包含表头）
-    getTableDom(refName) {
-      const tableComponent = this.$refs[refName];
-      if (!tableComponent) {
-        this.$message.warning(`未找到${refName}表格`);
-        return null;
-      }
-      // 获取完整表格容器（包含表头和表体）
-      const tableContainer = tableComponent.$el.querySelector('.el-table');
-      if (!tableContainer) {
-        this.$message.warning(`${refName}表格数据为空`);
-        return null;
-      }
-      return tableContainer;
-    },
-
-    // 重点修复：调整表格结构（解决表头重复问题）
-    adjustTableForExport(tableContainer) {
-      // 1. 移除空表格提示和分页等无关元素
-      const emptyCells = tableContainer.querySelectorAll('.el-table__empty-block, .el-pagination');
-      emptyCells.forEach(cell => cell.remove());
-
-      // 2. 定位核心元素
-      const mainTable = tableContainer.querySelector('.el-table__body-wrapper table'); // 主表体
-      const fixedLeft = tableContainer.querySelector('.el-table__fixed'); // 左固定列容器
-      const fixedRight = tableContainer.querySelector('.el-table__fixed-right'); // 右固定列容器
-
-      // 3. 提取所有表头行（支持多级表头，按层级收集）
-      const allHeaderRows = []; // 存储所有层级的表头行（每行是一个单元格数组）
-
-      // 辅助函数：提取某个容器内的所有表头行（处理多级表头）
-      const extractHeaderRows = (container) => {
-        const headerWrapper = container?.querySelector('.el-table__header-wrapper table');
-        if (!headerWrapper) return [];
-        const thead = headerWrapper.querySelector('thead');
-        if (!thead) return [];
-        // 多级表头可能有多个tr（行）
-        const headerRows = Array.from(thead.querySelectorAll('tr'));
-        return headerRows.map(row => Array.from(row.querySelectorAll('th'))); // 每行的单元格数组
-      };
-
-      // 收集左固定列的表头行（可能有多层）
-      const fixedLeftHeaderRows = extractHeaderRows(fixedLeft);
-      // 收集主表头的表头行（可能有多层）
-      const mainHeaderRows = extractHeaderRows(tableContainer);
-      // 收集右固定列的表头行（可能有多层）
-      const fixedRightHeaderRows = extractHeaderRows(fixedRight);
-
-      // 4. 合并表头行（按层级对齐，左固定列 → 主表头 → 右固定列）
-      // 确定最大表头层级（多级表头的行数）
-      const maxLevel = Math.max(
-        fixedLeftHeaderRows.length,
-        mainHeaderRows.length,
-        fixedRightHeaderRows.length
-      );
-
-      // 按层级合并每行的单元格
-      for (let i = 0; i < maxLevel; i++) {
-        const rowCells = [];
-        // 左固定列当前层级的单元格（不足则补空）
-        rowCells.push(...(fixedLeftHeaderRows[i] || []));
-        // 主表头当前层级的单元格（不足则补空）
-        rowCells.push(...(mainHeaderRows[i] || []));
-        // 右固定列当前层级的单元格（不足则补空）
-        rowCells.push(...(fixedRightHeaderRows[i] || []));
-        allHeaderRows.push(rowCells);
-      }
-
-      // 5. 清理所有原有表头和固定列容器（避免干扰）
-      tableContainer.querySelectorAll('thead').forEach(thead => thead.remove());
-      tableContainer.querySelectorAll('.el-table__header-wrapper').forEach(wrapper => wrapper.remove());
-      [fixedLeft, fixedRight].forEach(container => container?.remove());
-
-      // 6. 构建唯一表头并添加到主表体（支持多级表头）
-      if (mainTable && allHeaderRows.length > 0) {
-        const newThead = document.createElement('thead');
-        // 按层级添加表头行
-        allHeaderRows.forEach(cells => {
-          const newTr = document.createElement('tr');
-          cells.forEach(cell => {
-            // 复制单元格（避免DOM残留引用问题）
-            const clonedCell = cell.cloneNode(true);
-            newTr.appendChild(clonedCell);
-          });
-          newThead.appendChild(newTr);
-        });
-        // 将新表头插入主表体最前面
-        mainTable.insertBefore(newThead, mainTable.firstChild);
-      }
-
-      // 7. 合并固定列数据到主表体（仅处理tbody数据）
-      // 合并左固定列数据
-      if (fixedLeft && mainTable) {
-        const fixedLeftRows = fixedLeft.querySelectorAll('.el-table__body-wrapper tbody tr');
-        const mainRows = mainTable.querySelectorAll('tbody tr');
-        fixedLeftRows.forEach((fixedRow, index) => {
-          if (mainRows[index]) {
-            const fixedCells = Array.from(fixedRow.querySelectorAll('td'));
-            fixedCells.forEach(cell => {
-              mainRows[index].insertBefore(cell.cloneNode(true), mainRows[index].firstChild);
-            });
-          }
-        });
-      }
-
-      // 合并右固定列数据
-      if (fixedRight && mainTable) {
-        const fixedRightRows = fixedRight.querySelectorAll('.el-table__body-wrapper tbody tr');
-        const mainRows = mainTable.querySelectorAll('tbody tr');
-        fixedRightRows.forEach((fixedRow, index) => {
-          if (mainRows[index]) {
-            const fixedCells = Array.from(fixedRow.querySelectorAll('td'));
-            fixedCells.forEach(cell => {
-              mainRows[index].appendChild(cell.cloneNode(true));
-            });
-          }
-        });
-      }
-    },
-
-    // 辅助方法：格式化日期（用于文件名）
-    formatDate() {
-      const date = new Date();
-      return [
-        date.getFullYear(),
-        String(date.getMonth() + 1).padStart(2, '0'),
-        String(date.getDate()).padStart(2, '0'),
-        String(date.getHours()).padStart(2, '0'),
-        String(date.getMinutes()).padStart(2, '0')
-      ].join('');
-    },
-    // 获取产线和工厂列表
-    getPdLineList() {
-      getPdList().then(res => {
-        this.formConfig[3].selectOptions = res.data || [];
-      });
-
-      getFactoryPage({ pageSize: 100, pageNo: 1 }).then(res => {
-        this.formConfig[2].selectOptions = res.data.list || [];
-      });
-    },
-
-    // 搜索/导出按钮点击
-    buttonClick(val) {
-      switch (val.btnName) {
-        case 'search':
-          this.listQuery.pageNo = 1;
-          this.listQuery.pageSize = 10;
-          this.listQuery.factoryId = val.factoryId || undefined;
-          this.listQuery.process = val.process ? val.process : [];
-          this.listQuery.lineId = val.lineId ? val.lineId : [];
-          this.listQuery.processType = val.processType ? val.processType : [];
-          this.listQuery.reportType = val.reportType || undefined;
-          this.listQuery.timeType = val.timeType || undefined;
-          this.listQuery.searchType = val.searchType || undefined;
-          this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined;
-          this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined;
-          if (this.activeName === 'productLine') {
-            if (this.listQuery.timeType === 1) {
-              this.getDayDataList();
-            } else {
-              this.getDataList();
-            }
-          } else {
-            this.getProductList();
-
-          }
-          break;
-        case 'export':
-          this.handleExport();
-          break;
-        case 'reset':
-          this.$refs.searchBarForm.resetForm();
-          this.$refs.searchBarForm.formInline.timeType = 1;
-          this.listQuery = {
-            pageSize: 100,
-            pageNo: 1,
-            total: 0,
-            timeType: 1,
-          };
-          if (this.activeName === 'productLine') {
-            this.getDayDataList();
-
-          } else {
-            this.getProductList();
-
-          }
-
-          break;
-        default:
-          console.log(val);
-      }
-    },
-
-    getDataList() {
-      if (!this.listQuery.startTime && !this.listQuery.endTime) {
-        return this.$modal.msgError('请选择时间');
-      }
-      this.dataListLoading = true;
-      // const arr = ['日', '周', '月', '年'];
-
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableDataCustom = response.data.list.map(item => {
-          // 格式化报表类型和不良详情字段
-          // item.reportType = arr[item.reportType - 1];
-          item.originalLossNum = item.original?.lossNum;
-          item.originalLossArea = item.original?.lossArea;
-          item.edgeLossNum = item.edge?.lossNum;
-          item.edgeLossArea = item.edge?.lossArea;
-          item.drillLossNum = item.drill?.lossNum;
-          item.drillLossArea = item.drill?.lossArea;
-          item.coatingLossNum = item.coating?.lossNum;
-          item.coatingLossArea = item.coating?.lossArea;
-          item.silkLossNum = item.silk?.lossNum;
-          item.silkLossArea = item.silk?.lossArea;
-          item.temperingLossNum = item.tempering?.lossNum;
-          item.temperingLossArea = item.tempering?.lossArea;
-          item.packingLossNum = item.packing?.lossNum;
-          item.packingLossArea = item.packing?.lossArea;
-          return item;
-        });
-        console.log(this.tableDataCustom);
-
-      });
-    },
-
-    async getProductList() {
-      console.log('resGroup');
-      if (this.listQuery.timeType === 2) {
-        const resGroup = await getProcessAutoReportNew(this.listQuery);
-        console.log('resGroup', resGroup);
-
-        // 格式化数据：lineDetList提取到外层，键名加lineId前缀
-        const formatData = (rawList) => {
-          return rawList.map(item => {
-            // 解构出 lineDetList 和其他字段（rest）
-            const { lineDetList = [], ...rest } = item;
-
-            // 遍历 lineDetList 中的每一项，逐个格式化并合并
-            const formattedLineData = lineDetList.reduce((acc, lineData) => {
-              // 取当前 lineData 的 lineId 作为前缀（确保存在，否则用空字符串）
-              const lineIdPrefix = lineData.lineId ? String(lineData.lineId) : '';
-
-              // 为当前 lineData 的每个字段添加 lineId 前缀，合并到累加器中
-              Object.entries(lineData).forEach(([key, value]) => {
-                const newKey = lineIdPrefix ? `${lineIdPrefix}${key}` : key;
-                acc[newKey] = value;
-              });
-
-              return acc;
-            }, {}); // 初始值为空对象
-
-            // 合并外层字段和所有格式化后的 lineDetList 字段
-            return { ...rest, ...formattedLineData };
-          });
-        };
-
-        // 处理当班和当天数据（分别存储）
-        this.productTableData = formatData(resGroup.data.list); // 当班数据
-        console.log(this.productTableData, 'productTableData');
-
-        // --------------------------
-        // 生成当班数据的动态表头
-        // --------------------------
-        const groupLineDatas = [];
-        resGroup.data.list.forEach(item => {
-          if (item.lineDetList && item.lineDetList.length) {
-            groupLineDatas.push(...item.lineDetList);
-          }
-        });
-        // 去重当班数据的产线（按lineId）
-        const uniqueGroupLines = Array.from(
-          new Map(groupLineDatas.map(line => [line.lineId, line])).values()
-        );
-        // 生成当班数据的表头（一级：产线名，二级：指标）
-        this.factoryColumns = this.generateLineColumns(uniqueGroupLines);
-      } else {
-        const reeDay = await getProcessAutoReportDay(this.listQuery);
-        const resGroup = await getProcessAutoReportGroup(this.listQuery);
-
-        // 格式化数据：lineDetList提取到外层，键名加lineId前缀
-        const formatData = (rawList) => {
-          return rawList.map(item => {
-            // 解构出 lineDetList 和其他字段（rest）
-            const { lineDetList = [], ...rest } = item;
-
-            // 遍历 lineDetList 中的每一项，逐个格式化并合并
-            const formattedLineData = lineDetList.reduce((acc, lineData) => {
-              // 取当前 lineData 的 lineId 作为前缀（确保存在，否则用空字符串）
-              const lineIdPrefix = lineData.lineId ? String(lineData.lineId) : '';
-
-              // 为当前 lineData 的每个字段添加 lineId 前缀，合并到累加器中
-              Object.entries(lineData).forEach(([key, value]) => {
-                const newKey = lineIdPrefix ? `${lineIdPrefix}${key}` : key;
-                acc[newKey] = value;
-              });
-
-              return acc;
-            }, {}); // 初始值为空对象
-
-            // 合并外层字段和所有格式化后的 lineDetList 字段
-            return { ...rest, ...formattedLineData };
-          });
-        };
-        // 处理当班和当天数据（分别存储）
-        this.productTableData = formatData(resGroup.data.list); // 当班数据
-        this.productTableDataDay = formatData(reeDay.data.list); // 当天数据
-
-        // --------------------------
-        // 生成当班数据的动态表头
-        // --------------------------
-        const groupLineDatas = [];
-        resGroup.data.list.forEach(item => {
-          if (item.lineDetList && item.lineDetList.length) {
-            groupLineDatas.push(...item.lineDetList);
-          }
-        });
-        // 去重当班数据的产线（按lineId）
-        const uniqueGroupLines = Array.from(
-          new Map(groupLineDatas.map(line => [line.lineId, line])).values()
-        );
-        // 生成当班数据的表头（一级：产线名，二级：指标）
-        this.factoryColumns = this.generateLineColumns(uniqueGroupLines);
-
-        // --------------------------
-        // 生成当天数据的动态表头
-        // --------------------------
-        const dayLineDatas = [];
-        reeDay.data.list.forEach(item => {
-          if (item.lineDetList && item.lineDetList.length) {
-            dayLineDatas.push(...item.lineDetList);
-          }
-        });
-        // 去重当天数据的产线（按lineId）
-        const uniqueDayLines = Array.from(
-          new Map(dayLineDatas.map(line => [line.lineId, line])).values()
-        );
-        // 生成当天数据的表头（一级：产线名，二级：指标）
-        this.factoryColumnsDay = this.generateLineColumns(uniqueDayLines);
-      }
-
-    },
-
-    // 生成动态表头：一级为产线名，二级为产线数据指标
-    generateLineColumns(lines) {
-      // lines为去重后的产线列表（单个元素为一条产线数据）
-      const lineColumns = lines.map(line => {
-        const lineId = line.lineId;
-        console.log(lineId);
-
-        return {
-          label: line.lineName, // 一级表头：产线名（如“深加工产线2”）
-          align: 'center',
-          // 二级表头：该产线的具体指标
-          children: [
-            {
-              prop: `${lineId}inputArea`,
-              label: '投入面积/m²',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            {
-              prop: `${lineId}outputArea`,
-              label: '产出面积/㎡',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            {
-              prop: `${lineId}lossArea`,
-              label: '不良面积/㎡',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            {
-              prop: `${lineId}lossArea`,
-              label: '不良面积/㎡',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            {
-              prop: `${lineId}originalLossArea`,
-              label: '原片不良/㎡',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            {
-              prop: `${lineId}outputRatio`,
-              label: '投入产出率/%',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            {
-              prop: `${lineId}processingRatio`,
-              label: '加工成品率/%',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            // 可添加更多指标
-          ]
-        };
-      });
-      const totalColumn = {
-        label: '合计', // 一级表头：合计
-        align: 'center',
-        // 二级表头：与产线指标对应的合计指标
-        children: [
-          {
-            prop: 'inputArea', // 合计投入面积（需在数据中计算）
-            label: '投入面积/m²',
-            filter: val => val != null ? val.toFixed(2) : '-'
-          },
-          {
-            prop: 'outputArea', // 合计产出面积
-            label: '产出面积/㎡',
-            filter: val => val != null ? val.toFixed(2) : '-'
-          },
-          {
-            prop: 'lossArea', // 合计不良面积
-            label: '不良面积/㎡',
-            filter: val => val != null ? val.toFixed(2) : '-'
-          },
-          {
-            prop: 'originalLossArea', // 合计原片不良面积
-            label: '原片不良/㎡',
-            filter: val => val != null ? val.toFixed(2) : '-'
-          },
-          {
-            prop: 'outputRatio', // 合计投入产出率（可按业务需求计算）
-            label: '投入产出率/%',
-            filter: val => val != null ? val.toFixed(2) : '-'
-          },
-          {
-            prop: 'processingRatio', // 合计加工成品率
-            label: '加工成品率/%',
-            filter: val => val != null ? val.toFixed(2) : '-'
-          }
-          // 与产线指标一一对应
-        ]
-      };
-
-      // 3. 合并产线表头和合计表头（合计放在最后）
-      return [...lineColumns, totalColumn];
-    },
-    // 为当天时调用的接口
-    getDayDataList() {
-      getPdlAutoReportNewSearchNow().then((response) => {
-        this.tableData = response.data.classData.map((item, index) => {
-          item.originalLossNum = item.original?.lossNum;
-          item.originalLossArea = item.original?.lossArea;
-          item.edgeLossNum = item.edge?.lossNum;
-          item.edgeLossArea = item.edge?.lossArea;
-          item.drillLossNum = item.drill?.lossNum;
-          item.drillLossArea = item.drill?.lossArea;
-          item.coatingLossNum = item.coating?.lossNum;
-          item.coatingLossArea = item.coating?.lossArea;
-          item.silkLossNum = item.silk?.lossNum;
-          item.silkLossArea = item.silk?.lossArea;
-          item.temperingLossNum = item.tempering?.lossNum;
-          item.temperingLossArea = item.tempering?.lossArea;
-          item.packingLossNum = item.packing?.lossNum;
-          item.packingLossArea = item.packing?.lossArea;
-          return item;
-        });
-        this.tableData2 = response.data.todayData.map((item, index) => {
-          item.originalLossNum = item.original?.lossNum;
-          item.originalLossArea = item.original?.lossArea;
-          item.edgeLossNum = item.edge?.lossNum;
-          item.edgeLossArea = item.edge?.lossArea;
-          item.drillLossNum = item.drill?.lossNum;
-          item.drillLossArea = item.drill?.lossArea;
-          item.coatingLossNum = item.coating?.lossNum;
-          item.coatingLossArea = item.coating?.lossArea;
-          item.silkLossNum = item.silk?.lossNum;
-          item.silkLossArea = item.silk?.lossArea;
-          item.temperingLossNum = item.tempering?.lossNum;
-          item.temperingLossArea = item.tempering?.lossArea;
-          item.packingLossNum = item.packing?.lossNum;
-          item.packingLossArea = item.packing?.lossArea;
-          return item;
-        });
-        console.log(this.tableData, this.tableData2);
-
-      });
-    },
-    // 每页条数变化
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-
-    // 当前页变化
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-
-    // 搜索栏下拉选择变化
-    handleSearchBarChanged({ param, value }) {
-      if (param === 'timeType') {
-        console.log(value);
-
-        this.listQuery.timeType = value;
-        if (value === 1) {
-          // 切换为“当天”：隐藏查询类型、报表类型、时间范围
-          this.formConfig[1].type = '';
-          this.formConfig[6].type = '';
-          this.formConfig[7].type = '';
-          this.$refs.searchBarForm.formInline.timeType = value;
-          this.listQuery.timeType = value;
-
-          this.$refs.searchBarForm.formInline.searchType = undefined;
-          this.$refs.searchBarForm.formInline.reportType = undefined;
-          this.$refs.searchBarForm.formInline.timeVal = undefined;
-        } else {
-          // 切换为“自定义”：显示查询类型和时间范围
-          this.formConfig[1].type = 'select';
-          this.$refs.searchBarForm.formInline.timeType = value;
-          this.listQuery.timeType = value;
-
-          this.formConfig[7].type = 'datePicker';
-        }
-      } else if (param === 'searchType') {
-        if (value === 1) {
-          // 统计数据：显示时间范围，隐藏报表类型
-          this.formConfig[7].type = 'datePicker';
-          this.formConfig[6].type = '';
-          this.$refs.searchBarForm.formInline.timeVal = undefined;
-        } else {
-          // 周期性报表：显示报表类型，隐藏时间范围
-          this.formConfig[6].type = 'select';
-          this.formConfig[7].type = 'datePicker';
-        }
-      } else if (param === 'reportType') {
-        this.$refs.searchBarForm.formInline.timeVal = undefined;
-      } else if (param === 'factoryId') {
-        // 切换工厂时刷新产线列表
-        this.listQuery.lineId = [];
-        this.$refs.searchBarForm.formInline.lineId = undefined;
-        getPdList(value).then(res => {
-          this.formConfig[3].selectOptions = res.data || [];
-        });
-      }
-    },
-
-    // Tab切换（空方法，可根据需求扩展）
-    handleTabClick() { }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-// 全局容器：占满屏幕高度，减去90px（可根据实际需求调整）
-.app-container {
-  width: 100%;
-  height: calc(100vh - 90px);
-  background: #f2f4f9;
-  // display: flex;
-  // flex-direction: column;
-  // overflow: hidden;
-}
-
-// 顶部导航栏：固定高度40px
-.top-nav {
-  height: 40px;
-  width: 100%;
-  background: #f2f4f9;
-}
-
-// 搜索栏：固定高度（自身内容高度），底部间距8px
-.search-container {
-  width: 100%;
-  margin-bottom: 8px;
-  padding: 16px 16px 18px 16px;
-  background-color: #ffffff;
-}
-
-// 内容区外层：占满剩余空间
-.content-wrapper {
-  // flex: 1;
-  width: 100%;
-  height: calc(100vh - 303px);
-  // overflow: hidden;
-}
-
-// 内容区内层：垂直Flex布局，两个子div平分高度
-.content-inner {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  gap: 8px; // 两个div之间的间距
-  padding-bottom: 8px;
-  box-sizing: border-box;
-}
-
-// 内容卡片：平分父容器高度
-.content-card {
-  // height: 10%;
-  // margin-top: 8px;
-  flex: 1;
-  width: 100%;
-  background-color: #ffffff;
-  padding: 0 16px;
-  box-sizing: border-box;
-
-}
-
-// 无数据占位样式（可根据需求调整）
-// .no-data-bg {
-//   width: 100%;
-//   height: 100%;
-//   background: #fafafa;
-//   display: flex;
-//   align-items: center;
-//   justify-content: center;
-//   color: #999;
-// }
-
-// Tabs样式优化
-
-:deep(.custom-tabs) {
-  .el-tabs__header {
-    margin-bottom: 8px;
-    display: inline-block;
-    transform: translateY(-12px);
-  }
-
-  .el-tabs__content {
-    overflow: visible;
-  }
-
-  .el-tabs__item {
-    padding-left: 0 !important;
-    padding-right: 0 !important;
-    line-height: 36px !important;
-    height: 36px;
-  }
-}
-
-// :deep(.custom-tabs) {
-//   width: 100%;
-
-//   .el-tabs__header {
-//     margin-bottom: 8px !important;
-//     display: inline-block !important;
-//     transform: translateY(-12px) !important;
-//     border-bottom: none !important;
-//   }
-
-//   .el-tabs__item {
-//     padding: 0 15px !important;
-//     margin-right: 10px !important;
-//     line-height: 36px !important;
-//     height: 36px !important;
-//     font-size: 14px;
-//     color: #999;
-//     position: relative;
-//   }
-
-//   .el-tabs__item.is-active {
-//     color: #333;
-//   }
-
-//   .el-tabs__item.is-active::after {
-//     content: '';
-//     position: absolute;
-//     left: 0;
-//     bottom: -2px;
-//     width: 100%;
-//     height: 2px;
-//     background-color: #0b58ff;
-//   }
-
-//   .el-tabs__item:hover {
-//     color: #666;
-//   }
-// }
-</style>
-
-<style lang="scss">
-// 全局公共样式
-.energyOverlimitLog {
-  .searchBarBox {
-    margin-bottom: 0;
-  }
-
-  .blue-block {
-    float: left;
-    display: inline-block;
-    width: 4px;
-    height: 16px;
-    background-color: #0b58ff;
-    border-radius: 1px;
-    margin-right: 8px;
-    margin-top: 16px;
-  }
-
-  .tip {
-    display: inline-block;
-    font-size: 16px;
-    margin-right: 8px;
-    margin-top: 10px;
-    margin-bottom: 18px;
-  }
-}
-</style>
diff --git a/src/views/core/monitoring/nextClip/hisData.vue b/src/views/core/monitoring/nextClip/hisData.vue
deleted file mode 100644
index 5342afa4..00000000
--- a/src/views/core/monitoring/nextClip/hisData.vue
+++ /dev/null
@@ -1,361 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2024-12-02 13:44:47
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<!-- :isFold="true" 控制展开 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-if="showData.length"
-			class="right-aside"
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="showData"
-			>
-			<!-- <method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" /> -->
-		</base-table>
-		<div v-else class="no-data-bg"></div>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<!-- <el-dialog
-			title="提示"
-			:visible.sync="dialogVisible"
-			width="30%"
-			:before-close="handleClose">
-			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
-  		<el-button type="success" @click="exportPdf">pdf</el-button>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-			</span>
-		</el-dialog> -->
-	</div>
-</template>
-
-<script>
-import { parseTime } from '../../mixins/code-filter';
-import { getDownLogHisData, getPdList, getThick  } from '@/api/core/monitoring/index'
-import * as XLSX from 'xlsx'
-import FileSaver from 'file-saver'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
-
-const tableProps = [
-	{
-    prop: 'productionLineName',
-		label: '产线'
-  },
-  {
-    prop: 'eqName',
-    label: '下片机械手编号'
-  },
-	{
-    prop: 'pos',
-		label: '工位编号'
-	},
-	{
-    prop: 'pallet',
-    label: '托数/托'
-  },
-  {
-    prop: 'palletNum',
-    label: '下片托数'
-  },
-  {
-    prop: 'startTime',
-    label: '开始时间',
-    filter: parseTime,
-    width: 160
-  },
-  {
-    prop: 'endTime',
-    label: '结束时间',
-    filter: parseTime,
-    width: 160
-  },
-	{
-		prop: 'outputNum',
-    label: '玻璃长度/mm'
-	},
-	{
-		prop: 'width',
-    label: '玻璃宽度/mm',
-	},
-	{
-    prop: 'thick',
-    label: '玻璃长度/mm'
-	},
-];
-
-export default {
-	data() {
-		return {
-			urlOptions: {
-        getDataListURL: getDownLogHisData
-			},
-      tableData: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-        eqName: undefined,
-        productionLineId: undefined,
-        thick:undefined
-      },
-      exportLoading: false,
-      dataListLoading: false,
-			selectedList: [],
-			dialogVisible: false,
-      addOrEditTitle: '',
-      addOrUpdateVisible: false,
-			tableProps,
-      tableBtn: [
-        {
-          type: 'his',
-          btnName: '历史',
-        },
-      ].filter((v) => v),
-			tableData: [],
-			showData: [],
-			fileName: '',
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-          param: 'productionLineId'
-        },
-        {
-          type: 'select',
-          label: '玻璃型号',
-          selectOptions: [],
-          param: 'thick'
-        },
-				{
-          type: 'datePicker',
-          label: '统计开始时间',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultTime: ['00:00:00', '23:59:59'],
-          defaultSelect: []
-        },
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				}
-			],
-		};
-  },
-  mounted() {
-    this.$refs.searchBarForm.formInline.productionLineId = this.$route.query.productionLineId
-    this.$refs.searchBarForm.formInline.thick = this.$route.query.thick
-    this.listQuery.productionLineId = this.$route.query.productionLineId
-    this.listQuery.thick = this.$route.query.thick
-    this.getDataList()
-    this.getPdLineList()
-    console.log('this.$route.query', this.$route.query);
-
-  },
-  methods: {
-    		handleClick(val) {
-			this.addOrUpdateVisible = true;
-			this.addOrEditTitle =
-				val.data?.factoryName + '-' + val.data?.lineName + ' 详情';
-			this.$nextTick(() => {
-				this.$refs.eqDetail.init(
-					val.data.lineId,
-					this.listQuery.startTime,
-					this.listQuery.endTime
-				);
-			});
-		},
-		test() {
-			var target = document.getElementsByClassName("right-aside")[0]
-			target.style.background = '#FFFFFF'
-			var that = this
-			setTimeout(() => {
-				html2canvas(target).then(function(canvas) {
-						var contentWidth = canvas.width
-						var contentHeight = canvas.height
-
-						// 一页pdf显示html页面生成的canvas高度
-						var pageHeight = contentHeight / 592.28 * 841.89
-						// 未生成pdf的html页面高度
-						var leftHeight = contentHeight
-						// 页面偏移
-						var position = 0
-						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-						var imgWidth = 595.28
-						var imgHeight = 592.28 / contentWidth * contentHeight
-
-						var pageData = canvas.toDataURL('image/jpeg', 1.0)
-
-						console.log('nihc URL', leftHeight, pageHeight)
-
-						var pdf = new jsPDF('', 'pt', 'a4')
-
-						if (leftHeight < pageHeight) {
-							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
-						} else {
-							while(leftHeight > 0) {
-								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
-								leftHeight -= pageHeight
-								position -= 841.89
-								// 避免空白页
-								if (leftHeight > 0) {
-									pdf.addPage()
-								}
-							}
-						}
-
-						pdf.save(that.fileName + '工段统计.pdf')
-				})
-			}, 300)
-		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true)
-			const fix = tables.querySelector('.el-table__fixed')
-			const fixRight = tables.querySelector('.el-table__fixed-right')
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let exportTable = XLSX.utils.table_to_book(tables)
-
-      var exportTableOut = XLSX.write(exportTable, {
-        bookType: 'xlsx', bookSST: true, type: 'array'
-      })
-      // sheetjs.xlsx为导出表格的标题名称
-      try {
-        FileSaver.saveAs(new Blob([exportTableOut], {
-          type: 'application/octet-stream'
-        }), this.fileName + '工段统计.xlsx')
-      } catch (e) {
-        if (typeof console !== 'undefined') console.log(e, exportTableOut)
-      }
-      return exportTableOut
-    },
-		exportPdf() {
-			this.test()
-			setTimeout(() =>{
-				this.dialogVisible = false
-				this.showData = this.tableData
-			}, 600)
-
-		},
-		exportXlsx() {
-			this.exportECL()
-			this.dialogVisible = false
-			this.showData = this.tableData
-		},
-		handleClose(done) {
-			this.$confirm('确认关闭？')
-				.then(_ => {
-					done();
-				})
-				.catch(_ => {});
-		},
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[0].selectOptions = res.data || []
-			})
-      getThick().then((res) => {
-        this.formConfig[1].selectOptions = res.data.map((item) => {
-          return {
-            id: item.thick + 'mm',
-            name: item.thick + 'mm'
-          }
-        })
-			})
-		},
-		selectChange(val) {
-      console.log(val)
-      this.selectedList = val
-    },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-          this.listQuery.productId = val.productId ? val.productId : undefined;
-          this.listQuery.startTime = val.timeVal ? val.timeVal[0]: undefined;
-          this.listQuery.endTime = val.timeVal ? val.timeVal[1]: undefined;
-
-					//this.listQuery.reportEndTime = val.timeVal ? [new Date(val.timeVal[1]).getTime()] : undefined;
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-    getDataList() {
-      this.listQuery.eqName = this.$route.query.eqName
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list
-				this.showData = this.tableData
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-		handleExport() {
-			if (this.selectedList.length > 0) {
-				this.showData = this.selectedList
-			}
-			this.dialogVisible = true
-    }
-	},
-};
-</script>
diff --git a/src/views/core/monitoring/nextClip/index.vue b/src/views/core/monitoring/nextClip/index.vue
deleted file mode 100644
index 55bf6a9c..00000000
--- a/src/views/core/monitoring/nextClip/index.vue
+++ /dev/null
@@ -1,373 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2024-12-02 13:44:47
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<!-- :isFold="true" 控制展开 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-if="showData.length"
-			class="right-aside"
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="showData"
-			>
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<div v-else class="no-data-bg"></div>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<!-- <el-dialog
-			title="提示"
-			:visible.sync="dialogVisible"
-			width="30%"
-			:before-close="handleClose">
-			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
-  		<el-button type="success" @click="exportPdf">pdf</el-button>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-			</span>
-		</el-dialog> -->
-	</div>
-</template>
-
-<script>
-import { parseTime } from '../../mixins/code-filter';
-import { getDownLogPage, getPdList, getThick, exportDownLogData  } from '@/api/core/monitoring/index'
-import * as XLSX from 'xlsx'
-import FileSaver from 'file-saver'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
-
-const tableProps = [
-	{
-    prop: 'productionLineName',
-		label: '产线'
-  },
-  {
-    prop: 'eqName',
-    label: '下片机械手编号'
-  },
-	{
-    prop: 'pos',
-		label: '工位编号'
-	},
-	{
-    prop: 'pallet',
-    label: '托数/托'
-  },
-  {
-    prop: 'palletNum',
-    label: '下片托数'
-  },
-  {
-    prop: 'startTime',
-    label: '开始时间',
-    filter: parseTime,
-    width: 160
-  },
-  {
-    prop: 'endTime',
-    label: '结束时间',
-    filter: parseTime,
-    width: 160
-  },
-	{
-		prop: 'outputNum',
-    label: '玻璃长度/mm'
-	},
-	{
-		prop: 'width',
-    label: '玻璃宽度/mm',
-	},
-	{
-    prop: 'thick',
-    label: '玻璃厚度/mm'
-	},
-];
-
-export default {
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getDownLogPage
-			},
-      tableData: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-        productionLineId: undefined,
-        thick: undefined,
-
-      },
-      exportLoading: false,
-      dataListLoading: false,
-			selectedList: [],
-			dialogVisible: false,
-      addOrEditTitle: '',
-      addOrUpdateVisible: false,
-			tableProps,
-      tableBtn: [
-        {
-          type: 'his',
-          btnName: '历史',
-        },
-      ].filter((v) => v),
-			tableData: [],
-			showData: [],
-			fileName: '',
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-          param: 'productionLineId'
-        },
-        {
-          type: 'select',
-          label: '玻璃型号',
-          selectOptions: [],
-          param: 'thick'
-        },
-				{
-          type: 'datePicker',
-          label: '统计开始时间',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultTime: ['00:00:00', '23:59:59'],
-          defaultSelect: []
-        },
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				}
-			],
-		};
-	},
-	created() {
-		this.getDataList()
-		this.getPdLineList()
-	},
-  methods: {
-    handleClick(val) {
-      console.log(val);
-      if (val.type === 'his') {
-        this.$router.push({
-          path: 'nextClipHis',
-          query: {
-            eqName: val.data.eqName,
-            productionLineId: this.listQuery.productionLineId,
-            thick: this.listQuery.thick,
-          },
-        });
-      }
-			// this.addOrUpdateVisible = true;
-			// this.addOrEditTitle =
-			// 	val.data?.factoryName + '-' + val.data?.lineName + ' 详情';
-			// this.$nextTick(() => {
-			// 	this.$refs.eqDetail.init(
-			// 		val.data.lineId,
-			// 		this.listQuery.startTime,
-			// 		this.listQuery.endTime
-			// 	);
-			// });
-		},
-		test() {
-			var target = document.getElementsByClassName("right-aside")[0]
-			target.style.background = '#FFFFFF'
-			var that = this
-			setTimeout(() => {
-				html2canvas(target).then(function(canvas) {
-						var contentWidth = canvas.width
-						var contentHeight = canvas.height
-
-						// 一页pdf显示html页面生成的canvas高度
-						var pageHeight = contentHeight / 592.28 * 841.89
-						// 未生成pdf的html页面高度
-						var leftHeight = contentHeight
-						// 页面偏移
-						var position = 0
-						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-						var imgWidth = 595.28
-						var imgHeight = 592.28 / contentWidth * contentHeight
-
-						var pageData = canvas.toDataURL('image/jpeg', 1.0)
-
-						console.log('nihc URL', leftHeight, pageHeight)
-
-						var pdf = new jsPDF('', 'pt', 'a4')
-
-						if (leftHeight < pageHeight) {
-							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
-						} else {
-							while(leftHeight > 0) {
-								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
-								leftHeight -= pageHeight
-								position -= 841.89
-								// 避免空白页
-								if (leftHeight > 0) {
-									pdf.addPage()
-								}
-							}
-						}
-
-						pdf.save(that.fileName + '工段统计.pdf')
-				})
-			}, 300)
-		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true)
-			const fix = tables.querySelector('.el-table__fixed')
-			const fixRight = tables.querySelector('.el-table__fixed-right')
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let exportTable = XLSX.utils.table_to_book(tables)
-
-      var exportTableOut = XLSX.write(exportTable, {
-        bookType: 'xlsx', bookSST: true, type: 'array'
-      })
-      // sheetjs.xlsx为导出表格的标题名称
-      try {
-        FileSaver.saveAs(new Blob([exportTableOut], {
-          type: 'application/octet-stream'
-        }), this.fileName + '工段统计.xlsx')
-      } catch (e) {
-        if (typeof console !== 'undefined') console.log(e, exportTableOut)
-      }
-      return exportTableOut
-    },
-		exportPdf() {
-			this.test()
-			setTimeout(() =>{
-				this.dialogVisible = false
-				this.showData = this.tableData
-			}, 600)
-
-		},
-		exportXlsx() {
-			this.exportECL()
-			this.dialogVisible = false
-			this.showData = this.tableData
-		},
-		handleClose(done) {
-			this.$confirm('确认关闭？')
-				.then(_ => {
-					done();
-				})
-				.catch(_ => {});
-		},
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[0].selectOptions = res.data || []
-			})
-      getThick().then((res) => {
-        this.formConfig[1].selectOptions = res.data.map((item) => {
-          return {
-            id: item.thick + 'mm',
-            name: item.thick + 'mm'
-          }
-        })
-			})
-		},
-		selectChange(val) {
-      console.log(val)
-      this.selectedList = val
-    },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-          this.listQuery.productionLineId = val.productionLineId ? val.productionLineId : undefined;
-          this.listQuery.thick = val.thick ? val.thick : undefined;
-          this.listQuery.startTime = val.timeVal ? val.timeVal[0]: undefined;
-          this.listQuery.endTime = val.timeVal ? val.timeVal[1]: undefined;
-
-					//this.listQuery.reportEndTime = val.timeVal ? [new Date(val.timeVal[1]).getTime()] : undefined;
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list
-				this.showData = this.tableData
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-    handleExport() {
-      // 处理查询参数
-      let params = { ...this.listQuery };
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出下片日志?').then(() => {
-        this.exportLoading = true;
-        return exportDownLogData(params);
-      }).then(response => {
-        this.$download.excel(response, '下片日志.xls');
-        this.exportLoading = false;
-      }).catch(() => { });
-    }
-	},
-};
-</script>
diff --git a/src/views/core/monitoring/productAuto/BarChart.vue b/src/views/core/monitoring/productAuto/BarChart.vue
deleted file mode 100644
index d823cedd..00000000
--- a/src/views/core/monitoring/productAuto/BarChart.vue
+++ /dev/null
@@ -1,272 +0,0 @@
-<template>
-  <div :class="className" :style="{ height: height, width: width, marginLeft: '10px' }" />
-</template>
-
-<script>
-import * as echarts from 'echarts';
-require('echarts/theme/macarons'); // 引入主题
-import resize from '@/utils/chartMixins/resize';
-
-const animationDuration = 1000;
-
-export default {
-  mixins: [resize], // 混入 resize 逻辑（自适应窗口）
-  props: {
-    className: {
-      type: String,
-      default: 'chart',
-    },
-    title: {
-      type: String,
-      default: '',
-    },
-    width: {
-      type: String,
-      default: '100%',
-    },
-    height: {
-      type: String,
-      default: '300px',
-    },
-    barData: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data() {
-    return {
-      chart: null, // 图表实例
-    };
-  },
-  watch: {
-    // 监听 barData 变化（深度监听数组内部元素）
-    barData: {
-      deep: true,
-      handler: 'handleBarDataChange', // 调用处理方法
-    },
-  },
-  mounted() {
-    // 组件挂载后初始化图表（确保 DOM 已就绪）
-    this.$nextTick(() => {
-      this.initChart();
-    });
-  },
-  beforeDestroy() {
-    // 组件销毁前清理图表实例
-    if (this.chart) {
-      this.chart.dispose();
-      this.chart = null;
-    }
-  },
-  methods: {
-    // barData 变化时的处理方法
-    handleBarDataChange() {
-      // 确保 DOM 存在再更新图表
-      this.$nextTick(() => {
-        // 如果图表未初始化，先初始化；否则直接更新数据
-        if (!this.chart) {
-          this.initChart();
-        } else {
-          this.updateChart();
-        }
-      });
-    },
-
-    // 初始化图表
-    initChart() {
-      // 避免重复初始化（先销毁旧实例）
-      if (this.chart) {
-        this.chart.dispose();
-      }
-
-      // 确保 DOM 元素存在
-      if (!this.$el) {
-        console.error('图表容器 DOM 元素不存在');
-        return;
-      }
-
-      // 初始化图表实例
-      this.chart = echarts.init(this.$el, 'macarons');
-      // 设置图表配置
-      this.setChartOption();
-    },
-
-    // 更新图表数据（复用配置逻辑）
-    updateChart() {
-      if (!this.chart) return;
-      this.setChartOption();
-    },
-
-    // 图表配置项（抽离为单独方法，方便初始化和更新复用）
-    setChartOption() {
-      const dataValues = this.barData.flatMap(item => [item.inputNum || 0, item.outputNum || 0]);
-      const maxData = Math.max(...dataValues, 0); // 加 0 确保无数据时 maxData 为 0
-
-      // 2. 计算 Y 轴最大值（留 10% 余量，避免数据顶到顶部）
-      let yMax = 0;
-      if (maxData > 0) {
-        yMax = Math.ceil(maxData * 1.1); // 向上取整，确保刻度为整数
-      } else {
-        yMax = 100; // 无数据时默认最大值为 100，避免 Y 轴消失
-      }
-
-      // 3. 计算 interval（5 个刻度对应 4 个间隔，向上取整确保间隔为整数）
-      const yInterval = Math.ceil((yMax - 0) / 4); // min 固定为 0，直接减 0
-
-      this.chart.setOption({
-        title: {
-          text: this.title
-            ? '{space|}{tip|}{space|}{value|' + this.title + '}'
-            : '',
-          textStyle: {
-            rich: {
-              tip: {
-                width: 6,
-                height: 6,
-                borderRadius: 50,
-                backgroundColor: '#288AFF',
-              },
-              space: {
-                width: 8,
-              },
-              value: {
-                fontSize: 14,
-                color: 'black',
-              },
-            },
-          },
-        },
-        color: ['#288AFF', '#8EF0AB', '#FFDC94'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross',
-            crossStyle: {
-              color: '#999',
-            },
-          },
-        },
-        legend: {
-          data: ['投入', '产出', '加工成品率'],
-        },
-        grid: {
-          left: 20,
-          right: 30,
-          top:40,
-          bottom: 10,
-
-          containLabel: true,
-          splitArea: {
-            show: false // 关键：关闭网格背景分区（去掉间隔色块）
-          }
-        },
-        xAxis: {
-          type: 'category',
-          data: this.barData.map((item) => item.lineName),
-          axisLine: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, 0.45)',
-              width: 1 // 轴线宽度（可选，默认 1，可按需调整）
-            }
-          },
-          // 2. 控制 X 轴刻度线颜色（与轴线颜色保持一致，视觉统一）
-          axisTick: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, 0.45)', // 刻度线颜色，需与轴线颜色匹配
-              width: 1 // 刻度线宽度（可选）
-            },
-            alignWithLabel: true // 可选：让刻度线与文字对齐（避免文字偏移时刻度线错位）
-          },
-          // 3. 控制 X 轴文字颜色（如：深灰色 rgba(0, 0, 0, 0.45)）
-          axisLabel: {
-            color: 'rgba(0, 0, 0, 0.45)6', // 文字颜色，可自定义
-            fontSize: 12, // 可选：调整文字大小（默认 12，按需修改）
-            // 可选：文字过长时换行/省略（避免文字重叠，按需开启）
-            formatter: (value) => {
-              // 示例：文字超过 6 个字符时换行（可根据需求调整字符数）
-              if (value.length > 6) {
-                return value.slice(0, 6) + '\n' + value.slice(6);
-              }
-              return value;
-            }
-          },
-          // 原有配置（若需保留可解开注释）
-          // axisPointer: {
-          //   type: 'shadow',
-          // }
-        },
-        yAxis: [
-          {
-            type: 'value',
-            name: '投入/产出 片',
-            min: 0, // 最小值固定为 0
-            max: yMax,
-            interval: yInterval,
-            splitArea: {
-              show: false
-            },
-            axisLabel: {
-              formatter: '{value}',
-              color: 'rgba(0, 0, 0, 0.45)'
-            },
-
-            // 可选：修改 Y 轴名称颜色（与文字颜色保持一致）
-            nameTextStyle: {
-              color: 'rgba(0, 0, 0, 0.45)'
-            }
-          },
-          {
-            type: 'value',
-            name: '加工成品率',
-            min: 0,
-            max: 100, // 成品率固定 0-100%
-            interval: 25, // 100 / 4 = 25，刚好 5 个刻度（0、25、50、75、100）
-            axisLabel: {
-              formatter: '{value} %',
-              color: 'rgba(0, 0, 0, 0.45)'
-            },
-            splitArea: {
-              show: false
-            },
-            // 可选：修改 Y 轴名称颜色
-            nameTextStyle: {
-              color: 'rgba(0, 0, 0, 0.45)'
-            }
-          },
-        ],
-        series: [
-          {
-            name: '投入',
-            type: 'bar',
-            barWidth: '20',
-            data: this.barData.map((item) => item.inputNum),
-            tooltip: {
-              valueFormatter: (value) => `${value} 片`,
-            },
-            animationDuration,
-          },
-          {
-            name: '产出',
-            type: 'bar',
-            barWidth: '20',
-            data: this.barData.map((item) => item.outputNum),
-            tooltip: {
-              valueFormatter: (value) => `${value} 片`,
-            },
-            animationDuration,
-          },
-          {
-            name: '加工成品率',
-            type: 'line',
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: (value) => `${value} %`,
-            },
-            data: this.barData.map((item) => item.processingRatio),
-          },
-        ],
-      });
-    },
-  },
-};
-</script>
diff --git a/src/views/core/monitoring/productAuto/baseTable.vue b/src/views/core/monitoring/productAuto/baseTable.vue
deleted file mode 100644
index 4b292da6..00000000
--- a/src/views/core/monitoring/productAuto/baseTable.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-	<div class="baseTable">
-		<el-table
-			:ref="id"
-			:data="renderData"
-			v-bind="$attrs"
-			:border="cancelBorder ? false : true"
-			@current-change="currentChange"
-			@selection-change="handleSelectionChange"
-			style="width: 100%"
-			:header-cell-style="{
-				background: '#F2F4F9',
-				color: '#606266',
-			}">
-			<!-- 多选 -->
-			<el-table-column
-				v-if="selectWidth"
-				type="selection"
-				:width="selectWidth" />
-			<!-- 序号 -->
-			<el-table-column
-				v-if="page && limit"
-				prop="_pageIndex"
-				:width="pageWidth"
-				align="center"
-				:fixed="cancelPageFixed ? false : true">
-				<template slot="header">
-					<el-popover placement="bottom-start" width="300" trigger="click">
-						<div
-							class="setting-box"
-							style="max-height: 400px; overflow-y: auto">
-							<el-checkbox
-								v-for="(item, index) in tableProps"
-								:key="'cb' + index"
-								v-model="selectedBox[index]"
-								:label="item.label" />
-						</div>
-						<i slot="reference" class="el-icon-s-tools" />
-					</el-popover>
-				</template>
-			</el-table-column>
-
-			<el-table-column
-				v-for="item in renderTableHeadList"
-				:key="item.prop"
-				v-bind="item"
-				:label="item.label"
-				:prop="item.prop"
-				:fixed="item.fixed || false"
-				:show-overflow-tooltip="item.showOverflowtooltip || false"
-				:sortable="item.sortable || false">
-				<template slot="header">
-					<span>{{ item.label }}</span>
-				</template>
-				<!-- 多表头 -->
-				<template v-if="item.children">
-					<el-table-column
-						v-for="sub in item.children"
-						:prop="sub.prop"
-						:key="sub.prop"
-						v-bind="sub"
-						:label="sub.label">
-						<template v-if="sub.children">
-							<el-table-column
-								v-for="ssub in sub.children"
-								:prop="ssub.prop"
-								:key="ssub.prop"
-								v-bind="ssub"
-								:label="ssub.label">
-								<template slot-scope="sscopeInner">
-									<component
-										:is="ssub.subcomponent"
-										v-if="ssub.subcomponent"
-										:key="sscopeInner.row.id"
-										:inject-data="{ ...sscopeInner.row, ...ssub }"
-										@emitData="emitData" />
-									<span v-else>
-										{{ sscopeInner.row[ssub.prop] | commonFilter(ssub.filter) }}
-									</span>
-								</template>
-							</el-table-column>
-						</template>
-						<template slot-scope="scopeInner">
-							<component
-								:is="sub.subcomponent"
-								v-if="sub.subcomponent"
-								:key="scopeInner.row.id"
-								:inject-data="{ ...scopeInner.row, ...sub }"
-								@emitData="emitData" />
-							<span v-else>
-								{{ scopeInner.row[sub.prop] | commonFilter(sub.filter) }}
-							</span>
-						</template>
-					</el-table-column>
-				</template>
-				<template slot-scope="scope">
-					<component
-						:is="item.subcomponent"
-						v-if="item.subcomponent"
-						:key="scope.row.id"
-						:itemProp="item.prop"
-						:inject-data="{ ...scope.row, ...item }"
-						@emitData="emitData" />
-					<span v-else>
-						{{ scope.row[item.prop] | commonFilter(item.filter) }}
-					</span>
-				</template>
-			</el-table-column>
-			<slot name="handleBtn" />
-		</el-table>
-		<!-- 表格底部加号 -->
-		<el-button
-			v-if="addButtonShow"
-			class="addButton"
-			icon="el-icon-plus"
-			@click="emitButtonClick">
-			{{ addButtonShow }}
-		</el-button>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'BaseTable',
-	filters: {
-		commonFilter: (source, filterType = (a) => a) => {
-			return filterType(source);
-		},
-	},
-	props: {
-		cancelBorder: {
-			type: Boolean,
-			default: false,
-		},
-		cancelPageFixed: {
-			type: Boolean,
-			default: false,
-		},
-		tableData: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-		tableProps: {
-			type: Array,
-			default: () => {
-				return [];
-			},
-		},
-		id: {
-			type: String,
-			required: false,
-			default: '',
-		},
-		page: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		pageWidth: {
-			type: Number,
-			required: false,
-			default: 70,
-		},
-		limit: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		selectWidth: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		addButtonShow: {
-			type: String,
-			required: false,
-			default: '',
-		},
-	},
-	data() {
-		return {
-			selectedBox: new Array(100).fill(true),
-		};
-	},
-	computed: {
-		renderTableHeadList() {
-			return this.tableProps.filter((item, index) => {
-				return this.selectedBox[index];
-			});
-		},
-		renderData() {
-			return this.tableData.map((item, index) => {
-				return {
-					...item,
-					_pageIndex: (this.page - 1) * this.limit + index + 1,
-				};
-			});
-		},
-	},
-	beforeMount() {
-		this.selectedBox = new Array(100).fill(true);
-	},
-	methods: {
-		currentChange(newVal, oldVal) {
-			this.$emit('current-change', { newVal, oldVal });
-		},
-		handleSelectionChange(val) {
-			this.$emit('selection-change', val);
-		},
-		emitData(val) {
-			this.$emit('emitFun', val);
-		},
-		emitButtonClick() {
-			this.$emit('emitButtonClick');
-		},
-		setCurrent(name, index) {
-			let _this = this;
-			let obj = _this.$refs[name].data[index];
-			_this.$refs[name].setCurrentRow(obj);
-		},
-		doLayout(name) {
-			this.$refs[name].doLayout();
-		},
-	},
-};
-</script>
-<style scoped>
-.baseTable .show-col-btn {
-	margin-right: 5px;
-	line-height: inherit;
-	cursor: pointer;
-}
-.baseTable .el-icon-refresh {
-	cursor: pointer;
-}
-</style>
-<style>
-.baseTable .el-table__body tr.current-row > td.el-table__cell {
-	background-color: #eaf1fc;
-}
-.baseTable .el-table .el-table__cell {
-	padding: 0;
-	height: 35px;
-}
-.baseTable .addButton {
-	width: 100%;
-	height: 35px;
-	border-top: none;
-	color: #0b58ff;
-	border-color: #ebeef5;
-	border-radius: 0;
-}
-.baseTable .addButton:hover {
-	color: #0b58ff;
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-.baseTable .addButton:focus {
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-
-.el-tooltip__popper.is-dark {
-	background: rgba(0, 0, 0, 0.6) !important;
-}
-.el-tooltip__popper .popper__arrow,
-.el-tooltip__popper .popper__arrow::after {
-	border-top-color: rgba(0, 0, 0, 0.4) !important;
-}
-</style>
diff --git a/src/views/core/monitoring/productAuto/index.vue b/src/views/core/monitoring/productAuto/index.vue
deleted file mode 100644
index 764bbbfd..00000000
--- a/src/views/core/monitoring/productAuto/index.vue
+++ /dev/null
@@ -1,1270 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 1. 顶部导航栏（固定高度） -->
-    <div class="top-nav">
-      <ButtonNav ref="buttonNav" :menus="['按产线监控', '按产品监控']" @change="currentMenu">
-        <template v-slot:tab1>
-          <div>按产线监控</div>
-        </template>
-        <template v-slot:tab2>
-          <div>按产品监控</div>
-        </template>
-      </ButtonNav>
-    </div>
-
-    <!-- 2. 搜索栏（固定高度，占自身空间） -->
-    <div class="search-container energyOverlimitLog">
-      <span class="blue-block"></span>
-      <span class="tip">生产监控</span>
-      <search-bar :isFold="true" removeBlue :formConfigs="formConfig" ref="searchBarForm"
-        @select-changed="handleSearchBarChanged" @headBtnClick="buttonClick" />
-    </div>
-
-    <!-- 3. 内容区外层容器（占满剩余空间，Flex垂直布局） -->
-    <div v-if="activeName === 'productLine'">
-      <div class="content-wrapper">
-        <!-- 3.1 时间维度为“当天”时的内容（两个平分高度的div） -->
-        <div class="content-inner" v-if="listQuery.timeType === 1">
-          <!-- 当班数据（占1/2剩余高度） -->
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip">当班数据</span>
-            <el-row style="margin-top: 10px;">
-              <el-col class="custom-tabs">
-                <el-tabs v-model="activeLabel" :stretch="true" @tab-click="handleTabClick">
-                  <el-tab-pane :label="'全部数据'" name="table">
-                    <base-table-s ref="lineCurrentShiftTable" style="margin-bottom: 16px;" v-if="activeLabel == 'table'"
-                      :page="1" :limit="100" :table-props="tableProps" :table-data="tableData" :max-height="210" />
-                  </el-tab-pane>
-                  <el-tab-pane :label="'\u3000当天生产折线图\u3000'" name="graph">
-                    <div style="height: 230px;" v-if="activeLabel == 'graph'" class="graph">
-                      <barChart v-if="tableData && tableData.length > 0" ref="barChart" height="230px"
-                        :bar-data="tableData" />
-                      <div v-else class="no-data-bg"></div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </el-col>
-            </el-row>
-          </div>
-
-          <!-- 当天数据（占1/2剩余高度） -->
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip">当天数据</span>
-            <el-row style="margin-top: 10px;">
-              <el-col class="custom-tabs">
-                <el-tabs v-model="activeLabelDay" :stretch="true" @tab-click="handleTabClick">
-                  <el-tab-pane :label="'全部数据'" name="table">
-                    <base-table-s ref="lineTodayTable" style="margin-bottom: 16px;" v-if="activeLabelDay == 'table'"
-                      :page="1" :limit="100" :table-props="tableProps" :table-data="tableData2" :max-height="210" />
-                  </el-tab-pane>
-                  <el-tab-pane :label="'\u3000当天生产折线图\u3000'" name="graph">
-                    <div style="height: 230px;" v-if="activeLabelDay == 'graph'" class="graph">
-                      <barChart v-if="tableData2 && tableData2.length > 0" ref="barChart" height="230px"
-                        :bar-data="tableData2" />
-                      <div v-else class="no-data-bg"></div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </el-col>
-            </el-row>
-          </div>
-        </div>
-
-        <!-- 3.2 时间维度为“自定义”时的内容（两个平分高度的div） -->
-        <div class="content-inner" v-else>
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip" v-if="listQuery.startTime && listQuery.endTime">
-              <span>{{ reportTypeMap[listQuery.reportType] }}</span>
-              <span>
-                {{ parseTime(listQuery.startTime) }} 至{{
-                parseTime(listQuery.endTime) }}
-              </span>
-            </span>
-            <span class="tip" v-else>生产表格数据 </span>
-            <div class="graph">
-              <base-table-s ref="lineCustomTable" style="margin-bottom: 16px;" v-if="activeLabel == 'table'" :page="1"
-                :limit="100" :table-props="tableProps" :max-height="210" :table-data="tableDataCustom" />
-            </div>
-          </div>
-
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip">生产折线图</span>
-            <div style="width: 100%;height: 100%;" class="graph">
-              <barChart v-if="tableDataCustom && tableDataCustom.length > 0" ref="barChart"
-                :bar-data="tableDataCustom" />
-              <div v-else class="no-data-bg"></div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div v-else>
-      <div v-if="this.listQuery.timeType === 1" class="content-wrapper">
-        <!-- 3.1 时间维度为“当天”时的内容（两个平分高度的div） -->
-        <div class="content-inner">
-          <!-- 当班数据（占1/2剩余高度） -->
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip">当班数据</span>
-            <base-table-s ref="productCurrentShiftTable" style="margin-bottom: 16px;" v-if="activeLabel == 'table'"
-              :page="1" :limit="100" :table-props="productTableProps" :table-data="productTableData"
-              :max-height="210" />
-          </div>
-
-          <!-- 当天数据（占1/2剩余高度） -->
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip">当天数据</span>
-            <base-table-s ref="productTodayTable" style="margin-bottom: 16px;" v-if="activeLabelDay == 'table'"
-              :page="1" :limit="100" :table-props="productTablePropsDay" :table-data="productTableDataDay"
-              :max-height="210" />
-          </div>
-        </div>
-      </div>
-
-      <div v-else class="content-wrapper">
-        <!-- 3.1 时间维度为“当天”时的内容（两个平分高度的div） -->
-        <div class="content-inner">
-          <!-- 当班数据（占1/2剩余高度） -->
-          <div class="content-card energyOverlimitLog">
-            <span class="blue-block"></span>
-            <span class="tip" v-if="listQuery.startTime && listQuery.endTime">
-              <span>{{ reportTypeMap[listQuery.reportType] }}</span>
-              <span>
-                {{ parseTime(listQuery.startTime) }} 至{{
-                  parseTime(listQuery.endTime) }}
-              </span>
-            </span>
-            <span class="tip" v-else>生产表格数据 </span>
-            <base-table-s ref="productCustomTable" style="margin-bottom: 16px;" v-if="activeLabel == 'table'" :page="1"
-              :limit="100" :table-props="productTableProps" :table-data="productTableData" :max-height="210" />
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { parseTime } from '@/filter/code-filter';
-import {
-  getLineAuto, getPdList, getPdlAutoReportNewSearchNow, getProductAuto,
-  getProcessAutoReportGroup, getProcessAutoReportDay, getProcessAutoReportNew
-} from '@/api/core/monitoring/auto';
-import { getFactoryPage } from '@/api/core/base/factory';
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
-import baseTableS from './baseTable.vue';
-import barChart from './BarChart.vue';
-import ButtonNav from '@/components/ButtonNav';
-import { listData } from '@/api/system/dict/data';
-// 表格列配置
-const tableProps = [
-  // {
-  //   prop: 'factoryName',
-  //   label: '工厂',
-  //   fixed: true
-  // },
-  {
-    prop: 'lineName',
-    label: '产线',
-    fixed: true
-  },
-  {
-    prop: 'sizes',
-    label: '规格',
-    width: 105,
-    showOverflowtooltip: true,
-    fixed: true
-  },
-  {
-    prop: 'process',
-    label: '产品工艺',
-    fixed: true
-  },
-  {
-    prop: 'inputN',
-    label: '投入',
-    align: 'center',
-    children: [
-      { prop: 'inputNum', label: '投入数量/片' },
-      {
-        prop: 'inputArea',
-        label: '投入面积/m²',
-        filter: (val) => (val != null ? val.toFixed(2) : '-')
-      }
-    ]
-  },
-  {
-    prop: 'outputN',
-    label: '产出',
-    align: 'center',
-    children: [
-      { prop: 'outputNum', label: '产出数量/片' },
-      {
-        prop: 'outputArea',
-        label: '产出面积/㎡',
-        filter: (val) => (val != null ? val.toFixed(2) : '-')
-      }
-    ]
-  },
-  {
-    prop: 'lossN',
-    label: '不良',
-    align: 'center',
-    children: [
-      { prop: 'lossNum', label: '不良数量/片' },
-      {
-        prop: 'lossArea',
-        label: '不良面积/㎡',
-        filter: (val) => (val != null ? val.toFixed(2) : '-')
-      }
-    ]
-  },
-  {
-    prop: 'lossRatio',
-    label: '不良率/%',
-    filter: (val) => (val != null ? val.toFixed(2) : '-')
-  },
-  {
-    prop: 'outputRatio',
-    label: '投入产出率/%',
-    filter: (val) => (val != null ? val.toFixed(2) : '-')
-  },
-  {
-    prop: 'processingRatio',
-    label: '加工成品率/%',
-    filter: (val) => (val != null ? val.toFixed(2) : '-')
-  },
-  {
-    label: '不良详情',
-    align: 'center',
-    children: [
-      {
-        label: '原片',
-        align: 'center',
-        children: [
-          { prop: 'originalLossNum', label: '原片不良/片' },
-          {
-            prop: 'originalLossArea',
-            label: '原片不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      },
-      {
-        label: '磨边',
-        align: 'center',
-        children: [
-          { prop: 'edgeLossNum', label: '磨边不良/片' },
-          {
-            prop: 'edgeLossArea',
-            label: '磨边不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      },
-      {
-        label: '打孔',
-        align: 'center',
-        children: [
-          { prop: 'drillLossNum', label: '打孔不良/片' },
-          {
-            prop: 'drillLossArea',
-            label: '打孔不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      },
-      {
-        label: '镀膜',
-        align: 'center',
-        children: [
-          { prop: 'coatingLossNum', label: '镀膜不良/片' },
-          {
-            prop: 'coatingLossArea',
-            label: '镀膜不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      },
-      {
-        label: '丝印',
-        align: 'center',
-        children: [
-          { prop: 'silkLossNum', label: '丝印不良/片' },
-          {
-            prop: 'silkLossArea',
-            label: '丝印不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      },
-      {
-        label: '钢化',
-        align: 'center',
-        children: [
-          { prop: 'temperingLossNum', label: '钢化不良/片' },
-          {
-            prop: 'temperingLossArea',
-            label: '钢化不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      },
-      {
-
-        label: '包装',
-        align: 'center',
-        children: [
-          { prop: 'packingLossNum', label: '包装不良/片' },
-          {
-            prop: 'packingLossArea',
-            label: '包装不良/㎡',
-            filter: (val) => (val != null ? val.toFixed(2) : '-')
-          }
-        ]
-      }
-    ]
-  }
-];
-
-export default {
-  components: { barChart, ButtonNav, baseTableS },
-  data() {
-    return {
-      urlOptions: { getDataListURL: getLineAuto },
-      listQuery: {
-        lineId: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-        timeType: 1 // 1-当天，2-自定义
-      },
-      reportTypeMap: {
-        1: '日报',
-        2: '周报',
-        3: '月报',
-        4: '年报'
-      },
-      activeLabel: 'table', // 当班数据tab
-      activeLabelDay: 'table', // 当天数据tab
-      fileName: '',
-      dataListLoading: false,
-      tableProps,
-      factoryColumns: [],
-      factoryColumnsDay: [],
-      activeName: 'product',
-      tableBtn: [],
-      showData: [],
-      tableData: [],
-      tableData2: [], // 示例数据，实际从接口获取
-      productTableData: [],
-      productTableDataDay: [],
-      tableDataCustom: [],
-      list: [], // 折线图数据
-      formConfig: [
-        {
-          type: 'select',
-          label: '时间维度',
-          selectOptions: [
-            { id: 1, name: '当天' },
-            { id: 2, name: '自定义' }
-          ],
-          width: 80,
-          onchange: true,
-          // defaultSelect: 1,
-          clearable: false,
-          param: 'timeType'
-        },
-        {
-          type: '',
-          label: '查询类型',
-          selectOptions: [
-            { id: 1, name: '统计数据' },
-            { id: 2, name: '周期性汇总报表' }
-          ],
-          width: 120,
-          onchange: true,
-          param: 'searchType'
-        },
-        {
-          type: 'select',
-          label: '工厂',
-          selectOptions: [],
-          param: 'factoryId',
-          multiple: true,
-          onchange: true
-        },
-        {
-          type: 'select',
-          label: '产线',
-          selectOptions: [],
-          param: 'lineId',
-          multiple: true,
-          onchange: true
-        },
-        {
-          type: 'select',
-          label: '产品工艺',
-          selectOptions: [],
-          param: 'process',
-          multiple: true,
-          labelField: 'label',
-          valueField: 'label',
-        },
-        {
-          type: '',
-          label: '产品类型',
-          selectOptions: [
-            { id: 1, name: '面板' },
-            { id: 2, name: '背板' },
-          ],
-          multiple: true,
-          param: 'processType',
-        },
-        {
-          type: '',
-          label: '报表类型',
-          selectOptions: [
-            { id: 1, name: '日' },
-            { id: 2, name: '周' },
-            { id: 3, name: '月' },
-            { id: 4, name: '年' }
-          ],
-          width: 80,
-          param: 'reportType'
-        },
-        {
-          type: '',
-          label: '时间范围',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: 'timestamp',
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          width: 350
-        },
-        { type: 'button', btnName: '查询', name: 'search', color: 'primary' },
-        { type: 'separate' },
-        { type: 'button', btnName: '导出', name: 'export', color: 'warning' },
-        {
-          type: 'button',
-          btnName: '重置',
-          name: 'reset',
-        },
-      ]
-    };
-  },
-  computed: {
-    productTableProps() {
-      // 当班数据的完整表头（基础列 + 当班动态表头）
-      const baseColumns = [
-        {
-          prop: 'process',
-          label: '产品工艺',
-          fixed: true
-        },
-        {
-          prop: 'processType',
-          label: '产品类型',
-          filter: (val) => (val != 1 ? '面板' : '背板'),
-          fixed: true
-        },
-        {
-          prop: 'factoryName',
-          label: '工厂',
-          fixed: true
-        }
-      ];
-      return [...baseColumns, ...this.factoryColumns];
-    },
-    productTablePropsDay() {
-      // 当天数据的完整表头（基础列 + 当天动态表头）
-      const baseColumns = [
-        {
-          prop: 'process',
-          label: '产品工艺',
-          fixed: true
-        },
-        {
-          prop: 'processType',
-          label: '产品类型',
-          filter: (val) => (val != 1 ? '面板' : '背板'),
-          fixed: true
-        },
-        {
-          prop: 'factoryName',
-          label: '工厂',
-          fixed: true
-        }
-      ];
-      return [...baseColumns, ...this.factoryColumnsDay];
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      if (this.$refs.buttonNav) {
-        this.$refs.buttonNav.currentMenu = '按产品监控';
-      }
-      if (this.$refs.searchBarForm) {
-        // this.$refs.searchBarForm.formInline.timeVal = [
-        //   yesterday.getTime(),
-        //   end.getTime()
-        // ];
-        this.$refs.searchBarForm.formInline.timeType = 1
-      }
-    });
-
-    this.getProductList();
-    this.getPdLineList();
-    const queryParams = {
-      pageNo: 1,
-      pageSize: 99,
-      dictType: 'process_type',
-    };
-    listData(queryParams).then((response) => {
-      this.formConfig[4].selectOptions = response.data.list;
-    });
-  },
-  methods: {
-    // 切换按产线/按产品监控
-    currentMenu(val) {
-      // 1. 确定当前激活的类型（产线/产品）
-      const isProductLine = val === '按产线监控';
-      this.activeName = isProductLine ? 'productLine' : 'product';
-
-      // 2. 提取公共重置逻辑（无论切换到哪个标签，都需要执行的操作）
-      const resetCommon = () => {
-        // 重置搜索表单的筛选条件
-        if (this.$refs.searchBarForm) {
-          const form = this.$refs.searchBarForm.formInline;
-          form.timeVal = undefined;
-          form.timeType = 1;
-          form.reportType = undefined;
-          form.searchType = undefined;
-          form.lineId = undefined;
-          form.factoryId = undefined;
-          form.process = undefined;
-          form.processType = undefined;
-        }
-        // 重置查询参数
-        this.listQuery = {
-          ...this.listQuery, // 保留分页等基础参数
-          factoryId: undefined,
-          process: undefined,
-          lineId: undefined,
-          processType: undefined,
-          reportType: undefined,
-          timeType: 1,
-          searchType: undefined,
-          startTime: undefined,
-          endTime: undefined
-        };
-        // 重置表单配置中公共隐藏的项
-        this.formConfig[1].type = ''; // 隐藏查询类型
-        this.formConfig[6].type = ''; // 隐藏报表类型
-        this.formConfig[7].type = ''; // 隐藏时间范围
-      };
-
-      // 3. 执行公共重置
-      resetCommon();
-
-      // 4. 根据类型设置差异化的表单配置（仅处理不同的部分）
-      if (isProductLine) {
-        // 按产线监控：显示产线，隐藏产品工艺和类型
-        this.formConfig[3].type = 'select'; // 显示产线
-        this.formConfig[4].type = ''; // 隐藏产品工艺
-        this.formConfig[5].type = ''; // 隐藏产品类型
-      } else {
-        // 按产品监控：显示产品工艺和类型，隐藏产线
-        this.formConfig[3].type = ''; // 隐藏产线
-        this.formConfig[4].type = 'select'; // 显示产品工艺
-        this.formConfig[5].type = 'select'; // 显示产品类型
-      }
-    },
-
-    // 导出表格
-    handleExport() {
-      // 按产线监控
-      if (this.activeName === 'productLine') {
-        if (this.listQuery.timeType === 1) {
-          // 产线-当天：导出当班 + 当天两个表格
-          this.exportMultipleTables([
-            { ref: 'lineCurrentShiftTable', name: '产线监控_当班数据' },
-            { ref: 'lineTodayTable', name: '产线监控_当天数据' }
-          ]);
-        } else {
-          // 产线-自定义：导出一个表格
-          this.exportSingleTable('lineCustomTable', '产线监控_自定义时间数据');
-        }
-      }
-      // 按产品监控
-      else {
-        if (this.listQuery.timeType === 1) {
-          // 产品-当天：导出当班 + 当天两个表格
-          this.exportMultipleTables([
-            { ref: 'productCurrentShiftTable', name: '产品监控_当班数据' },
-            { ref: 'productTodayTable', name: '产品监控_当天数据' }
-          ]);
-        } else {
-          // 产品-自定义：导出一个表格
-          this.exportSingleTable('productCustomTable', '产品监控_自定义时间数据');
-        }
-      }
-    },
-
-    // 导出单个表格
-    exportSingleTable(refName, fileName) {
-      const table = this.getTableDom(refName);
-      if (!table) return;
-
-      // 克隆表格并移除固定列
-      const clonedTable = table.cloneNode(true);
-      this.removeFixedColumns(clonedTable);
-
-      // 转换为工作簿并导出
-      const workbook = XLSX.utils.table_to_book(clonedTable);
-      const fullName = `${fileName}_${this.formatDate()}.xlsx`;
-      XLSX.writeFile(workbook, fullName);
-    },
-
-    // 导出多个表格（同一个Excel的不同sheet）
-    exportMultipleTables(tables) {
-      const workbook = XLSX.utils.book_new();
-      let hasValidTable = false;
-
-      tables.forEach(({ ref, name }) => {
-        const table = this.getTableDom(ref);
-        if (!table) return;
-
-        hasValidTable = true;
-        // 克隆表格并移除固定列
-        const clonedTable = table.cloneNode(true);
-        this.removeFixedColumns(clonedTable);
-
-        // 转换为sheet并添加到工作簿
-        const worksheet = XLSX.utils.table_to_sheet(clonedTable);
-        XLSX.utils.book_append_sheet(workbook, worksheet, name);
-      });
-
-      if (!hasValidTable) {
-        this.$message.warning('未找到有效表格数据');
-        return;
-      }
-
-      // 导出包含多个sheet的Excel
-      const fullName = `生产监控数据汇总_${this.formatDate()}.xlsx`;
-      XLSX.writeFile(workbook, fullName);
-    },
-
-    // 辅助方法：获取表格DOM元素
-    getTableDom(refName) {
-      const tableComponent = this.$refs[refName];
-      if (!tableComponent) {
-        this.$message.warning(`未找到${refName}表格`);
-        return null;
-      }
-      // 获取表格组件内部的el-table DOM
-      const tableDom = tableComponent.$el.querySelector('.el-table__body-wrapper table');
-      if (!tableDom) {
-        this.$message.warning(`${refName}表格数据为空`);
-        return null;
-      }
-      return tableDom;
-    },
-
-    // 辅助方法：移除固定列（避免重复导出）
-    removeFixedColumns(table) {
-      const fixedColumns = table.querySelectorAll('.el-table__fixed, .el-table__fixed-right');
-      fixedColumns.forEach(col => col.remove());
-    },
-
-    // 辅助方法：格式化日期（用于文件名）
-    formatDate() {
-      const date = new Date();
-      return [
-        date.getFullYear(),
-        String(date.getMonth() + 1).padStart(2, '0'),
-        String(date.getDate()).padStart(2, '0'),
-        String(date.getHours()).padStart(2, '0'),
-        String(date.getMinutes()).padStart(2, '0')
-      ].join('');
-    },
-
-    // 获取产线和工厂列表
-    getPdLineList() {
-      getPdList().then(res => {
-        this.formConfig[3].selectOptions = res.data || [];
-      });
-
-      getFactoryPage({ pageSize: 100, pageNo: 1 }).then(res => {
-        this.formConfig[2].selectOptions = res.data.list || [];
-      });
-    },
-
-    // 搜索/导出按钮点击
-    buttonClick(val) {
-      switch (val.btnName) {
-        case 'search':
-          this.listQuery.pageNo = 1;
-          this.listQuery.pageSize = 10;
-          this.listQuery.factoryId = val.factoryId || undefined;
-          this.listQuery.process = val.process ? val.process : [];
-          this.listQuery.lineId = val.lineId ? val.lineId : [];
-          this.listQuery.processType = val.processType ? val.processType : [];
-          this.listQuery.reportType = val.reportType || undefined;
-          this.listQuery.timeType = val.timeType || undefined;
-          this.listQuery.searchType = val.searchType || undefined;
-          this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined;
-          this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined;
-          if (this.activeName === 'productLine') {
-            if (this.listQuery.timeType === 1) {
-              this.getDayDataList();
-            } else {
-              this.getDataList();
-            }
-          } else {
-              this.getProductList();
-
-          }
-          break;
-        case 'export':
-          this.handleExport();
-          break;
-        case 'reset':
-          this.$refs.searchBarForm.resetForm();
-          this.$refs.searchBarForm.formInline.timeType = 1;
-          this.listQuery = {
-            pageSize: 100,
-            pageNo: 1,
-            total: 0,
-            timeType: 1,
-          };
-          if (this.activeName === 'productLine') {
-            this.getDayDataList();
-
-          } else {
-            this.getProductList();
-
-          }
-
-          break;
-        default:
-          console.log(val);
-      }
-    },
-
-    getDataList() {
-      if(!this.listQuery.startTime &&!this.listQuery.endTime ){
-       return  this.$modal.msgError('请选择时间');
-      }
-      this.dataListLoading = true;
-      // const arr = ['日', '周', '月', '年'];
-
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableDataCustom = response.data.list.map(item => {
-          // 格式化报表类型和不良详情字段
-          // item.reportType = arr[item.reportType - 1];
-          item.originalLossNum = item.original?.lossNum;
-          item.originalLossArea = item.original?.lossArea;
-          item.edgeLossNum = item.edge?.lossNum;
-          item.edgeLossArea = item.edge?.lossArea;
-          item.drillLossNum = item.drill?.lossNum;
-          item.drillLossArea = item.drill?.lossArea;
-          item.coatingLossNum = item.coating?.lossNum;
-          item.coatingLossArea = item.coating?.lossArea;
-          item.silkLossNum = item.silk?.lossNum;
-          item.silkLossArea = item.silk?.lossArea;
-          item.temperingLossNum = item.tempering?.lossNum;
-          item.temperingLossArea = item.tempering?.lossArea;
-          item.packingLossNum = item.packing?.lossNum;
-          item.packingLossArea = item.packing?.lossArea;
-          return item;
-        });
-        console.log(this.tableDataCustom);
-
-      });
-    },
-
-    async getProductList() {
-      console.log('resGroup');
-      if (this.listQuery.timeType === 2) {
-        const resGroup = await getProcessAutoReportNew(this.listQuery);
-        console.log('resGroup',resGroup);
-
-        // 格式化数据：lineDetList提取到外层，键名加lineId前缀
-        const formatData = (rawList) => {
-          return rawList.map(item => {
-            // 解构出 lineDetList 和其他字段（rest）
-            const { lineDetList = [], ...rest } = item;
-
-            // 遍历 lineDetList 中的每一项，逐个格式化并合并
-            const formattedLineData = lineDetList.reduce((acc, lineData) => {
-              // 取当前 lineData 的 lineId 作为前缀（确保存在，否则用空字符串）
-              const lineIdPrefix = lineData.lineId ? String(lineData.lineId) : '';
-
-              // 为当前 lineData 的每个字段添加 lineId 前缀，合并到累加器中
-              Object.entries(lineData).forEach(([key, value]) => {
-                const newKey = lineIdPrefix ? `${lineIdPrefix}${key}` : key;
-                acc[newKey] = value;
-              });
-
-              return acc;
-            }, {}); // 初始值为空对象
-
-            // 合并外层字段和所有格式化后的 lineDetList 字段
-            return { ...rest, ...formattedLineData };
-          });
-        };
-
-        // 处理当班和当天数据（分别存储）
-        this.productTableData = formatData(resGroup.data.list); // 当班数据
-        console.log(this.productTableData,'productTableData');
-
-        // --------------------------
-        // 生成当班数据的动态表头
-        // --------------------------
-        const groupLineDatas = [];
-        resGroup.data.list.forEach(item => {
-          if (item.lineDetList && item.lineDetList.length) {
-            groupLineDatas.push(...item.lineDetList);
-          }
-        });
-        // 去重当班数据的产线（按lineId）
-        const uniqueGroupLines = Array.from(
-          new Map(groupLineDatas.map(line => [line.lineId, line])).values()
-        );
-        // 生成当班数据的表头（一级：产线名，二级：指标）
-        this.factoryColumns = this.generateLineColumns(uniqueGroupLines);
-      } else {
-        const reeDay = await getProcessAutoReportDay(this.listQuery);
-        const resGroup = await getProcessAutoReportGroup(this.listQuery);
-
-        // 格式化数据：lineDetList提取到外层，键名加lineId前缀
-        const formatData = (rawList) => {
-          return rawList.map(item => {
-            // 解构出 lineDetList 和其他字段（rest）
-            const { lineDetList = [], ...rest } = item;
-
-            // 遍历 lineDetList 中的每一项，逐个格式化并合并
-            const formattedLineData = lineDetList.reduce((acc, lineData) => {
-              // 取当前 lineData 的 lineId 作为前缀（确保存在，否则用空字符串）
-              const lineIdPrefix = lineData.lineId ? String(lineData.lineId) : '';
-
-              // 为当前 lineData 的每个字段添加 lineId 前缀，合并到累加器中
-              Object.entries(lineData).forEach(([key, value]) => {
-                const newKey = lineIdPrefix ? `${lineIdPrefix}${key}` : key;
-                acc[newKey] = value;
-              });
-
-              return acc;
-            }, {}); // 初始值为空对象
-
-            // 合并外层字段和所有格式化后的 lineDetList 字段
-            return { ...rest, ...formattedLineData };
-          });
-        };
-        // 处理当班和当天数据（分别存储）
-        this.productTableData = formatData(resGroup.data.list); // 当班数据
-        this.productTableDataDay = formatData(reeDay.data.list); // 当天数据
-
-        // --------------------------
-        // 生成当班数据的动态表头
-        // --------------------------
-        const groupLineDatas = [];
-        resGroup.data.list.forEach(item => {
-          if (item.lineDetList && item.lineDetList.length) {
-            groupLineDatas.push(...item.lineDetList);
-          }
-        });
-        // 去重当班数据的产线（按lineId）
-        const uniqueGroupLines = Array.from(
-          new Map(groupLineDatas.map(line => [line.lineId, line])).values()
-        );
-        // 生成当班数据的表头（一级：产线名，二级：指标）
-        this.factoryColumns = this.generateLineColumns(uniqueGroupLines);
-
-        // --------------------------
-        // 生成当天数据的动态表头
-        // --------------------------
-        const dayLineDatas = [];
-        reeDay.data.list.forEach(item => {
-          if (item.lineDetList && item.lineDetList.length) {
-            dayLineDatas.push(...item.lineDetList);
-          }
-        });
-        // 去重当天数据的产线（按lineId）
-        const uniqueDayLines = Array.from(
-          new Map(dayLineDatas.map(line => [line.lineId, line])).values()
-        );
-        // 生成当天数据的表头（一级：产线名，二级：指标）
-        this.factoryColumnsDay = this.generateLineColumns(uniqueDayLines);
-      }
-
-    },
-
-    // 生成动态表头：一级为产线名，二级为产线数据指标
-    generateLineColumns(lines) {
-      // lines为去重后的产线列表（单个元素为一条产线数据）
-      const lineColumns = lines.map(line => {
-        const lineId = line.lineId;
-        console.log(lineId);
-
-        return {
-          label: line.lineName, // 一级表头：产线名（如“深加工产线2”）
-          align: 'center',
-          // 二级表头：该产线的具体指标
-          children: [
-            {
-              prop: `${lineId}inputArea`,
-              label: '投入面积/m²',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            {
-              prop: `${lineId}outputArea`,
-              label: '产出面积/㎡',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            {
-              prop: `${lineId}lossArea`,
-              label: '不良面积/㎡',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            {
-              prop: `${lineId}lossArea`,
-              label: '不良面积/㎡',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            {
-              prop: `${lineId}originalLossArea`,
-              label: '原片不良/㎡',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            {
-              prop: `${lineId}outputRatio`,
-              label: '投入产出率/%',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            {
-              prop: `${lineId}processingRatio`,
-              label: '加工成品率/%',
-              filter: val => val != null ? val.toFixed(2) : '-'
-            },
-            // 可添加更多指标
-          ]
-        };
-      });
-      const totalColumn = {
-        label: '合计', // 一级表头：合计
-        align: 'center',
-        // 二级表头：与产线指标对应的合计指标
-        children: [
-          {
-            prop: 'inputArea', // 合计投入面积（需在数据中计算）
-            label: '投入面积/m²',
-            filter: val => val != null ? val.toFixed(2) : '-'
-          },
-          {
-            prop: 'outputArea', // 合计产出面积
-            label: '产出面积/㎡',
-            filter: val => val != null ? val.toFixed(2) : '-'
-          },
-          {
-            prop: 'lossArea', // 合计不良面积
-            label: '不良面积/㎡',
-            filter: val => val != null ? val.toFixed(2) : '-'
-          },
-          {
-            prop: 'originalLossArea', // 合计原片不良面积
-            label: '原片不良/㎡',
-            filter: val => val != null ? val.toFixed(2) : '-'
-          },
-          {
-            prop: 'outputRatio', // 合计投入产出率（可按业务需求计算）
-            label: '投入产出率/%',
-            filter: val => val != null ? val.toFixed(2) : '-'
-          },
-          {
-            prop: 'processingRatio', // 合计加工成品率
-            label: '加工成品率/%',
-            filter: val => val != null ? val.toFixed(2) : '-'
-          }
-          // 与产线指标一一对应
-        ]
-      };
-
-      // 3. 合并产线表头和合计表头（合计放在最后）
-      return [...lineColumns, totalColumn];
-    },
-    // 为当天时调用的接口
-    getDayDataList() {
-      getPdlAutoReportNewSearchNow().then((response) => {
-        this.tableData = response.data.classData.map((item, index) => {
-          item.originalLossNum = item.original?.lossNum;
-          item.originalLossArea = item.original?.lossArea;
-          item.edgeLossNum = item.edge?.lossNum;
-          item.edgeLossArea = item.edge?.lossArea;
-          item.drillLossNum = item.drill?.lossNum;
-          item.drillLossArea = item.drill?.lossArea;
-          item.coatingLossNum = item.coating?.lossNum;
-          item.coatingLossArea = item.coating?.lossArea;
-          item.silkLossNum = item.silk?.lossNum;
-          item.silkLossArea = item.silk?.lossArea;
-          item.temperingLossNum = item.tempering?.lossNum;
-          item.temperingLossArea = item.tempering?.lossArea;
-          item.packingLossNum = item.packing?.lossNum;
-          item.packingLossArea = item.packing?.lossArea;
-          return item;
-        });
-        this.tableData2 = response.data.todayData.map((item, index) => {
-          item.originalLossNum = item.original?.lossNum;
-          item.originalLossArea = item.original?.lossArea;
-          item.edgeLossNum = item.edge?.lossNum;
-          item.edgeLossArea = item.edge?.lossArea;
-          item.drillLossNum = item.drill?.lossNum;
-          item.drillLossArea = item.drill?.lossArea;
-          item.coatingLossNum = item.coating?.lossNum;
-          item.coatingLossArea = item.coating?.lossArea;
-          item.silkLossNum = item.silk?.lossNum;
-          item.silkLossArea = item.silk?.lossArea;
-          item.temperingLossNum = item.tempering?.lossNum;
-          item.temperingLossArea = item.tempering?.lossArea;
-          item.packingLossNum = item.packing?.lossNum;
-          item.packingLossArea = item.packing?.lossArea;
-          return item;
-        });
-        console.log(this.tableData, this.tableData2);
-
-      });
-    },
-    // 每页条数变化
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-
-    // 当前页变化
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-
-    // 搜索栏下拉选择变化
-    handleSearchBarChanged({ param, value }) {
-      if (param === 'timeType') {
-        console.log(value);
-
-        this.listQuery.timeType = value;
-        if (value === 1) {
-          // 切换为“当天”：隐藏查询类型、报表类型、时间范围
-          this.formConfig[1].type = '';
-          this.formConfig[6].type = '';
-          this.formConfig[7].type = '';
-          this.$refs.searchBarForm.formInline.timeType = value;
-          this.listQuery.timeType = value;
-
-          this.$refs.searchBarForm.formInline.searchType = undefined;
-          this.$refs.searchBarForm.formInline.reportType = undefined;
-          this.$refs.searchBarForm.formInline.timeVal = undefined;
-        } else {
-          // 切换为“自定义”：显示查询类型和时间范围
-          this.formConfig[1].type = 'select';
-          this.$refs.searchBarForm.formInline.timeType = value;
-          this.listQuery.timeType = value;
-
-          this.formConfig[7].type = 'datePicker';
-        }
-      } else if (param === 'searchType') {
-        if (value === 1) {
-          // 统计数据：显示时间范围，隐藏报表类型
-          this.formConfig[7].type = 'datePicker';
-          this.formConfig[6].type = '';
-          this.$refs.searchBarForm.formInline.timeVal = undefined;
-        } else {
-          // 周期性报表：显示报表类型，隐藏时间范围
-          this.formConfig[6].type = 'select';
-          this.formConfig[7].type = 'datePicker';
-        }
-      } else if (param === 'reportType') {
-        this.$refs.searchBarForm.formInline.timeVal = undefined;
-      } else if (param === 'factoryId') {
-        // 切换工厂时刷新产线列表
-        this.listQuery.lineId = [];
-        this.$refs.searchBarForm.formInline.lineId = undefined;
-        getPdList(value).then(res => {
-          this.formConfig[3].selectOptions = res.data || [];
-        });
-      }
-    },
-
-    // Tab切换（空方法，可根据需求扩展）
-    handleTabClick() { }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-// 全局容器：占满屏幕高度，减去90px（可根据实际需求调整）
-.app-container {
-  width: 100%;
-  height: calc(100vh - 90px);
-  background: #f2f4f9;
-  // display: flex;
-  // flex-direction: column;
-  // overflow: hidden;
-}
-
-// 顶部导航栏：固定高度40px
-.top-nav {
-  height: 40px;
-  width: 100%;
-  background: #f2f4f9;
-}
-
-// 搜索栏：固定高度（自身内容高度），底部间距8px
-.search-container {
-  width: 100%;
-  margin-bottom: 8px;
-  padding: 16px 16px 18px 16px;
-  background-color: #ffffff;
-}
-
-// 内容区外层：占满剩余空间
-.content-wrapper {
-  // flex: 1;
-  width: 100%;
-  height: calc(100vh - 303px);
-  // overflow: hidden;
-}
-
-// 内容区内层：垂直Flex布局，两个子div平分高度
-.content-inner {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  gap: 8px; // 两个div之间的间距
-  padding-bottom: 8px;
-  box-sizing: border-box;
-}
-
-// 内容卡片：平分父容器高度
-.content-card {
-  // height: 10%;
-  // margin-top: 8px;
-  flex: 1;
-  width: 100%;
-  background-color: #ffffff;
-  padding: 0 16px;
-  box-sizing: border-box;
-
-}
-
-// 无数据占位样式（可根据需求调整）
-// .no-data-bg {
-//   width: 100%;
-//   height: 100%;
-//   background: #fafafa;
-//   display: flex;
-//   align-items: center;
-//   justify-content: center;
-//   color: #999;
-// }
-
-// Tabs样式优化
-
-:deep(.custom-tabs) {
-  .el-tabs__header {
-    margin-bottom: 8px;
-    display: inline-block;
-    transform: translateY(-12px);
-  }
-
-  .el-tabs__content {
-    overflow: visible;
-  }
-
-  .el-tabs__item {
-    padding-left: 0 !important;
-    padding-right: 0 !important;
-    line-height: 36px !important;
-    height: 36px;
-  }
-}
-
-// :deep(.custom-tabs) {
-//   width: 100%;
-
-//   .el-tabs__header {
-//     margin-bottom: 8px !important;
-//     display: inline-block !important;
-//     transform: translateY(-12px) !important;
-//     border-bottom: none !important;
-//   }
-
-//   .el-tabs__item {
-//     padding: 0 15px !important;
-//     margin-right: 10px !important;
-//     line-height: 36px !important;
-//     height: 36px !important;
-//     font-size: 14px;
-//     color: #999;
-//     position: relative;
-//   }
-
-//   .el-tabs__item.is-active {
-//     color: #333;
-//   }
-
-//   .el-tabs__item.is-active::after {
-//     content: '';
-//     position: absolute;
-//     left: 0;
-//     bottom: -2px;
-//     width: 100%;
-//     height: 2px;
-//     background-color: #0b58ff;
-//   }
-
-//   .el-tabs__item:hover {
-//     color: #666;
-//   }
-// }
-</style>
-
-<style lang="scss">
-// 全局公共样式
-.energyOverlimitLog {
-  .searchBarBox {
-    margin-bottom: 0;
-  }
-
-  .blue-block {
-    float: left;
-    display: inline-block;
-    width: 4px;
-    height: 16px;
-    background-color: #0b58ff;
-    border-radius: 1px;
-    margin-right: 8px;
-    margin-top: 16px;
-  }
-
-  .tip {
-    display: inline-block;
-    font-size: 16px;
-    margin-right: 8px;
-    margin-top: 10px;
-    margin-bottom: 18px;
-  }
-}
-</style>
diff --git a/src/views/core/monitoring/rawFilmReport/SmallTitle.vue b/src/views/core/monitoring/rawFilmReport/SmallTitle.vue
deleted file mode 100644
index 93b4a18f..00000000
--- a/src/views/core/monitoring/rawFilmReport/SmallTitle.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 15:27:31
- * @LastEditors: zwq
- * @LastEditTime: 2023-08-01 16:25:54
- * @Description:
--->
-<template>
-	<div :class="[className, { 'p-0': noPadding }]">
-		<slot />
-	</div>
-</template>
-
-<script>
-export default {
-	props: {
-		size: {
-			// 取值范围:  xl lg md sm
-			type: String,
-			default: 'de',
-			validator: function (val) {
-				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
-			},
-		},
-		noPadding: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	computed: {
-		className: function () {
-			return `${this.size}-title`;
-		},
-	},
-};
-</script>
-
-<style lang="scss" scoped>
-$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
-$mgr: 8px;
-@each $size, $height in $pxls {
-	.#{$size}-title {
-		font-size: 18px;
-		line-height: $height;
-		color: #000;
-		font-weight: 500;
-		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
-
-		&::before {
-			content: '';
-			display: inline-block;
-			vertical-align: top;
-			width: 4px;
-			height: $height + 2px;
-			border-radius: 1px;
-			margin-right: $mgr;
-			background-color: #0b58ff;
-		}
-	}
-}
-
-.p-0 {
-	padding: 0;
-}
-</style>
diff --git a/src/views/core/monitoring/rawFilmReport/add-or-updata.vue b/src/views/core/monitoring/rawFilmReport/add-or-updata.vue
deleted file mode 100644
index e73afd7d..00000000
--- a/src/views/core/monitoring/rawFilmReport/add-or-updata.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-<template>
-  <el-dialog :visible.sync="visible" width="40%">
-    <small-title slot="title" :no-padding="true">
-      {{ !dataForm.id ? '新增' : '编辑' }}
-    </small-title>
-
-    <div class="content">
-      <div class="visual-part">
-        <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"
-          @keyup.enter.native="dataFormSubmit">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="维度" prop="statisticType">
-                <el-select v-model="dataForm.statisticType" style="width: 100%" placeholder="请选择维度">
-                  <el-option v-for="item in statisticTypeList" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="厚度" prop="modifyThick">
-                <el-input v-model="dataForm.modifyThick" placeholder="请输入厚度" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="在线速度" prop="modifySpeed">
-                <el-input v-model="dataForm.modifySpeed" placeholder="请输入在线速度" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="宽度" prop="modifyWidth">
-                <el-input v-model="dataForm.modifyWidth" placeholder="请输入宽度" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="拉引量" prop="modifyInArea">
-                <el-input v-model="dataForm.modifyInArea" placeholder="请输入拉引量" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="下片面积" prop="modifyOutArea">
-                <el-input v-model="dataForm.modifyOutArea" placeholder="请输入下片面积" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="良品率" prop="modifyRatio">
-                <el-input v-model="dataForm.modifyRatio" placeholder="请输入良品率" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </div>
-    <div slot="footer" class="dialog-footer">
-      <el-button style="" @click="goback()">取消</el-button>
-      <el-button  type="primary" @click="dataFormSubmit()">
-        确定
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { editCostOriginRadioHisData } from '@/api/core/monitoring/index'
-import { parseTime } from '../../mixins/code-filter';
-import SmallTitle from './SmallTitle';
-export default {
-	components: { SmallTitle },
-	data() {
-		return {
-			visible: false,
-			addOrUpdateVisible: false,
-      statisticTypeList: [
-        {
-          id: '0',
-          name: '班组'
-        },
-        {
-          id: '1',
-          name: '日'
-        },
-        {
-          id: '2',
-          name: '周'
-        },
-        {
-          id: '3',
-          name: '月'
-        },
-        {
-          id: '4',
-          name: '年'
-        }
-      ],
-			dataForm: {
-				id: null,
-        statisticType:undefined,
-        modifyThick: undefined,
-        modifySpeed: undefined,
-        modifyWidth: undefined,
-        modifyInArea: undefined,
-        modifyOutArea: undefined,
-        modifyRatio: undefined,
-			},
-			dataRule: {
-        statisticType: [
-					{
-						required: true,
-						message: '维度不能为空',
-						trigger: 'blur',
-					},
-					// {
-					// 	type: 'number',
-					// 	message: '产品编码为数字类型',
-					// 	trigger: 'blur',
-					// 	transfom: 'val => Number(val)',
-					// },
-				],
-			},
-		};
-	},
-	methods: {
-    init(data) {
-      console.log(data,'data');
-
-			this.dataForm.id = data.id || null;
-			this.visible = true;
-			this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields();
-        this.dataForm = {
-          id: data.id || null,
-          statisticType: data.statisticType || undefined,
-          modifyThick: data.thick || undefined, // 厚度对应
-          modifySpeed: data.speed || undefined, // 在线速度对应
-          modifyWidth: data.width || undefined, // 掰边宽度对应
-          modifyInArea: data.inArea || undefined, // 拉引量对应
-          modifyOutArea: data.outArea || undefined, // 下片面积对应
-          modifyRatio: data.ratio || undefined, // 良品率对应
-        };
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (valid) {
-					// 修改的提交
-					if (this.dataForm.id) {
-            editCostOriginRadioHisData(this.dataForm).then((response) => {
-							this.$modal.msgSuccess('修改成功');
-							this.visible = false;
-							this.$emit('refreshDataList');
-						});
-						return;
-					}
-				}
-			});
-		},
-		goback() {
-			this.$emit('refreshDataList');
-			this.visible = false;
-			this.initData();
-		},
-	},
-};
-</script>
-
-<style scoped>
-.drawer >>> .el-drawer {
-	border-radius: 8px 0 0 8px;
-	display: flex;
-	flex-direction: column;
-}
-
-.drawer >>> .el-form-item__label {
-	padding: 0;
-}
-
-.drawer >>> .el-drawer__header {
-	margin: 0;
-	padding: 32px 32px 24px;
-	border-bottom: 1px solid #dcdfe6;
-}
-.drawer >>> .el-drawer__body {
-	flex: 1;
-	height: 1px;
-	display: flex;
-	flex-direction: column;
-}
-
-.drawer >>> .content {
-	padding: 30px 24px;
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	/* height: 100%; */
-}
-
-.drawer >>> .visual-part {
-	flex: 1 auto;
-	max-height: 76vh;
-	overflow: hidden;
-	overflow-y: scroll;
-	padding-right: 10px; /* 调整滚动条样式 */
-}
-
-.drawer >>> .el-form,
-.drawer >>> .attr-list {
-	padding: 0 16px;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-</style>
diff --git a/src/views/core/monitoring/rawFilmReport/index.vue b/src/views/core/monitoring/rawFilmReport/index.vue
deleted file mode 100644
index 5dd5448a..00000000
--- a/src/views/core/monitoring/rawFilmReport/index.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2024-12-02 13:44:47
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-  <div class="app-container">
-    <!-- :isFold="true" 控制展开 -->
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table v-if="tableData.length" class="right-aside" v-loading="dataListLoading" :table-props="tableProps"
-      :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData">
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-        @clickBtn="handleClick" />
-    </base-table>
-    <div v-else class="no-data-bg"></div>
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-      @pagination="getDataList" />
-    <!-- <el-dialog
-			title="提示"
-			:visible.sync="dialogVisible"
-			width="30%"
-			:before-close="handleClose">
-			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
-  		<el-button type="success" @click="exportPdf">pdf</el-button>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-			</span>
-		</el-dialog> -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
-  </div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import { parseTime } from '../../mixins/code-filter';
-import { getCostOriginRadioHisData, getPdList  } from '@/api/core/monitoring/index'
-import * as XLSX from 'xlsx'
-import FileSaver from 'file-saver'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
-import { exportCostOriginRadioHisData } from '../../../../api/core/monitoring';
-
-const tableProps = [
-
-  {
-    prop: 'reportType',
-    label: '报表类型'
-  },
-  {
-    prop: 'time',
-    label: '日期',
-    // filter: parseTime,
-    width: 160
-  },
-	{
-    prop: 'bindObjectName',
-		label: '产线'
-  },
-  {
-    prop: 'thick',
-    label: '厚度'
-  },
-  {
-    prop: 'speed',
-    label: '在线速度'
-  },
-	{
-    prop: 'width',
-    label: '掰边宽度'
-	},
-	{
-    prop: 'inArea',
-    label: '拉引量/㎡'
-  },
-  {
-    prop: 'outArea',
-    label: '下片面积/㎡'
-  },
-	{
-    prop: 'ratio',
-    label: '良品率'
-	},
-];
-
-export default {
-  components: {
-    AddOrUpdate
-  },
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getCostOriginRadioHisData
-			},
-      tableData: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-        bindObjectId: undefined,
-        statisticType: undefined,
-      },
-      pdLineList:[],
-      exportLoading: false,
-      dataListLoading: false,
-			selectedList: [],
-			dialogVisible: false,
-      addOrEditTitle: '',
-      addOrUpdateVisible: false,
-			tableProps,
-      tableBtn: [
-        {
-          type: 'edit',
-          btnName: '编辑',
-        },
-      ].filter((v) => v),
-			tableData: [],
-			fileName: '',
-      formConfig: [
-        {
-          type: 'select',
-          label: '维度',
-          selectOptions: [
-            {
-              id: '0',
-              name:'班组'
-            },
-            {
-              id: '1',
-              name: '日'
-            },
-            {
-              id: '2',
-              name: '周'
-            },
-            {
-              id: '3',
-              name: '月'
-            },
-            {
-              id: '4',
-              name: '年'
-            }
-          ],
-          param: 'statisticType'
-        },
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-          param: 'bindObjectId'
-        },
-
-				{
-          type: 'datePicker',
-          label: '统计开始时间',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultTime: ['00:00:00', '23:59:59'],
-          defaultSelect: []
-        },
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				}
-			],
-		};
-	},
-  mounted() {
-    this.$refs.searchBarForm.formInline.statisticType = '1';
-    this.listQuery.statisticType = '1';
-		this.getDataList()
-    this.getPdLineList()
-	},
-  methods: {
-    handleClick(val) {
-      console.log(val);
-      if (val.type === 'edit') {
-        this.addOrUpdateVisible= true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(val.data);
-        });
-      }
-		},
-
-		getPdLineList() {
-			getPdList().then((res) => {
-        this.formConfig[1].selectOptions = res.data || []
-        this.pdLineList = res.data || []; // 保存产线数据
-			})
-		},
-		selectChange(val) {
-      console.log(val)
-      this.selectedList = val
-    },
-    buttonClick(val) {
-      console.log('val', val);
-
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-          this.listQuery.bindObjectId = val.bindObjectId ? val.bindObjectId : undefined;
-          this.listQuery.statisticType = val.statisticType ? val.statisticType : undefined;
-          this.listQuery.startTime = val.timeVal ? val.timeVal[0]: undefined;
-          this.listQuery.endTime = val.timeVal ? val.timeVal[1]: undefined;
-
-					//this.listQuery.reportEndTime = val.timeVal ? [new Date(val.timeVal[1]).getTime()] : undefined;
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        const arr = ['班组','日', '周', '月', '年'];
-        this.tableData = response.data?.list?.map((item) => {
-          item.reportType = arr[this.listQuery.statisticType];
-          item.statisticType = this.listQuery.statisticType
-
-          // 匹配 bindObjectName
-          const targetLine = this.pdLineList.find(line => line.id === item.bindObjectId);
-          item.bindObjectName = targetLine ? targetLine.name : ''; // 赋值名称，无匹配则为空
-          return item;
-        });
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-    handleExport() {
-      // 处理查询参数
-      let params = { ...this.listQuery };
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出原片报表?').then(() => {
-        this.exportLoading = true;
-        return exportCostOriginRadioHisData(params);
-      }).then(response => {
-        this.$download.excel(response, '原片报表.xls');
-        this.exportLoading = false;
-      }).catch(() => { });
-    }
-	},
-};
-</script>
diff --git a/src/views/core/monitoring/sectionStatistics/index.vue b/src/views/core/monitoring/sectionStatistics/index.vue
deleted file mode 100644
index 93b3e4dd..00000000
--- a/src/views/core/monitoring/sectionStatistics/index.vue
+++ /dev/null
@@ -1,363 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2024-12-02 13:44:47
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<!-- :isFold="true" 控制展开 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-if="showData.length"
-			class="right-aside"
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:selectWidth="55"
-			:table-data="showData"
-			@selection-change="selectChange"
-			>
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<div v-else class="no-data-bg"></div>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<el-dialog
-			title="提示"
-			:visible.sync="dialogVisible"
-			width="30%"
-			:before-close="handleClose">
-			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
-  		<el-button type="success" @click="exportPdf">pdf</el-button>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-			</span>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-import { parseTime } from '../../mixins/code-filter';
-import { getWorkshopSectionList, getPdList, getSectionAutoReport  } from '@/api/core/monitoring/sectionStatistics'
-import * as XLSX from 'xlsx'
-import FileSaver from 'file-saver'
-import jsPDF from 'jspdf'
-import html2canvas from 'html2canvas'
-
-const tableProps = [
-	{
-		prop: 'reportType',
-		label: '报表类型'
-	},
-	{
-		prop: 'reportStartTime',
-		label: '统计开始时间',
-		filter: parseTime,
-    width:160
-	},
-	{
-		prop: 'reportEndTime',
-		label: '统计结束时间',
-		filter: parseTime,
-    width:160
-	},
-	{
-		prop: 'lineName',
-		label: '产线名称'
-	},
-	{
-		prop: 'sectionName',
-		label: '工段名称'
-	},
-	{
-		prop: 'inputNum',
-		label: '投入数量/片'
-	},
-	{
-		prop: 'outputNum',
-		label: '产出数量/片'
-	},
-	{
-		prop: 'outputArea',
-		label: '产出面积/㎡',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'lossNum',
-		label: '损耗数量/片'
-	},
-	{
-		prop: 'lossArea',
-		label: '损耗面积/㎡',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'lossRatio',
-		label: '损耗比例%',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	}
-];
-
-export default {
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getSectionAutoReport
-			},
-      tableData: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-      },
-      exportLoading: false,
-      dataListLoading: false,
-			selectedList: [],
-			dialogVisible: false,
-      addOrEditTitle: '',
-      addOrUpdateVisible: false,
-			tableProps,
-			tableBtn: [],
-			tableData: [],
-			showData: [],
-			fileName: '',
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-          param: 'line'
-				},
-				{
-					type: 'select',
-					label: '工段',
-					selectOptions: [],
-          param: 'section'
-				},
-				{
-					type: 'select',
-					label: '报表类型',
-					selectOptions: [
-						{
-							id: 1,
-							name: '日'
-						},
-						{
-							id: 2,
-							name: '周'
-						},
-						{
-							id: 3,
-							name: '月'
-						}
-					],
-					param: 'reportType',
-				},
-				{
-          type: 'datePicker',
-          label: '统计开始时间',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "yyyy-MM-ddTHH:mm:ss",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultSelect: []
-        },
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				}
-			],
-		};
-	},
-	created() {
-		this.getDataList()
-		this.getPdLineList()
-	},
-	methods: {
-		test() {
-			var target = document.getElementsByClassName("right-aside")[0]
-			target.style.background = '#FFFFFF'
-			var that = this
-			setTimeout(() => {
-				html2canvas(target).then(function(canvas) {
-						var contentWidth = canvas.width
-						var contentHeight = canvas.height
-
-						// 一页pdf显示html页面生成的canvas高度
-						var pageHeight = contentHeight / 592.28 * 841.89
-						// 未生成pdf的html页面高度
-						var leftHeight = contentHeight
-						// 页面偏移
-						var position = 0
-						// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-						var imgWidth = 595.28
-						var imgHeight = 592.28 / contentWidth * contentHeight
-
-						var pageData = canvas.toDataURL('image/jpeg', 1.0)
-
-						console.log('nihc URL', leftHeight, pageHeight)
-
-						var pdf = new jsPDF('', 'pt', 'a4')
-
-						if (leftHeight < pageHeight) {
-							pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight)
-						} else {
-							while(leftHeight > 0) {
-								pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
-								leftHeight -= pageHeight
-								position -= 841.89
-								// 避免空白页
-								if (leftHeight > 0) {
-									pdf.addPage()
-								}
-							}
-						}
-
-						pdf.save(that.fileName + '工段统计.pdf')
-				})
-			}, 300)
-		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true)
-			const fix = tables.querySelector('.el-table__fixed')
-			const fixRight = tables.querySelector('.el-table__fixed-right')
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let exportTable = XLSX.utils.table_to_book(tables)
-
-      var exportTableOut = XLSX.write(exportTable, {
-        bookType: 'xlsx', bookSST: true, type: 'array'
-      })
-      // sheetjs.xlsx为导出表格的标题名称
-      try {
-        FileSaver.saveAs(new Blob([exportTableOut], {
-          type: 'application/octet-stream'
-        }), this.fileName + '工段统计.xlsx')
-      } catch (e) {
-        if (typeof console !== 'undefined') console.log(e, exportTableOut)
-      }
-      return exportTableOut
-    },
-		exportPdf() {
-			this.test()
-			setTimeout(() =>{
-				this.dialogVisible = false
-				this.showData = this.tableData
-			}, 600)
-
-		},
-		exportXlsx() {
-			this.exportECL()
-			this.dialogVisible = false
-			this.showData = this.tableData
-		},
-		handleClose(done) {
-			this.$confirm('确认关闭？')
-				.then(_ => {
-					done();
-				})
-				.catch(_ => {});
-		},
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[0].selectOptions = res.data || []
-			})
-			// 获取工段list
-			getWorkshopSectionList().then((res) => {
-				this.formConfig[1].selectOptions = res.data || []
-			})
-		},
-		selectChange(val) {
-      console.log(val)
-      this.selectedList = val
-    },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.lineId = val.line ? val.line : undefined;
-					this.listQuery.sectionId = val.section ? val.section : undefined;
-					this.listQuery.reportType = val.reportType ? val.reportType : undefined;
-					this.listQuery.reportStartTime = val.timeVal ? [new Date(val.timeVal[0]).getTime(),new Date(val.timeVal[1]).getTime()] : undefined;
-					//this.listQuery.reportEndTime = val.timeVal ? [new Date(val.timeVal[1]).getTime()] : undefined;
-					if (val.timeVal && val.timeVal.length > 0) {
-						this.fileName = val.timeVal[0].slice(0, 10) + '-' + val.timeVal[1].slice(0, 10) + '_'
-          }
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list.map(item => {
-					item.reportType = item.reportType === 1 ? '日' : item.reportType === 2 ? '周' : '月'
-					return item
-				});
-				this.showData = this.tableData
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.listQuery.pageSize = val;
-      this.listQuery.pageNo = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.listQuery.pageNo = val;
-      this.getDataList();
-    },
-		handleExport() {
-			if (this.selectedList.length > 0) {
-				this.showData = this.selectedList
-			}
-			this.dialogVisible = true
-    }
-	},
-};
-</script>
diff --git a/src/views/core/monitoring/sectionStatisticsSearch/index.vue b/src/views/core/monitoring/sectionStatisticsSearch/index.vue
deleted file mode 100644
index 7116b772..00000000
--- a/src/views/core/monitoring/sectionStatisticsSearch/index.vue
+++ /dev/null
@@ -1,381 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-if="showData.length"
-			class="right-aside"
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:selectWidth="55"
-			:table-data="showData"
-			@selection-change="selectChange" />
-		<div v-else class="no-data-bg"></div>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<el-dialog
-			title="提示"
-			:visible.sync="dialogVisible"
-			width="30%"
-			:before-close="handleClose">
-			<el-button type="primary" @click="exportXlsx">xlsx</el-button>
-			<el-button type="success" @click="exportPdf">pdf</el-button>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="dialogVisible = false">
-					确 定
-				</el-button>
-			</span>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-// import basicPage from '../../mixins/basic-page';
-import { getSectionDataSearch } from '@/api/core/monitoring';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
-import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
-import { parseTime } from '@/filter/code-filter';
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
-import jsPDF from 'jspdf';
-import html2canvas from 'html2canvas';
-
-const tableProps = [
-	{
-		prop: 'proLineName',
-		label: '产线名称',
-	},
-	{
-		prop: 'sectionName',
-		label: '工段名称',
-	},
-	{
-		prop: 'inputNum',
-		label: '进片数量/片',
-	},
-	{
-		prop: 'outputNum',
-		label: '出片数量/片',
-	},
-	{
-		prop: 'lossNum',
-		label: '损耗数量/片',
-	},
-	{
-		prop: 'lossArea',
-		label: '损耗面积/m²',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-	{
-		prop: 'lossRate',
-		label: '损耗比例/%',
-    filter: (val) => (val != null ? val.toFixed(2) : '-'),
-	},
-];
-
-export default {
-	// mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getSectionDataSearch,
-			},
-			tableProps,
-			tableData: [],
-			showData: [],
-			selectedList: [],
-			listQuery: {
-				proLineId: undefined,
-				sectionId: undefined,
-				startTime: undefined,
-				endTime: undefined,
-				total: 0,
-			},
-			dataListLoading: false,
-			dialogVisible: false,
-			fileName: [],
-			optionArrUrl: [getProductionLinePage, getWorkshopSectionPage],
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'proLineId',
-					defaultSelect: '',
-					filterable: true,
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '工段',
-					selectOptions: [],
-					param: 'sectionId',
-					defaultSelect: '',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'timeSlot',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-		};
-	},
-	components: {},
-	created() {
-		this.getArr();
-		const end = new Date();
-		const start = new Date();
-		start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
-		this.listQuery.startTime = start.getTime();
-		this.listQuery.endTime = end.getTime();
-		this.formConfig[2].startPlaceholder = parseTime(start).substr(0, 10);
-		this.formConfig[2].endPlaceholder = parseTime(end).substr(0, 10);
-		this.getDataList();
-	},
-	methods: {
-		/** 根据产线获取工段 */
-		async getWorksectionById(lineId) {
-			const { code, data } = await this.$axios({
-				url: '/base/workshop-section/listByParentId',
-				method: 'get',
-				params: {
-					id: lineId,
-				},
-			});
-			if (code == 0) {
-				this.formConfig[1].selectOptions = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-		handleSearchBarChanged({ param, value }) {
-			if (!value) {
-				this.formConfig[1].selectOptions = [];
-				return;
-			}
-			switch (param) {
-				case 'proLineId':
-					this.getWorksectionById(value);
-					break;
-			}
-		},
-		test() {
-			var target = document.getElementsByClassName('right-aside')[0];
-			target.style.background = '#FFFFFF';
-			var that = this;
-			setTimeout(() => {
-				html2canvas(target).then(function (canvas) {
-					var contentWidth = canvas.width;
-					var contentHeight = canvas.height;
-
-					// 一页pdf显示html页面生成的canvas高度
-					var pageHeight = (contentHeight / 592.28) * 841.89;
-					// 未生成pdf的html页面高度
-					var leftHeight = contentHeight;
-					// 页面偏移
-					var position = 0;
-					// a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的高度
-					var imgWidth = 595.28;
-					var imgHeight = (592.28 / contentWidth) * contentHeight;
-
-					var pageData = canvas.toDataURL('image/jpeg', 1.0);
-
-					console.log('nihc URL', leftHeight, pageHeight);
-
-					var pdf = new jsPDF('', 'pt', 'a4');
-
-					if (leftHeight < pageHeight) {
-						pdf.addImage(pageData, 'JPEG', 0, 20, imgWidth, imgHeight);
-					} else {
-						while (leftHeight > 0) {
-							pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight);
-							leftHeight -= pageHeight;
-							position -= 841.89;
-							// 避免空白页
-							if (leftHeight > 0) {
-								pdf.addPage();
-							}
-						}
-					}
-
-					pdf.save(that.fileName[0] + '-' + that.fileName[1] + '_工段统计.pdf');
-				});
-			}, 300);
-		},
-		exportECL() {
-			let tables = document.querySelector('.el-table').cloneNode(true);
-			const fix = tables.querySelector('.el-table__fixed');
-			const fixRight = tables.querySelector('.el-table__fixed-right');
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'));
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'));
-			}
-			let exportTable = XLSX.utils.table_to_book(tables);
-
-			var exportTableOut = XLSX.write(exportTable, {
-				bookType: 'xlsx',
-				bookSST: true,
-				type: 'array',
-			});
-			// sheetjs.xlsx为导出表格的标题名称
-			try {
-				FileSaver.saveAs(
-					new Blob([exportTableOut], {
-						type: 'application/octet-stream',
-					}),
-					this.fileName[0] + '-' + this.fileName[1] + '_工段统计.xlsx'
-				);
-			} catch (e) {
-				if (typeof console !== 'undefined') console.log(e, exportTableOut);
-			}
-			return exportTableOut;
-		},
-		exportPdf() {
-			this.test();
-			setTimeout(() => {
-				this.dialogVisible = false;
-				this.showData = this.tableData;
-			}, 600);
-		},
-		exportXlsx() {
-			this.exportECL();
-			this.dialogVisible = false;
-			this.showData = this.tableData;
-		},
-		handleClose(done) {
-			this.$confirm('确认关闭？')
-				.then((_) => {
-					done();
-				})
-				.catch((_) => {});
-		},
-		getArr() {
-			const params = {
-				page: 1,
-				limit: 500,
-			};
-			this.optionArrUrl.forEach((item, index) => {
-				item(params).then((response) => {
-					this.formConfig[index].selectOptions = response.data.list;
-				});
-			});
-		},
-		getDataList() {
-			this.urlOptions.getDataListURL(this.listQuery).then((res) => {
-				this.tableData = res.data;
-				this.listQuery.total = this.tableData.length;
-				this.dataListLoading = false;
-				this.showData = this.tableData;
-			});
-		},
-		// 每页数
-		sizeChangeHandle(val) {
-			this.listQuery.pageSize = val;
-			this.listQuery.pageNo = 1;
-			this.getDataList();
-		},
-		// 当前页
-		currentChangeHandle(val) {
-			this.listQuery.pageNo = val;
-			this.getDataList();
-		},
-		handleExport() {
-			if (this.selectedList.length > 0) {
-				this.showData = this.selectedList;
-			}
-			this.dialogVisible = true;
-		},
-		selectChange(val) {
-			console.log(val);
-			this.selectedList = val;
-		},
-		buttonClick(val) {
-			console.log(val);
-			switch (val.btnName) {
-				case 'search':
-					console.log(val.timeSlot);
-					this.formConfig[2].startPlaceholder = '开始时间';
-					this.formConfig[2].endPlaceholder = '结束时间';
-					// this.listQuery.pageNo = 1;
-					// this.listQuery.pageSize = 10;
-					this.listQuery.proLineId = val.proLineId ? val.proLineId : undefined;
-					this.listQuery.sectionId = val.sectionId ? val.sectionId : undefined;
-					this.listQuery.startTime = val.timeSlot
-						? new Date(val.timeSlot[0]).getTime()
-						: undefined;
-					this.listQuery.endTime = val.timeSlot
-						? new Date(val.timeSlot[1]).getTime()
-						: undefined;
-					if (val.timeSlot && val.timeSlot.length > 0) {
-						this.fileName[0] = val.timeSlot[0].slice(0, 10);
-						this.fileName[1] = val.timeSlot[1].slice(0, 10);
-						this.getDataList();
-					} else {
-						this.$message({
-							message: '请选择时间',
-							type: 'warning',
-						});
-					}
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'export':
-					if (val.timeSlot && val.timeSlot.length > 0) {
-						this.handleExport();
-					} else {
-						this.$message({
-							message: '请选择时间',
-							type: 'warning',
-						});
-					}
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/components/SmallTitle.vue b/src/views/cost/components/SmallTitle.vue
deleted file mode 100644
index 8e04d268..00000000
--- a/src/views/cost/components/SmallTitle.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 15:27:31
- * @LastEditors: zwq
- * @LastEditTime: 2023-08-01 16:25:54
- * @Description:
--->
-<template>
-	<div :class="[className, { 'p-0': noPadding }]">
-		<slot />
-	</div>
-</template>
-
-<script>
-export default {
-	props: {
-		size: {
-			// 取值范围:  xl lg md sm
-			type: String,
-			default: 'de',
-			validator: function (val) {
-				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
-			},
-		},
-		noPadding: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	computed: {
-		className: function () {
-			return `${this.size}-title`;
-		},
-	},
-};
-</script>
-
-<style lang="scss" scoped>
-$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
-$mgr: 8px;
-@each $size, $height in $pxls {
-	.#{$size}-title {
-		font-size: $height;
-		line-height: $height;
-		color: #000;
-		font-weight: 500;
-		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
-
-		&::before {
-			content: '';
-			display: inline-block;
-			vertical-align: top;
-			width: 4px;
-			height: $height + 2px;
-			border-radius: 1px;
-			margin-right: $mgr;
-			background-color: #0b58ff;
-		}
-	}
-}
-
-.p-0 {
-	padding: 0;
-}
-</style>
diff --git a/src/views/cost/components/add-or-updata.vue b/src/views/cost/components/add-or-updata.vue
deleted file mode 100644
index e0c75ee0..00000000
--- a/src/views/cost/components/add-or-updata.vue
+++ /dev/null
@@ -1,442 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 15:07:24
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-07 15:35:14
- * @Description:
--->
-<template>
-	<div>
-		<div class="circle-container">
-			<div v-for="(item, index) in dotArr" :key="index" class="circle-wrapper">
-				<div
-					class="circle"
-					:style="{
-						background: stepNum == index + 1 ? '#0B58FF' : '',
-					}">
-					{{ index + 1 }}
-				</div>
-				<div
-					class="circle-text"
-					:style="{
-						color: stepNum == index + 1 ? '#0B58FF' : '',
-					}">
-					{{ item.name }}
-				</div>
-				<!-- 圆点后面的虚线 -->
-				<div v-if="index < 2" class="connector" />
-			</div>
-		</div>
-		<div v-if="stepNum == 1">
-			<div class="topTip">
-				1.可选择库区、巷道，同批次创建任务搬运仅支持同一产品型号。
-				<br />
-				2.须在本页下方填写搬运数量，搬运数量仅支持双数，且数量≤当前可用库存总量。
-			</div>
-			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
-				步骤一：选择产品及起点
-			</small-title>
-			<el-form
-				:model="dataForm"
-				:rules="dataRule"
-				ref="dataForm"
-				@keyup.enter.native="dataFormSubmit()"
-				label-position="top"
-				label-width="80px">
-				<el-row :gutter="10">
-					<el-col :span="6">
-						<el-form-item label="搬运对象" prop="val1">
-							<el-select
-								style="width: 100%"
-								v-model="dataForm.val1"
-								placeholder="请选择搬运对象">
-								<el-option
-									v-for="item in options1"
-									:key="item.value"
-									:label="item.label"
-									:value="item.value"></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6" v-if="dataForm.val1 == 1">
-						<el-form-item label="产品名称" prop="val1">
-							<el-select
-								style="width: 100%"
-								v-model="dataForm.val2"
-								placeholder="请选择产品名称">
-								<el-option
-									v-for="item in options1"
-									:key="item.value"
-									:label="item.label"
-									:value="item.value"></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6" v-if="dataForm.val1 == 1">
-						<el-form-item label="规格型号" prop="val1">
-							<el-select
-								style="width: 100%"
-								v-model="dataForm.val2"
-								placeholder="请选择规格型号">
-								<el-option
-									v-for="item in options1"
-									:key="item.value"
-									:label="item.label"
-									:value="item.value"></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="搬运数量" prop="val4">
-							<el-input
-								v-model="dataForm.val4"
-								oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
-								<template slot="append">盘</template>
-							</el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row :gutter="10">
-					<el-col :span="12">
-						<el-form-item label="起点信息" prop="val5">
-							<el-radio-group v-model="dataForm.val5">
-								<el-radio :label="1">按策略自动选择</el-radio>
-								<el-radio :label="2">指定起点</el-radio>
-							</el-radio-group>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-			<div v-if="dataForm.val5 == 2" class="potBG-div">
-				<div>
-					<el-row :gutter="10">
-						<el-col :span="10">
-							起点库区:
-							<el-select
-								style="width: 200px; margin-left: 10px"
-								v-model="startPot"
-								size="small"
-								placeholder="请选择起点库区">
-								<el-option
-									v-for="item in options1"
-									:key="item.value"
-									:label="item.label"
-									:value="item.value"></el-option>
-							</el-select>
-						</el-col>
-						<el-col :span="13" style="text-align: right; line-height: 36px">
-							<span
-								class="num1-startPot-status"
-								style="background-color: #5ab45a" />
-							可选
-							<span class="num1-startPot-status" />
-							不可选
-							<span
-								class="num1-startPot-status"
-								style="background-color: #e9b100" />
-							已选
-						</el-col>
-					</el-row>
-					<div class="potTitleBG">
-						<div v-for="item in Object.keys(startPotList)" :key="item">
-							<div class="potTitle">
-								{{ item }}
-							</div>
-							<div class="potList">
-								<div
-									class="pot"
-									v-for="sitem in startPotList[item]"
-									:key="sitem.id"
-									:style="{
-										backgroundColor: potBGcolor[sitem.status],
-										cursor: sitem.status > 0 ? 'pointer' : '',
-									}"
-									@click="sitem.status > 0 && setStartPot(sitem)"
-									:title="sitem.name">
-									{{ sitem.name }}
-								</div>
-							</div>
-						</div>
-					</div>
-						<el-divider></el-divider>
-						<div style="text-align: right">可用库存总量 <span style="color:#409EFF;font-size:16px">12</span> 盘</div>
-				</div>
-			</div>
-		</div>
-		<div v-if="stepNum == 2">
-			<div class="topTip">
-				1.指定终点库位，下发后会锁定所属巷道仅本批次任务进入。
-				<br />
-				2.指定终点库位选位规则：仅可从巷道最里空对位选位。
-				<br />
-				3.只选择库区或巷道时，该方式下当前终点为候选位置，系统将根据策略与现场实际情况自动确定最终终点库位。
-			</div>
-			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
-				步骤二：选择终点
-			</small-title>
-		</div>
-		<div v-if="stepNum == 3">
-			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
-				步骤三：预览与下发
-			</small-title>
-		</div>
-	</div>
-</template>
-
-<script>
-import SmallTitle from './SmallTitle';
-export default {
-	components: {
-		SmallTitle,
-	},
-	data() {
-		return {
-			dotArr: [
-				{
-					name: '选择起点',
-				},
-				{
-					name: '选择终点',
-				},
-				{
-					name: '预览下发',
-				},
-			],
-			potBGcolor: ['', '#dafadc', '#f8f0c4'],
-			stepNum: 1, // 当前第几步
-			//第一步参数
-			dataForm: {
-				id: undefined,
-				val1: undefined,
-				val2: undefined,
-				val3: undefined,
-				val4: undefined,
-				val5: 1,
-			},
-			options1: [
-				{
-					label: '产品',
-					value: 1,
-				},
-				{
-					label: '空盘',
-					value: 2,
-				},
-			],
-			dataRule: {},
-			startPot: undefined, //起点库区选择的类型
-			startPotList: {
-				//起点库区List
-				G01: [
-					{
-						id: '001',
-						name: 'L001',
-						status: 1,
-					},
-					{
-						id: '002',
-						name: 'R002',
-						status: 1,
-					},
-					{
-						id: '003',
-						name: 'L003',
-						status: 0,
-					},
-					{
-						id: '004',
-						name: 'R004',
-						status: 0,
-					},
-				],
-				G02: [
-					{
-						id: '005',
-						name: 'L005',
-					},
-					{
-						id: '006',
-						name: 'R006',
-					},
-					{
-						id: '007',
-						name: 'L007',
-					},
-					{
-						id: '008',
-						name: 'R008',
-					},
-				],
-			},
-		};
-	},
-	methods: {
-		init(id) {
-			this.dataForm.id = id || undefined;
-			this.$nextTick(() => {
-				if (this.dataForm.id) {
-				} else {
-				}
-			});
-		},
-		//上一步
-		upSubmit() {
-			if (this.stepNum == 2) {
-				this.stepNum -= 1;
-				this.$emit('setSN', this.stepNum);
-			} else if (this.stepNum == 3) {
-				this.stepNum -= 1;
-				this.$emit('setSN', this.stepNum);
-			}
-		},
-		//下一步
-		nextSubmit() {
-			if (this.stepNum == 1) {
-				this.stepNum += 1;
-				this.$emit('setSN', this.stepNum);
-				return;
-			}
-			if (this.stepNum == 2) {
-				this.stepNum += 1;
-				this.$emit('setSN', this.stepNum);
-				return;
-			}
-			if (this.stepNum == 3) {
-				this.stepNum = 1;
-				this.$emit('setSN', this.stepNum);
-				return;
-			}
-		},
-		cancelStep() {},
-
-		// 第一步方法
-		setStartPot(data) {
-			data.status = data.status == 1 ? 2 : 1;
-		},
-	},
-};
-</script>
-
-<style scoped>
-.topTip {
-	background-color: #ebebeb;
-	padding: 10px 20px;
-	border-radius: 5px;
-	line-height: 25px;
-}
-</style>
-<!-- //库位点的样式 -->
-<style scoped>
-.potBG-div {
-	width: 100%;
-	margin: 10px;
-	border: 1px solid gainsboro;
-	box-shadow: 2px 2px 2px gainsboro, -1px -1px 3px gainsboro;
-	padding: 15px;
-}
-.num1-startPot-status {
-	margin-left: 5px;
-	display: inline-block;
-	width: 14px;
-	height: 14px;
-	border: 1px solid gainsboro;
-}
-.potTitleBG {
-	margin-top: 10px;
-	overflow-x: auto;
-	display: flex;
-}
-.potTitle {
-	width: 82px;
-	background-color: rgb(169, 235, 249);
-	border-radius: 3px;
-	margin-right: 5px;
-	text-align: center;
-	color: #000000;
-	letter-spacing: 1px;
-	margin-bottom: 10px;
-}
-.potList {
-	width: 82px;
-	display: grid;
-	grid-template-columns: 40px 40px;
-	gap: 2px;
-}
-.pot {
-	width: 40px;
-	text-align: center;
-	border: 1px solid gainsboro;
-	border-radius: 3px;
-	padding: 5px 0;
-	margin-bottom: 5px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-</style>
-
-<!-- //序号圆点 -->
-<style scoped>
-.circle-container {
-	height: 110px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	padding: 20px;
-	width: 90%;
-	overflow-x: auto;
-	margin: auto;
-}
-
-.circle-wrapper {
-	position: relative;
-	display: flex;
-	align-items: center;
-}
-
-.circle {
-	width: 52px;
-	height: 52px;
-	border-radius: 50%;
-	background: #8db1ff;
-	font-weight: 500;
-	font-size: 31px;
-	color: #ffffff;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	position: relative;
-	z-index: 2;
-	cursor: pointer;
-}
-.circle-text {
-	position: absolute;
-	top: 60px;
-	left: -15px;
-	color: #8db1ff;
-	width: 82px;
-	text-align: center;
-}
-
-/* 下半圆虚线边框 */
-.circle::after {
-	content: '';
-	position: absolute;
-	bottom: -6px; /* 2px边框 + 2px间隙 */
-	left: -4px;
-	right: -4px;
-	height: 30px; /* 半圆高度 */
-	border-radius: 0 0 60px 60px;
-	border: 1px dashed #0b58ff;
-	border-top: none;
-	z-index: 1;
-}
-
-.connector {
-	width: 160px; /* 计算连接线长度 */
-	height: 2px;
-	border-bottom: 1px dashed rgb(11, 88, 255, 1);
-	margin: 0 5px;
-	z-index: 1;
-}
-</style>
diff --git a/src/views/cost/components/detailDrawer.vue b/src/views/cost/components/detailDrawer.vue
deleted file mode 100644
index f98e25a9..00000000
--- a/src/views/cost/components/detailDrawer.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-11-07 17:01:51
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-07 22:31:17
- * @Description:
--->
-<template>
-	<el-drawer
-		:visible.sync="visible"
-		:with-header="false"
-		size="50%"
-		@close="closeD"
-		:show-close="false">
-		<div class="bgDiv1">
-			<el-row :gutter="20" style="margin-bottom: 15px">
-				<el-col :span="8" style="font-size: 20px; font-weight: 600">
-					TSK202510230001
-				</el-col>
-				<el-col :span="8">满盘搬运（自动）</el-col>
-				<el-col :span="8">
-					上次刷新：{{ parseTime(Date.now()) }}
-					<el-button type="text" @click="refresh">刷新</el-button>
-				</el-col>
-			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="8">任务状态</el-col>
-				<el-col :span="8">优先级</el-col>
-				<el-col :span="8">执行车辆</el-col>
-			</el-row>
-			<el-row :gutter="20" style="margin-bottom: 15px">
-				<el-col :span="8">
-					<span
-						:style="{ backgroundColor: statusColor[1].color }"
-						class="taskStatus">
-						{{ statusColor[1].label }}
-					</span>
-				</el-col>
-				<el-col :span="8">中</el-col>
-				<el-col :span="8">--</el-col>
-			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="8">执行时长</el-col>
-				<el-col :span="8">创建人</el-col>
-				<el-col :span="8">创建时间</el-col>
-			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="8">--</el-col>
-				<el-col :span="8">系统/张三</el-col>
-				<el-col :span="8">{{ parseTime(Date.now()) }}</el-col>
-			</el-row>
-		</div>
-		<div class="bgDiv2">
-			<el-steps
-				:active="stepNum"
-				finish-status="success"
-				:process-status="stepStatus"
-				align-center>
-				<el-step title="待下发"></el-step>
-				<el-step title="待执行"></el-step>
-				<el-step title="执行中"></el-step>
-				<el-step title="已完成"></el-step>
-			</el-steps>
-			<div class="abnormal">任务异常：无效路径</div>
-		</div>
-		<div class="bgDiv3">
-			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
-				搬运对象
-			</small-title>
-			<el-row :gutter="20">
-				<el-col :span="12">
-					<div class="pan-info">
-						<div class="pan-title">L盘</div>
-					</div>
-				</el-col>
-				<el-col :span="12">
-					<div class="pan-info">
-						<div class="pan-title">R盘</div>
-					</div>
-				</el-col>
-			</el-row>
-		</div>
-		<div class="bgDiv4">
-			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
-				回收信息
-			</small-title>
-			<el-descriptions :column="2" size="medium" border>
-				<el-descriptions-item label="回收方式">他车回收</el-descriptions-item>
-				<el-descriptions-item label="回收任务编号">
-					18100000000
-				</el-descriptions-item>
-				<el-descriptions-item label="回收库位">
-					CK-01-A05-L / R
-				</el-descriptions-item>
-				<el-descriptions-item label="执行车辆">AGV-06</el-descriptions-item>
-			</el-descriptions>
-		</div>
-		<div class="bgDiv5">
-			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
-				任务明细
-			</small-title>
-			<el-descriptions :column="2" size="medium" border>
-				<el-descriptions-item label="起点库位(L/R)">
-					CK-01-A05-L / R
-				</el-descriptions-item>
-				<el-descriptions-item label="终点库位(L/R)">
-					CC-02-B03-L/R (候选 )
-				</el-descriptions-item>
-				<el-descriptions-item label="起点策略">--</el-descriptions-item>
-				<el-descriptions-item label="终点策略">入库策略</el-descriptions-item>
-				<el-descriptions-item label="FMS任务号">--</el-descriptions-item>
-				<el-descriptions-item label="车辆位置">--</el-descriptions-item>
-				<el-descriptions-item label="电量">--</el-descriptions-item>
-				<el-descriptions-item label="是否载货">--</el-descriptions-item>
-				<el-descriptions-item label="创建方式">自动/人工</el-descriptions-item>
-				<el-descriptions-item label="任务来源">
-					PDA/PC/系统
-				</el-descriptions-item>
-				<el-descriptions-item label="关联叫料单">--</el-descriptions-item>
-				<el-descriptions-item label=""></el-descriptions-item>
-			</el-descriptions>
-		</div>
-		<div class="bgDiv6">
-			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
-				任务日志
-			</small-title>
-			<el-timeline style="padding: 0">
-				<el-timeline-item
-					v-for="(activity, index) in activities"
-					:key="index"
-					:type="activity.type"
-					:color="activity.color"
-					size="large"
-					hide-timestamp>
-					<span>{{ activity.content }}</span>
-					<span style="float: right">{{ activity.timestamp }}</span>
-				</el-timeline-item>
-			</el-timeline>
-		</div>
-						<el-divider></el-divider>
-
-      <!-- 底部按钮 -->
-			<div class="drawer-body__footer">
-        <el-button @click="closeD">返 回</el-button>
-      </div>
-	</el-drawer>
-</template>
-<script>
-import SmallTitle from './SmallTitle';
-
-export default {
-	name: '',
-	data() {
-		return {
-			visible: false,
-			title: '',
-			statusColor: [
-				//bgDiv1的任务状态
-				{ label: '待下发', color: '#fa8c16' },
-				{ label: '待执行', color: '#1890ff' },
-				{ label: '执行中', color: '#1890ff' },
-				{ label: '已完成', color: '#52c41a' },
-				{ label: '暂停中', color: '#8c8c8c' },
-				{ label: '已终止', color: '#faad14' },
-				{ label: '异常', color: '#ff4d4f' },
-				{ label: '禁用', color: '#d9d9d9' },
-			],
-			//bgDiv2的步骤条
-			stepNum: 2,
-			stepStatus: 'finish',
-			//bgDiv6的时间线
-
-			activities: [
-				{
-					content: 'FMS | 卸货完成，任务完成',
-					timestamp: '2018-04-12 20:46',
-					type: 'primary',
-				},
-				{
-					content: 'FMS | 取货完成',
-					timestamp: '2018-04-03 20:46',
-				},
-				{
-					content: 'FMS | 派车AGV-03，前往起点取货',
-					timestamp: '2018-04-03 20:46',
-				},
-				{
-					content: '张三 | 任务扫码配对完成，进入待下发',
-					timestamp: '2018-04-03 20:46',
-				},
-			],
-		};
-	},
-	components: {
-		SmallTitle,
-	},
-	created() {},
-	methods: {
-		init(val) {
-			this.visible = true;
-		},
-		//刷新
-		refresh() {},
-		closeD() {
-      this.visible = false
-			this.$emit('closeDrawer');
-		},
-	},
-};
-</script>
-
-<style lang="scss" scoped>
-.bgDiv1 {
-	background-color: rgba(242, 242, 242, 0.5);
-	padding: 20px;
-	line-height: 25px;
-	font-size: 15px;
-	border-bottom: 1px solid rgba(121, 121, 121, 0.5);
-	.taskStatus {
-		text-align: center;
-		border-radius: 3px;
-		padding: 2px 5px;
-		color: #fff;
-	}
-}
-.bgDiv2 {
-	border-bottom: 1px solid rgba(121, 121, 121, 0.5);
-	padding: 18px 0;
-	.abnormal {
-		width: 80%;
-		margin: auto;
-		border-radius: 5px;
-		height: 40px;
-		font-size: 22px;
-		line-height: 40px;
-		text-align: center;
-		background-color: rgba(217, 0, 27, 0.1);
-		color: rgba(217, 0, 27, 1);
-		border: 1px solid rgba(217, 0, 27, 1);
-	}
-}
-.bgDiv3 {
-	padding: 20px 20px 0;
-	.pan-info {
-		height: 350px;
-		border: 1px solid rgba(121, 121, 121, 0.8);
-		border-radius: 5px;
-		.pan-title {
-			background-color: rgba(242, 242, 242, 0.5);
-			height: 35px;
-			font-size: 20px;
-			line-height: 35px;
-			padding: 0 20px;
-			border-bottom: 1px solid rgba(121, 121, 121, 0.5);
-			letter-spacing: 2px;
-		}
-	}
-}
-.bgDiv4 {
-	padding: 20px 20px 0;
-}
-.bgDiv5 {
-	padding: 20px 20px 0;
-}
-.bgDiv6 {
-	padding: 20px 20px 0;
-}
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 0 18px 10px;
-}
-</style>
diff --git a/src/views/cost/components/stopInStock.vue b/src/views/cost/components/stopInStock.vue
deleted file mode 100644
index 46bafa01..00000000
--- a/src/views/cost/components/stopInStock.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-11-08 17:44:05
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-08 18:13:25
- * @Description:
--->
-<template>
-	<div>
-		<div>请选择要执行的终止方式，系统会根据选择进行处理</div>
-		<el-radio-group v-model="radio" class="stockRadioDiv">
-			<el-radio :label="1" border style="margin: 10px 0">
-				仅终止，稍后回收
-				<div style="font-weight: 400">
-					任务立即终止，车辆保持暂停，稍后可在任务列表中手动回收
-				</div>
-			</el-radio>
-			<el-radio :label="2" border style="margin: 10px 0">
-				终止，并立即回收
-				<div style="font-weight: 400">
-					任务立即终止立即，选择货物回收方式生成任务或更新卸货点
-				</div>
-			</el-radio>
-		</el-radio-group>
-		<div>
-			终止原因：
-			<el-input
-				type="textarea"
-				:rows="3"
-         style="margin: 10px 0"
-				placeholder="请输入终止原因"
-				v-model="textarea" />
-		</div>
-	</div>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			radio: 1,
-			textarea: '',
-		};
-	},
-	methods: {
-		init(val) {},
-		submit() {
-      if(this.textarea){
-
-      }else{
-        this.$message('请输入终止原因');
-      }
-    },
-	},
-};
-</script>
-
-<style scoped>
-.stockRadioDiv >>> .el-radio--medium.is-bordered {
-	display: flex;
-	align-items: center;
-	height: 70px;
-  line-height: 20px;
-}
-</style>
diff --git a/src/views/cost/components/subSpan1.vue b/src/views/cost/components/subSpan1.vue
deleted file mode 100644
index 931ecb10..00000000
--- a/src/views/cost/components/subSpan1.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-06 15:19:24
- * @Description:
--->
-<template>
-	<span>
-		{{
-			(injectData.val2
-				? ['满盘搬运', '空盘搬运', '备料搬运', '临时搬运'][injectData.val2]
-				: '-')
-		}}
-	</span>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>
diff --git a/src/views/cost/components/subSpan2.vue b/src/views/cost/components/subSpan2.vue
deleted file mode 100644
index 6519543c..00000000
--- a/src/views/cost/components/subSpan2.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-06 15:20:43
- * @Description:
--->
-<template>
-	<span>
-		{{
-			(injectData.val3
-				? ['待下发', '待执行', '执行中', '已完成', '暂停中', '已终止', '异常'][injectData.val3]
-				: '-')
-		}}
-	</span>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>
diff --git a/src/views/cost/components/subSpan3.vue b/src/views/cost/components/subSpan3.vue
deleted file mode 100644
index 00322b68..00000000
--- a/src/views/cost/components/subSpan3.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-06 15:37:02
- * @Description:
--->
-<template>
-	<div>
-		<div style="display: flex; align-items: center">
-			<div
-				style="
-					width: 16px;
-					height: 16px;
-					border-radius: 5px;
-					background-color: #e89b24;
-					color: #fff;
-          text-align:center;
-          line-height:16px
-				">
-				L
-			</div>
-			产品名称+产品规格
-		</div>
-		<div style="display: flex; align-items: center">
-			<div
-				style="
-					width: 16px;
-					height: 16px;
-					border-radius: 5px;
-					background-color: #6a96ec;
-					color: #fff;
-          text-align:center;
-          line-height:16px
-				">
-				R
-			</div>
-			产品名称+产品规格
-		</div>
-	</div>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>
diff --git a/src/views/cost/components/subSpan4.vue b/src/views/cost/components/subSpan4.vue
deleted file mode 100644
index 931ecb10..00000000
--- a/src/views/cost/components/subSpan4.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-06 15:19:24
- * @Description:
--->
-<template>
-	<span>
-		{{
-			(injectData.val2
-				? ['满盘搬运', '空盘搬运', '备料搬运', '临时搬运'][injectData.val2]
-				: '-')
-		}}
-	</span>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>
diff --git a/src/views/cost/components/typeRule.vue b/src/views/cost/components/typeRule.vue
deleted file mode 100644
index 046a1261..00000000
--- a/src/views/cost/components/typeRule.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-12-05 13:45:59
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-15 17:12:03
- * @Description
--->
-<template>
-	<div>
-		<span>{{ parseTime(injectData.startTime,'{y}年{m}月{d}日') + '-' + (parseTime(injectData.endTime)?parseTime(injectData.endTime,'{y}年{m}月{d}日'):'永久') }}</span>
-	</div>
-</template>
-<script>
-export default {
-	name: '',
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/costAnalysis/index.vue b/src/views/cost/costAnalysis/index.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/cost/costStatistics/add-or-updata.vue b/src/views/cost/costStatistics/add-or-updata.vue
deleted file mode 100644
index b61d383d..00000000
--- a/src/views/cost/costStatistics/add-or-updata.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-11 15:49:14
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="日期" prop="recTime">
-					<el-date-picker
-						v-model="dataForm.recTime"
-						type="date"
-						value-format="timestamp"
-						:style="{ width: '100%' }"
-						disabled
-						placeholder="日期"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="总成本" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.price"
-						disabled
-						placeholder="总成本" />
-					(元)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="原片下片面积" prop="originArea">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.originArea"
-						clearable
-						placeholder="请输入原片下片面积" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="深加工下片面积" prop="deepArea">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.deepArea"
-						clearable
-						placeholder="请输入深加工下片面积" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="原片成本" prop="originPrice">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.originPrice"
-						clearable
-						placeholder="请输入原片成本" />
-					(元)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="深加工成本" prop="deepPrice">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.deepPrice"
-						clearable
-						placeholder="请输入深加工成本" />
-					(元)
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import { updateCostSum } from '@/api/cost/allCost';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				updateURL: updateCostSum,
-			},
-			dataForm: {
-				id: undefined,
-				originArea: undefined,
-				deepArea: undefined,
-				originPrice: undefined,
-				deepPrice: undefined,
-				price: undefined,
-			},
-			dataRule: {
-			},
-		};
-	},
-	methods: {
-		init(val, statisticType) {
-			this.visible = true;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				this.dataForm = JSON.parse(JSON.stringify(val));
-				this.dataForm.statisticType = statisticType;
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				const data = {
-					id: this.dataForm.id,
-					statisticType: this.dataForm.statisticType,
-					modifyOriginArea: this.dataForm.originArea,
-					modifyOriginPrice: this.dataForm.originPrice,
-					modifyDeepArea: this.dataForm.deepArea,
-					modifyDeepPrice: this.dataForm.deepPrice,
-					modifyPrice: this.dataForm.deepPrice + this.dataForm.originPrice,
-				};
-				// 修改的提交
-				this.urlOptions.updateURL(data).then((response) => {
-					this.$modal.msgSuccess('修改成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/costStatistics/index.vue b/src/views/cost/costStatistics/index.vue
deleted file mode 100644
index 87f67855..00000000
--- a/src/views/cost/costStatistics/index.vue
+++ /dev/null
@@ -1,404 +0,0 @@
-<template>
-	<div>
-		<!-- <div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['按日期', '按规格']" @change="currentMenu">
-				<template v-slot:tab1>
-					<div>按日期</div>
-				</template>
-				<template v-slot:tab2>
-					<div>按规格</div>
-				</template>
-			</ButtonNav>
-		</div> -->
-		<div class="app-container energyOverlimitLog">
-			<div v-show="activeName === 'his'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig"
-					ref="searchBarForm"
-					@headBtnClick="buttonClick" />
-			</div>
-			<div v-show="activeName === 'now'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig2"
-					ref="searchBarForm2"
-					@headBtnClick="buttonClick" />
-			</div>
-			<!-- 列表 -->
-			<div v-if="activeName === 'his'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps"
-					:table-data="tableData"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<div v-if="activeName === 'now'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps2"
-					:table-data="tableData2"
-					:max-height="tableH" />
-			</div>
-			<pagination
-				:page.sync="listQuery.pageNo"
-				:limit.sync="listQuery.pageSize"
-				:total="listQuery.total"
-				@pagination="getNavDataList" />
-			<base-dialog
-				:dialogTitle="addOrEditTitle"
-				:dialogVisible="addOrUpdateVisible"
-				@cancel="handleCancel"
-				@confirm="handleConfirm"
-				:before-close="handleCancel"
-				width="50%">
-				<add-or-update
-					ref="addOrUpdate"
-					@refreshDataList="successSubmit"></add-or-update>
-			</base-dialog>
-		</div>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import {
-	getCostSumPage,
-	getRawCostStatisticsRealtimePage,
-  exportRawStatisticsRealtimeExcel,
-  exportCostSumExcel
-} from '@/api/cost/allCost';
-import { parseTime } from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import typeRule from './typeRule';
-import ButtonNav from '@/components/ButtonNav';
-
-const tableProps = [
-	{
-		prop: 'time',
-		label: '日期',
-	},
-	{
-		prop: 'originArea',
-		label: '原片下片面积',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'deepArea',
-		label: '深加工下片面积',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'originPrice',
-		label: '原片成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'deepPrice',
-		label: '深加工成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'price',
-		label: '总成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-];
-const tableProps2 = [
-	{
-		prop: 'bindObjectName',
-		label: '产品名称',
-	},
-	{
-		prop: 'spec',
-		label: '规格',
-	},
-	{
-		prop: 'costSum',
-		label: '原片单片成本/元',
-		align: 'right',
-	},
-	{
-		prop: 'costPiece',
-		label: '深加工单片成本/元',
-		align: 'right',
-	},
-	{
-		prop: 'costPiece',
-		label: '成品单片成本/元',
-		align: 'right',
-	},
-	{
-		prop: 'costArea',
-		label: '每平米成本/元',
-		align: 'right',
-	},
-];
-export default {
-	name: 'allCost',
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getCostSumPage,
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '维度',
-					selectOptions: [
-						{ id: 1, name: '日' },
-						{ id: 2, name: '周' },
-						{ id: 3, name: '月' },
-					],
-					param: 'statisticType',
-					defaultSelect: 1, // 默认值,
-					clearable: false,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'searchTime',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			formConfig2: [
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'searchTime',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			listQuery: {
-				statisticType: 1,
-			},
-			activeName: 'his',
-			tableProps,
-			tableProps2,
-			tableBtn: [
-        {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-			].filter((v) => v),
-			tableData: [],
-			tableData2: [],
-		};
-	},
-	components: {
-		AddOrUpdate,
-		ButtonNav,
-	},
-	created() {
-	},
-	methods: {
-		buttonClick(val) {
-			this.formConfig2[0].startPlaceholder = '开始时间';
-			this.formConfig2[0].endPlaceholder = '结束时间';
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.bindObjectId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-						: null;
-					if (this.activeName === 'his') {
-						this.getDataList();
-					} else {
-						this.getDataList2();
-					}
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.bindObjectId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-						: null;
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		currentMenu(val) {
-			this.activeName = val === '按日期' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.name = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList();
-			} else {
-				this.$refs.searchBarForm2.resetForm();
-				const end = new Date();
-				const start = new Date();
-				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.formConfig2[0].startPlaceholder = parseTime(start).substr(0, 10);
-				this.formConfig2[0].endPlaceholder = parseTime(end).substr(0, 10);
-				this.listQuery.name = null;
-				this.listQuery.pageNo = 1;
-				this.getDataList2();
-			}
-		},
-		// 获取数据2列表
-		getDataList2() {
-			if (this.listQuery.startTime) {
-				getRawCostStatisticsRealtimePage(this.listQuery).then((response) => {
-					this.tableData2 = response.data.list;
-					this.listQuery.total = response.data.total;
-				});
-			} else {
-				this.$message.warning('请选择时间范围');
-			}
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data, this.listQuery.statisticType);
-				});
-			} else {
-				this.otherMethods(val);
-			}
-		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
-		/** 导出按钮操作 */
-		handleExport() {
-			let exportURL, title;
-			if (this.activeName === 'his') {
-				exportURL = exportCostSumExcel;
-        title = '总成本统计';
-			} else {
-				exportURL = exportRawStatisticsRealtimeExcel;
-        title = '总成本统计-按规格';
-			}
-			// 处理查询参数
-			let params = { ...this.listQuery };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					return exportURL(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, title + '报表.xls');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
-<style lang="scss">
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/src/views/cost/costStatistics/typeRule.vue b/src/views/cost/costStatistics/typeRule.vue
deleted file mode 100644
index 046a1261..00000000
--- a/src/views/cost/costStatistics/typeRule.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-12-05 13:45:59
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-15 17:12:03
- * @Description
--->
-<template>
-	<div>
-		<span>{{ parseTime(injectData.startTime,'{y}年{m}月{d}日') + '-' + (parseTime(injectData.endTime)?parseTime(injectData.endTime,'{y}年{m}月{d}日'):'永久') }}</span>
-	</div>
-</template>
-<script>
-export default {
-	name: '',
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/deep/24hourCostMonitor/index.vue b/src/views/cost/deep/24hourCostMonitor/index.vue
deleted file mode 100644
index 6fbb11fc..00000000
--- a/src/views/cost/deep/24hourCostMonitor/index.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-	<div class="app-container">
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:max-height="tableH"
-			:table-data="tableData">
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
-</template>
-
-<script>
-import basicPage from '@/mixins/basic-page';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import { parseTime } from '@/filter/code-filter';
-import {
-	deleteRawOthercostLog,
-	getRawOthercostLogPage,
-	exportRawOthercostLogExcel,
-} from '@/api/cost/costOthercostLog';
-import { getRawOthercostRulePage } from '@/api/cost/rawOthercostRule';
-
-const tableProps = [
-	{
-		prop: 'otherCostName',
-		label: '成本名称',
-	},
-	{
-		prop: 'recTime',
-		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	},
-	{
-		prop: 'price',
-		label: '成本金额',
-		align: 'right',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-];
-
-export default {
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getRawOthercostLogPage,
-				deleteURL: deleteRawOthercostLog,
-				exportURL: exportRawOthercostLogExcel,
-			},
-			tableProps,
-			tableData: [],
-		};
-	},
-	components: {
-	},
-	created() {
-		const params = {
-			pageNo: 1,
-			pageSize: 100,
-		};
-		getRawOthercostRulePage(params).then((response) => {
-			this.formConfig[0].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.name = val.name||null;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-						: null;
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.name = val.name;
-					this.listQuery.recTime = val.searchTime;
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/deep/costDeepEnergy/add-or-updata.vue b/src/views/cost/deep/costDeepEnergy/add-or-updata.vue
deleted file mode 100644
index 32575909..00000000
--- a/src/views/cost/deep/costDeepEnergy/add-or-updata.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-05 15:34:49
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="能源类型" prop="energyTypeName">
-					<el-input
-						v-model="dataForm.energyTypeName"
-						disabled
-						placeholder="请输入能源类型" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="日期" prop="recTime">
-					<el-date-picker
-						v-model="dataForm.recTime"
-						type="date"
-						value-format="timestamp"
-						:style="{ width: '100%' }"
-            readonly
-						placeholder="选择日期"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="总价" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.price"
-						clearable
-						placeholder="请输入总价" />
-					(元)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="累计用量" prop="quantity">
-					<el-input-number
-						:min="0"
-						style="width: 100%"
-						v-model="dataForm.quantity"
-						clearable
-						placeholder="请输入累计用量" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import { updateEnergyHis } from '@/api/cost/costEnergyDeep';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				updateURL: updateEnergyHis,
-			},
-			dataForm: {
-				id: undefined,
-				price: undefined,
-				quantity: undefined,
-				energyTypeName: undefined,
-				recTime: undefined,
-			},
-			dataRule: {
-				price: [{ required: true, message: '总价不能为空', trigger: 'blur' }],
-				quantity: [
-					{ required: true, message: '累计用量不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	methods: {
-		init(val, statisticType) {
-			this.visible = true;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				this.dataForm = JSON.parse(JSON.stringify(val));
-				this.dataForm.statisticType = statisticType;
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				this.dataForm.modifyPrice = this.dataForm.price;
-				this.dataForm.modifyQuantity = this.dataForm.quantity;
-				// 修改的提交
-				this.urlOptions.updateURL(this.dataForm).then((response) => {
-					this.$modal.msgSuccess('修改成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/deep/costDeepEnergy/index.vue b/src/views/cost/deep/costDeepEnergy/index.vue
deleted file mode 100644
index 3813a81e..00000000
--- a/src/views/cost/deep/costDeepEnergy/index.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['历史成本', '成本查询']" @change="currentMenu">
-				<template v-slot:tab1>
-					<div>历史成本</div>
-				</template>
-				<template v-slot:tab2>
-					<div>成本查询</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div class="app-container energyOverlimitLog">
-			<div v-show="activeName === 'his'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig"
-					ref="searchBarForm"
-					@headBtnClick="buttonClick" />
-			</div>
-			<div v-show="activeName === 'now'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig2"
-					ref="searchBarForm2"
-					@headBtnClick="buttonClick" />
-			</div>
-			<!-- 列表 -->
-			<div v-if="activeName === 'his'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps"
-					:table-data="tableData"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<div v-if="activeName === 'now'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps2"
-					:table-data="tableData2"
-					:max-height="tableH" />
-			</div>
-			<pagination
-				:page.sync="listQuery.pageNo"
-				:limit.sync="listQuery.pageSize"
-				:total="listQuery.total"
-				@pagination="getNavDataList" />
-			<base-dialog
-				:dialogTitle="addOrEditTitle"
-				:dialogVisible="addOrUpdateVisible"
-				@cancel="handleCancel"
-				@confirm="handleConfirm"
-				:before-close="handleCancel"
-				width="50%">
-				<add-or-update
-					ref="addOrUpdate"
-					@refreshDataList="successSubmit"></add-or-update>
-			</base-dialog>
-		</div>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { getEnergyTypePage } from '@/api/base/energyType';
-import {
-	getEnergyHisPage,
-	getEnergyRealtimePage,
-	exportEnergyRealtimeExcel,
-	exportEnergyHisExcel,
-} from '@/api/cost/costEnergyDeep';
-import { parseTime } from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import ButtonNav from '@/components/ButtonNav';
-
-const tableProps = [
-	{
-		prop: 'time',
-		label: '日期',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'energyTypeName',
-		label: '能源类型',
-	},
-	// {
-	// 	prop: 'bindObjectName',
-	// 	label: '监控对象',
-	// 	filter: (val) => (val != null ? val : '--'),
-	// },
-	// {
-	// 	prop: 'meterName',
-	// 	label: '抄表名',
-	// 	filter: (val) => (val != null ? val : '--'),
-	// },
-	{
-		prop: 'quantity',
-		label: '累计使用量',
-	},
-	{
-		prop: 'price',
-		label: '总价(元)',
-		align: 'right',
-	},
-];
-const tableProps2 = [
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'energyTypeName',
-		label: '能源类型',
-	},
-	// {
-	// 	prop: 'bindObjectName',
-	// 	label: '监控对象',
-	// 	filter: (val) => (val != null ? val : '--'),
-	// },
-	// {
-	// 	prop: 'meter',
-	// 	label: '抄表名',
-	// 	filter: (val) => (val != null ? val : '--'),
-	// },
-	{
-		prop: 'quantity',
-		label: '累计使用量',
-	},
-	{
-		prop: 'price',
-		label: '总价(元)',
-		align: 'right',
-	},
-];
-export default {
-	name: 'costEnergy',
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getEnergyHisPage,
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '维度',
-					selectOptions: [
-						{ id: 1, name: '日' },
-						{ id: 2, name: '周' },
-						{ id: 3, name: '月' },
-					],
-					param: 'statisticType',
-					defaultSelect: 1, // 默认值,
-					clearable: false,
-				},
-				{
-					type: 'select',
-					label: '能源类型',
-					selectOptions: [],
-					param: 'name',
-					labelField: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'searchTime',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			formConfig2: [
-				{
-					type: 'select',
-					label: '能源类型',
-					selectOptions: [],
-					param: 'name',
-					labelField: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
-					param: 'searchTime',
-					width: 350,
-					clearable: false,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			listQuery: {
-				statisticType: 1,
-			},
-			activeName: 'his',
-			tableProps,
-			tableProps2,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  }
-			].filter((v) => v),
-			tableData: [],
-			tableData2: [],
-		};
-	},
-	components: {
-		AddOrUpdate,
-		ButtonNav,
-	},
-	created() {
-		const params = {
-			pageNo: 1,
-			pageSize: 100,
-		};
-		getEnergyTypePage(params).then((response) => {
-			this.formConfig[1].selectOptions = response.data.list;
-			this.formConfig2[0].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.energyTypeId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-						this.getDataList();
-					} else {
-						this.getDataList2();
-					}
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.energyTypeId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		currentMenu(val) {
-			this.activeName = val === '历史成本' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.name = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList();
-			} else {
-				this.$refs.searchBarForm2.resetForm();
-				const end = new Date();
-				const start = new Date();
-				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
-				this.$nextTick(() => {
-					this.$refs.searchBarForm2.formInline.searchTime = [
-						this.listQuery.startTime,
-						this.listQuery.endTime,
-					];
-				});
-				this.listQuery.name = null;
-				this.listQuery.pageNo = 1;
-				this.getDataList2();
-			}
-		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
-		// 获取数据2列表
-		getDataList2() {
-			if (this.listQuery.startTime) {
-				getEnergyRealtimePage(this.listQuery).then((response) => {
-					this.tableData2 = response.data.list;
-					this.listQuery.total = response.data.total;
-				});
-			} else {
-				this.$message.warning('请选择时间范围');
-			}
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data, this.listQuery.statisticType);
-				});
-			} else {
-				this.otherMethods(val);
-			}
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			let exportURL, title;
-			if (this.activeName === 'his') {
-				exportURL = exportEnergyHisExcel;
-				title = '深加工能源成本-历史成本';
-			} else {
-				exportURL = exportEnergyRealtimeExcel;
-				title = '深加工能源成本-成本查询';
-			}
-			// 处理查询参数
-			let params = { ...this.listQuery };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					return exportURL(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, title + '报表.xls');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
-<style lang="scss">
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/src/views/cost/deep/costDeepOthercostHis/add-or-updata.vue b/src/views/cost/deep/costDeepOthercostHis/add-or-updata.vue
deleted file mode 100644
index f382e873..00000000
--- a/src/views/cost/deep/costDeepOthercostHis/add-or-updata.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-05 15:36:49
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="成本名称" prop="name">
-					<el-select
-						v-model="dataForm.name"
-						disabled
-						:style="{ width: '100%' }"
-						placeholder="请选择成本名称">
-						<el-option
-							v-for="item in nameArr"
-							:key="item.name"
-							:label="item.label"
-							:value="item.name"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="总价" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.price"
-						clearable
-						placeholder="请输入总价" />
-					(元)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="所属日期" prop="recTime">
-					<el-date-picker
-						v-model="dataForm.recTime"
-						type="date"
-						value-format="timestamp"
-						:style="{ width: '100%' }"
-            disabled
-						placeholder="选择所属日期"></el-date-picker>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import {
-	updateRawOthercostHis,
-} from '@/api/cost/costOthercostHisDeep';
-
-export default {
-	mixins: [basicAdd],
-	props: {
-		nameArr: {
-			type: Array,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			urlOptions: {
-				updateURL: updateRawOthercostHis,
-			},
-			dataForm: {
-				id: undefined,
-				price: undefined,
-				name: undefined,
-				recTime: undefined,
-			},
-			dataRule: {
-				price: [
-					{ required: true, message: '总价不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	methods: {
-    init(val,statisticType) {
-      this.visible = true;
-      this.$nextTick(() => {
-        this.$refs["dataForm"].resetFields();
-        this.dataForm = JSON.parse(JSON.stringify(val))
-        this.dataForm.statisticType = statisticType
-      });
-    },
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-        this.dataForm.modifyPrice = this.dataForm.price
-				// 修改的提交
-				this.urlOptions.updateURL(this.dataForm).then((response) => {
-					this.$modal.msgSuccess('修改成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-  },
-};
-</script>
diff --git a/src/views/cost/deep/costDeepOthercostHis/index.vue b/src/views/cost/deep/costDeepOthercostHis/index.vue
deleted file mode 100644
index 875f1e8d..00000000
--- a/src/views/cost/deep/costDeepOthercostHis/index.vue
+++ /dev/null
@@ -1,411 +0,0 @@
-<template>
-	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['历史成本', '成本查询']" @change="currentMenu">
-				<template v-slot:tab1>
-					<div>历史成本</div>
-				</template>
-				<template v-slot:tab2>
-					<div>成本查询</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div class="app-container energyOverlimitLog">
-			<div v-show="activeName === 'his'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig"
-					ref="searchBarForm"
-					@headBtnClick="buttonClick" />
-			</div>
-			<div v-show="activeName === 'now'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig2"
-					ref="searchBarForm2"
-					@headBtnClick="buttonClick" />
-			</div>
-			<!-- 列表 -->
-			<div v-if="activeName === 'his'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps"
-					:table-data="tableData"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<div v-if="activeName === 'now'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps2"
-					:table-data="tableData2"
-					:max-height="tableH" />
-			</div>
-			<pagination
-				:page.sync="listQuery.pageNo"
-				:limit.sync="listQuery.pageSize"
-				:total="listQuery.total"
-				@pagination="getNavDataList" />
-			<base-dialog
-				:dialogTitle="addOrEditTitle"
-				:dialogVisible="addOrUpdateVisible"
-				@cancel="handleCancel"
-				@confirm="handleConfirm"
-				:before-close="handleCancel"
-				width="50%">
-				<add-or-update
-					ref="addOrUpdate"
-					:name-arr="formConfig[1].selectOptions"
-					@refreshDataList="successSubmit"></add-or-update>
-			</base-dialog>
-		</div>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { getRawOthercostRulePage } from '@/api/cost/deepOthercostRule';
-import {
-	getRawOthercostHisPage,
-	getRawOthercostSunPage,
-  exportRawOthercostSunExcel,
-  exportRawOthercostHisExcel
-} from '@/api/cost/costOthercostHisDeep';
-import { parseTime } from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import ButtonNav from '@/components/ButtonNav';
-
-const tableProps = [
-	{
-		prop: 'time',
-		label: '日期',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'otherCostName',
-		label: '成本名称',
-	},
-	{
-		prop: 'price',
-		label: '总价（元）',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-];
-const tableProps2 = [
-	// {
-	// 	prop: 'remark',
-	// 	label: '备注',
-	// },
-	{
-		prop: 'otherCostName',
-		label: '成本名称',
-	},
-	{
-		prop: 'price',
-		label: '总价（元）',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-];
-export default {
-	name: 'costOthercostHis',
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getRawOthercostHisPage,
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '维度',
-					selectOptions: [
-						{ id: 1, name: '日' },
-						{ id: 2, name: '周' },
-						{ id: 3, name: '月' },
-					],
-					param: 'statisticType',
-					defaultSelect: 1, // 默认值,
-					clearable: false,
-				},
-				{
-					type: 'select',
-					label: '成本名称',
-					selectOptions: [],
-					param: 'name',
-					labelField: 'label',
-					valueField: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'searchTime',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			formConfig2: [
-				{
-					type: 'select',
-					label: '成本名称',
-					selectOptions: [],
-					param: 'name',
-					labelField: 'label',
-					valueField: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
-					param: 'searchTime',
-					width: 350,
-					clearable: false,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			listQuery: {
-				statisticType: 1,
-			},
-			activeName: 'his',
-			tableProps,
-			tableProps2,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  }
-			].filter((v) => v),
-			tableData: [],
-			tableData2: [],
-		};
-	},
-	components: {
-		AddOrUpdate,
-		ButtonNav,
-	},
-	created() {
-		const params = {
-			pageNo: 1,
-			pageSize: 100,
-		};
-		getRawOthercostRulePage(params).then((response) => {
-			this.formConfig[1].selectOptions = response.data.list;
-			this.formConfig2[0].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.name = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-						this.getDataList();
-					} else {
-						this.getDataList2();
-					}
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.name = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		currentMenu(val) {
-			this.activeName = val === '历史成本' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.name = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList();
-			} else {
-				this.$refs.searchBarForm2.resetForm();
-				const end = new Date();
-				const start = new Date();
-				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
-				this.$nextTick(() => {
-					this.$refs.searchBarForm2.formInline.searchTime = [
-						this.listQuery.startTime,
-						this.listQuery.endTime,
-					];
-				});
-				this.listQuery.name = null;
-				this.listQuery.pageNo = 1;
-				this.getDataList2();
-			}
-		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
-		// 获取数据2列表
-		getDataList2() {
-			getRawOthercostSunPage(this.listQuery).then((response) => {
-				this.tableData2 = response.data.list;
-				this.listQuery.total = response.data.total;
-			});
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data, this.listQuery.statisticType);
-				});
-			} else {
-				this.otherMethods(val);
-			}
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			let exportURL, title;
-			if (this.activeName === 'his') {
-				exportURL = exportRawOthercostHisExcel;
-        title = '深加工其它成本-历史成本';
-			} else {
-				exportURL = exportRawOthercostSunExcel;
-        title = '深加工其它成本-成本查询';
-			}
-			// 处理查询参数
-			let params = { ...this.listQuery };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					return exportURL(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, title + '报表.xls');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
-<style lang="scss">
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/src/views/cost/deep/costDeepOthercostLog/add-or-updata.vue b/src/views/cost/deep/costDeepOthercostLog/add-or-updata.vue
deleted file mode 100644
index d1c89f3a..00000000
--- a/src/views/cost/deep/costDeepOthercostLog/add-or-updata.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-05 15:35:07
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="成本名称" prop="name">
-					<el-select
-						v-model="dataForm.name"
-						filterable
-						clearable
-						:style="{ width: '100%' }"
-            @change="setLabel"
-						placeholder="请选择成本名称">
-						<el-option
-							v-for="item in nameArr"
-							:key="item.name"
-							:label="item.label"
-							:value="item.name"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="成本金额" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.price"
-						clearable
-						placeholder="请输入成本金额" />
-					(元)
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="所属日期" prop="recTime">
-					<el-date-picker
-						v-model="dataForm.recTime"
-						type="date"
-						value-format="timestamp"
-						:style="{ width: '100%' }"
-						placeholder="选择所属日期"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="dataForm.remark"
-						clearable
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import {
-	createRawOthercostLog,
-	updateRawOthercostLog,
-	getRawOthercostLog,
-} from '@/api/cost/costOthercostLogDeep';
-import moment from 'moment';
-
-const nowData = moment().format('YYYY-MM-DD').valueOf()
-export default {
-	mixins: [basicAdd],
-	props: {
-		nameArr: {
-			type: Array,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			urlOptions: {
-				createURL: createRawOthercostLog,
-				updateURL: updateRawOthercostLog,
-				infoURL: getRawOthercostLog,
-			},
-			dataForm: {
-				id: undefined,
-				price: undefined,
-				name: undefined,
-				recTime: new Date().getTime(),
-				remark: undefined,
-			},
-			dataRule: {
-				price: [
-					{ required: true, message: '成本金额不能为空', trigger: 'blur' },
-				],
-				name: [
-					{ required: true, message: '	成本名称不能为空', trigger: 'blur' },
-				],
-				recTime: [
-					{
-						required: true,
-						message: '所属日期不能为空',
-						trigger: 'change',
-					},
-				],
-			},
-		};
-	},
-	methods: {
-    setLabel(val){
-      this.dataForm.label = this.nameArr.find(item=>item.name===val).label
-    }
-  },
-};
-</script>
diff --git a/src/views/cost/deep/costDeepOthercostLog/index.vue b/src/views/cost/deep/costDeepOthercostLog/index.vue
deleted file mode 100644
index d8b76d4c..00000000
--- a/src/views/cost/deep/costDeepOthercostLog/index.vue
+++ /dev/null
@@ -1,224 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:max-height="tableH"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				:name-arr="formConfig[0].selectOptions"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import { parseTime } from '@/filter/code-filter';
-import {
-	deleteRawOthercostLog,
-	getRawOthercostLogPage,
-	exportRawOthercostLogExcel,
-} from '@/api/cost/costOthercostLogDeep';
-import { getRawOthercostRulePage } from '@/api/cost/deepOthercostRule';
-
-const tableProps = [
-	{
-		prop: 'otherCostName',
-		label: '成本名称',
-	},
-	{
-		prop: 'recTime',
-		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	},
-	{
-		prop: 'price',
-		label: '成本金额',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-];
-
-export default {
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getRawOthercostLogPage,
-				deleteURL: deleteRawOthercostLog,
-				exportURL: exportRawOthercostLogExcel,
-			},
-			tableProps,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  },{
-							type: 'delete',
-							btnName: '删除',
-					  }
-			].filter((v) => v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '成本名称',
-					selectOptions: [],
-					param: 'name',
-					labelField: 'label',
-					valueField: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'searchTime',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: this.$auth.hasPermi('monitoring:cost-deep-othercost-log:create')
-						? 'separate'
-						: '',
-				},
-				{
-					type: this.$auth.hasPermi('monitoring:cost-deep-othercost-log:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-				// {
-				// 	type: this.$auth.hasPermi('monitoring:cost-othercost-log:create') ? 'separate' : '',
-				// },
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {
-		const params = {
-			pageNo: 1,
-			pageSize: 100,
-		};
-		getRawOthercostRulePage(params).then((response) => {
-			this.formConfig[0].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.name = val.name||null;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-						: null;
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.name = val.name||null;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-						: null;
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-    //tableBtn点击
-    handleClick(val) {
-      if (val.type === "edit") {
-        this.addOrUpdateVisible = true;
-        this.addOrEditTitle = "编辑";
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(val.data.id);
-        });
-      } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.otherCostName, val.data._pageIndex)
-      } else {
-        this.otherMethods(val)
-      }
-    },
-		/** 导出按钮操作 */
-		handleExport() {
-			let title;
-      title = '深加工其它成本-成本记录';
-			// 处理查询参数
-			let params = { ...this.listQuery };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					return this.urlOptions.exportURL(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, title + '报表.xls');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/deep/costDeepOthercostRule/add-or-updata.vue b/src/views/cost/deep/costDeepOthercostRule/add-or-updata.vue
deleted file mode 100644
index edd1e05e..00000000
--- a/src/views/cost/deep/costDeepOthercostRule/add-or-updata.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 13:52:10
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-03 14:52:51
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		v-if="visible"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px"
-		label-position="top">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="成本名称" prop="label">
-					<el-input v-model="dataForm.label" clearable disabled />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="自动计算策略" prop="type">
-					<el-radio-group v-model="dataForm.type" @input="setType">
-						<el-radio :label="1">每天等价</el-radio>
-						<el-radio :label="2">折旧</el-radio>
-					</el-radio-group>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="dataForm.type === 1" key="one">
-				<el-form-item label="价格" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.price"
-						clearable />
-					(元)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="dataForm.type === 2" key="two">
-				<el-form-item label="总价" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.price"
-						clearable />
-					(元)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="dataForm.type === 2" key="three">
-				<el-form-item label="年折旧率" prop="ratio">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.ratio"
-						clearable />
-					(%)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="dataForm.type === 2" key="four">
-				<el-form-item label="折旧年限" prop="timeLimit">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.timeLimit"
-						clearable />
-					(年)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						@input="$forceUpdate()"
-						v-model="dataForm.remark"
-						clearable
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import {
-	updateRawOthercostRule,
-	getRawOthercostRule,
-} from '@/api/cost/deepOthercostRule';
-
-export default {
-	data() {
-		return {
-			urlOptions: {
-				updateURL: updateRawOthercostRule,
-				infoURL: getRawOthercostRule,
-			},
-			dataForm: {
-				label: undefined,
-				type: 1,
-				price: 0,
-				ratio: 0,
-				timeLimit: 1,
-				remark: '',
-			},
-			visible: false,
-			dataRule: {
-				price: [{ required: true, message: '价格不能为空', trigger: 'blur' }],
-				ratio: [{ required: true, message: '折旧率不能为空', trigger: 'blur' }],
-				timeLimit: [
-					{ required: true, message: '折旧年限不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	created() {},
-	methods: {
-		init(val) {
-			this.dataForm = {
-				label: undefined,
-				type: 1,
-				price: 0,
-				ratio: 0,
-				timeLimit: 1,
-				remark: '',
-			};
-			this.visible = true;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				this.dataForm = JSON.parse(JSON.stringify(val));
-			});
-		},
-		setType(val) {
-			if (val === 1) {
-			} else {
-			}
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				// 修改的提交
-				this.urlOptions.updateURL(this.dataForm).then((response) => {
-					this.$modal.msgSuccess('修改成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-		/** 清空form */
-		formClear() {
-			if (this.$refs.dataForm !== undefined) {
-				this.$refs.dataForm.resetFields();
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/deep/costDeepOthercostRule/index.vue b/src/views/cost/deep/costDeepOthercostRule/index.vue
deleted file mode 100644
index 65fdd951..00000000
--- a/src/views/cost/deep/costDeepOthercostRule/index.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-04-15 16:52:38
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-11 15:30:41
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<!-- 列表 -->
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:max-height="tableH"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="40%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import typeRule from './typeRule';
-import {
-	getRawOthercostRulePage,
-} from '@/api/cost/deepOthercostRule';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-
-const tableProps = [
-	{
-		prop: 'label',
-		label: '成本名称',
-	},
-	{
-		prop: 'type',
-		label: '自动计算方式',
-		subcomponent: typeRule,
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-];
-
-export default {
-	mixins: [basicPage,tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getRawOthercostRulePage,
-			},
-			tableProps,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  }
-			].filter((v) => v),
-			tableData: [],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {
-	},
-	methods: {
-    //tableBtn点击
-    handleClick(val) {
-      if (val.type === "edit") {
-        this.addOrUpdateVisible = true;
-        this.addOrEditTitle = "编辑";
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(val.data);
-        });
-      }
-    },
-	},
-};
-</script>
diff --git a/src/views/cost/deep/costDeepOthercostRule/typeRule.vue b/src/views/cost/deep/costDeepOthercostRule/typeRule.vue
deleted file mode 100644
index fc26ca89..00000000
--- a/src/views/cost/deep/costDeepOthercostRule/typeRule.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-12-05 13:45:59
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-15 17:12:03
- * @Description
--->
-<template>
-	<div>
-		<span>
-			{{
-				injectData.type == 1
-					? `每天等价,${Number(injectData.price)}元`
-					: injectData.type == 2
-					? `总价${Number(injectData.price)}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
-					: '-'
-			}}
-		</span>
-	</div>
-</template>
-<script>
-export default {
-	name: '',
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/deep/costDeepRatioHis/add-or-updata.vue b/src/views/cost/deep/costDeepRatioHis/add-or-updata.vue
deleted file mode 100644
index 7d33c27e..00000000
--- a/src/views/cost/deep/costDeepRatioHis/add-or-updata.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-05 15:35:29
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="产线" prop="productionLineName">
-					<el-input
-						style="width: 100%"
-						v-model="dataForm.productionLineName"
-						disabled />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="activeName==='now'">
-				<el-form-item label="工段" prop="workshopSectionName">
-					<el-input
-						style="width: 100%"
-						v-model="dataForm.workshopSectionName"
-						readonly />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item :label="activeName==='his'?'上片数量':'进片数量'" prop="innum">
-					<el-input-number
-						:min="0"
-						style="width: 90%"
-						v-model="dataForm.innum"
-						clearable
-						placeholder="请输入数量" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item :label="activeName==='his'?'下片数量':'出片数量'" prop="outnum">
-					<el-input-number
-						:min="0"
-						style="width: 90%"
-						v-model="dataForm.outnum"
-						clearable
-						placeholder="请输入数量" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="良品率" prop="ratio">
-					<el-input-number
-						:min="0"
-						style="width: 90%"
-						v-model="dataForm.ratio"
-						clearable
-						placeholder="请输入良品率" />
-					(%)
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import { updateDeepRatioHis } from '@/api/cost/costDeepRatioHis';
-
-export default {
-	mixins: [basicAdd],
-	props: {
-		nameArr: {
-			type: Array,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			urlOptions: {
-				updateURL: updateDeepRatioHis,
-			},
-			dataForm: {
-				id: undefined,
-				productionLineName: undefined,
-				innum: undefined,
-				outnum: undefined,
-				ratio: undefined,
-			},
-			dataRule: {},
-      activeName: 'his'
-		};
-	},
-	methods: {
-		init(val, statisticType, activeName) {
-      this.activeName = activeName
-			this.visible = true;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				this.dataForm = JSON.parse(JSON.stringify(val));
-				this.dataForm.statisticType = statisticType;
-				this.dataForm.ratio =
-					this.dataForm.ratio >= 0 ? this.dataForm.ratio * 100 : '';
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				const udata = {
-					id: this.dataForm.id,
-					statisticType: this.dataForm.statisticType,
-					modifyInnum: this.dataForm.innum,
-					modifyOutnum: this.dataForm.outnum,
-					modifyRatio:
-						this.dataForm.ratio >= 0 ? this.dataForm.ratio / 100 : '',
-				};
-				// 修改的提交
-				this.urlOptions.updateURL(udata).then((response) => {
-					this.$modal.msgSuccess('修改成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/deep/costDeepRatioHis/index.vue b/src/views/cost/deep/costDeepRatioHis/index.vue
deleted file mode 100644
index 3d5157c1..00000000
--- a/src/views/cost/deep/costDeepRatioHis/index.vue
+++ /dev/null
@@ -1,395 +0,0 @@
-<template>
-	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['产线良品率', '工段良品率']" @change="currentMenu">
-				<template v-slot:tab1>
-					<div>产线良品率</div>
-				</template>
-				<template v-slot:tab2>
-					<div>工段良品率</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div class="app-container energyOverlimitLog">
-			<search-bar
-				:formConfigs="formConfig"
-				ref="searchBarForm"
-				@headBtnClick="buttonClick" />
-			<!-- 列表 -->
-			<div v-if="activeName === 'his'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps"
-					:table-data="tableData"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<div v-if="activeName === 'now'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps2"
-					:table-data="tableData2"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<pagination
-				:page.sync="listQuery.pageNo"
-				:limit.sync="listQuery.pageSize"
-				:total="listQuery.total"
-				@pagination="getNavDataList" />
-			<base-dialog
-				:dialogTitle="addOrEditTitle"
-				:dialogVisible="addOrUpdateVisible"
-				@cancel="handleCancel"
-				@confirm="handleConfirm"
-				:before-close="handleCancel"
-				width="50%">
-				<add-or-update
-					ref="addOrUpdate"
-					:name-arr="formConfig[1].selectOptions"
-					@refreshDataList="successSubmit"></add-or-update>
-			</base-dialog>
-		</div>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { getLinePage } from '@/api/base/productionLine';
-import {
-	getDeepPDRatioHisPage,
-	getDeepWSRatioHisPage,
-	exportDeepWSRatioHisExcel,
-	exportDeepPDRatioHisExcel,
-} from '@/api/cost/costDeepRatioHis';
-import { parseTime } from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import ButtonNav from '@/components/ButtonNav';
-
-const tableProps = [
-	{
-		prop: 'time',
-		label: '日期',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'productionLineName',
-		label: '产线',
-	},
-	{
-		prop: 'spec',
-		label: '规格',
-	},
-	{
-		prop: 'innum',
-		label: '上片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'outnum',
-		label: '下片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'ratio',
-		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
-	},
-];
-const tableProps2 = [
-	{
-		prop: 'time',
-		label: '日期',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'productionLineName',
-		label: '产线',
-	},
-	{
-		prop: 'workshopSectionName',
-		label: '工段',
-	},
-	{
-		prop: 'innum',
-		label: '进片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'outnum',
-		label: '出片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'ratio',
-		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
-	},
-];
-export default {
-	name: 'costDeepRatioHis',
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getDeepPDRatioHisPage,
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '维度',
-					selectOptions: [
-						{ id: 1, name: '日' },
-						{ id: 2, name: '周' },
-						{ id: 3, name: '月' },
-					],
-					param: 'statisticType',
-					defaultSelect: 1, // 默认值,
-					clearable: false,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
-					param: 'searchTime',
-					width: 350,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			listQuery: {
-				statisticType: 1,
-			},
-			activeName: 'his',
-			tableProps,
-			tableProps2,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  }
-			].filter((v) => v),
-			tableData: [],
-			tableData2: [],
-		};
-	},
-	components: {
-		AddOrUpdate,
-		ButtonNav,
-	},
-	created() {
-    const params ={
-      pageNo: 1,
-      pageSize: 100,
-      pdType: 0
-    }
-		getLinePage(params).then((response) => {
-			this.formConfig[1].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.productionLineId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.getDataList();
-					} else {
-						this.getDataList2();
-					}
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.productionLineId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		currentMenu(val) {
-			this.activeName = val === '产线良品率' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.productionLineId = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList();
-			} else {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.productionLineId = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList2();
-			}
-		},
-		// 获取数据2列表
-		getDataList2() {
-			getDeepWSRatioHisPage(this.listQuery).then((response) => {
-				this.tableData2 = response.data.list;
-				this.listQuery.total = response.data.total;
-			});
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(
-						val.data,
-						this.listQuery.statisticType,
-						this.activeName
-					);
-				});
-			} else {
-				this.otherMethods(val);
-			}
-		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
-		successSubmit() {
-			this.handleCancel();
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			let exportURL, title;
-			if (this.activeName === 'his') {
-				exportURL = exportDeepPDRatioHisExcel;
-				title = '深加工-产线良品率';
-			} else {
-				exportURL = exportDeepWSRatioHisExcel;
-				title = '深加工-工段良品率';
-			}
-			// 处理查询参数
-			let params = { ...this.listQuery };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					return exportURL(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, title + '报表.xls');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
-<style lang="scss">
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/src/views/cost/deep/costStatistics/add-or-updata.vue b/src/views/cost/deep/costStatistics/add-or-updata.vue
deleted file mode 100644
index 05ef932b..00000000
--- a/src/views/cost/deep/costStatistics/add-or-updata.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-02 15:54:20
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="产线" prop="bindObjectName">
-					<el-input
-						v-model="dataForm.bindObjectName"
-						disabled
-						placeholder="产线" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="上片数量" prop="inCount">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.inCount"
-						clearable
-						placeholder="请输入上片数量" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="下片数量" prop="outCount">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.outCount"
-						clearable
-						placeholder="请输入下片数量" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="良品率" prop="ratio">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.ratio"
-						clearable
-						placeholder="请输入良品率" />
-            (%)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="深加工成本" prop="costSum">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.costSum"
-						clearable
-						placeholder="请输入深加工成本" />
-					(元)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="单片成本" prop="costPiece">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.costPiece"
-						clearable
-						placeholder="请输入单片成本" />
-					(元)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="每平米成本" prop="costArea">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.costArea"
-						clearable
-						placeholder="请输入每平米成本" />
-					(元)
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import { updateDeepCostStatistics } from '@/api/cost/deepCostStatistics';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				updateURL: updateDeepCostStatistics,
-			},
-			dataForm: {
-				id: undefined,
-				bindObjectName: undefined,
-				inCount: undefined,
-				ratio: undefined,
-				costPiece: undefined,
-				costArea: undefined,
-				costSum: undefined,
-				outCount: undefined,
-			},
-			dataRule: {
-				costSum: [
-					{ required: true, message: '深加工成本不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	methods: {
-		init(val, statisticType) {
-			this.visible = true;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				this.dataForm = JSON.parse(JSON.stringify(val));
-				this.dataForm.statisticType = statisticType;
-				this.dataForm.ratio =
-					this.dataForm.ratio >= 0 ? this.dataForm.ratio * 100 : '';
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				const data = {
-					id: this.dataForm.id,
-          statisticType: this.dataForm.statisticType,
-					bindObjectName: this.dataForm.bindObjectName,
-					modifyInCount: this.dataForm.inCount,
-					modifyRatio:
-						this.dataForm.ratio >= 0 ? this.dataForm.ratio / 100 : '',
-					modifyCostPiece: this.dataForm.costPiece,
-					modifyCostArea: this.dataForm.costArea,
-					modifyCostSum: this.dataForm.costSum,
-					modifyOutCount: this.dataForm.outCount,
-				};
-				// 修改的提交
-				this.urlOptions.updateURL(data).then((response) => {
-					this.$modal.msgSuccess('修改成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/deep/costStatistics/index.vue b/src/views/cost/deep/costStatistics/index.vue
deleted file mode 100644
index 5ae2769e..00000000
--- a/src/views/cost/deep/costStatistics/index.vue
+++ /dev/null
@@ -1,474 +0,0 @@
-<template>
-	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['历史成本', '成本查询']" @change="currentMenu">
-				<template v-slot:tab1>
-					<div>历史成本</div>
-				</template>
-				<template v-slot:tab2>
-					<div>成本查询</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div class="app-container energyOverlimitLog">
-			<div v-show="activeName === 'his'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig"
-					ref="searchBarForm"
-					@headBtnClick="buttonClick" />
-			</div>
-			<div v-show="activeName === 'now'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig2"
-					ref="searchBarForm2"
-					@headBtnClick="buttonClick" />
-			</div>
-			<!-- 列表 -->
-			<div v-if="activeName === 'his'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps"
-					:table-data="tableData"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<div v-if="activeName === 'now'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps2"
-					:table-data="tableData2"
-					:max-height="tableH" />
-			</div>
-			<pagination
-				:page.sync="listQuery.pageNo"
-				:limit.sync="listQuery.pageSize"
-				:total="listQuery.total"
-				@pagination="getNavDataList" />
-			<base-dialog
-				:dialogTitle="addOrEditTitle"
-				:dialogVisible="addOrUpdateVisible"
-				@cancel="handleCancel"
-				@confirm="handleConfirm"
-				:before-close="handleCancel"
-				width="50%">
-				<add-or-update
-					ref="addOrUpdate"
-					@refreshDataList="successSubmit"></add-or-update>
-			</base-dialog>
-		</div>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { getLinePage } from '@/api/base/productionLine';
-import {
-	getDeepCostStatisticsPage,
-	getDeepCostStatisticsRealtimePage,
-	exportDeepStatisticsRealtimeExcel,
-	exportDeepCostStatisticsHisExcel,
-} from '@/api/cost/deepCostStatistics';
-import { parseTime } from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import typeRule from './typeRule';
-import ButtonNav from '@/components/ButtonNav';
-
-const tableProps = [
-	{
-		prop: 'time',
-		label: '时间',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'bindObjectName',
-		label: '产线',
-	},
-	{
-		prop: 'spec',
-		label: '规格',
-	},
-	{
-		prop: 'inCount',
-		label: '上片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'outCount',
-		label: '下片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'ratio',
-		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
-	},
-	{
-		prop: 'costSum',
-		label: '深加工成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'costPiece',
-		label: '单片成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'costArea',
-		label: '每平米成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-];
-const tableProps2 = [
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'bindObjectName',
-		label: '产线',
-	},
-	{
-		prop: 'spec',
-		label: '规格',
-	},
-	{
-		prop: 'inCount',
-		label: '上片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'outCount',
-		label: '下片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'ratio',
-		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
-	},
-	{
-		prop: 'costSum',
-		label: '深加工成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'costPiece',
-		label: '单片成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'costArea',
-		label: '每平米成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-];
-export default {
-	name: 'costMaterial',
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getDeepCostStatisticsPage,
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '维度',
-					selectOptions: [
-						{ id: 1, name: '日' },
-						{ id: 2, name: '周' },
-						{ id: 3, name: '月' },
-					],
-					param: 'statisticType',
-					defaultSelect: 1, // 默认值,
-					clearable: false,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'searchTime',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			formConfig2: [
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
-					param: 'searchTime',
-					width: 350,
-					clearable: false,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'name',
-					filterable: true,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			listQuery: {
-				statisticType: 1,
-			},
-			activeName: 'his',
-			tableProps,
-			tableProps2,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  }
-			].filter((v) => v),
-			tableData: [],
-			tableData2: [],
-		};
-	},
-	components: {
-		AddOrUpdate,
-		ButtonNav,
-	},
-	created() {
-    const params ={
-      pageNo: 1,
-      pageSize: 100,
-      pdType: 0
-    }
-		getLinePage(params).then((response) => {
-			this.formConfig[1].selectOptions = response.data.list;
-			this.formConfig2[1].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.bindObjectId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-						this.getDataList();
-					} else {
-						this.getDataList2();
-					}
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.bindObjectId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		currentMenu(val) {
-			this.activeName = val === '历史成本' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.name = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList();
-			} else {
-				this.$refs.searchBarForm2.resetForm();
-				const end = new Date();
-				const start = new Date();
-				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
-				this.$nextTick(() => {
-					this.$refs.searchBarForm2.formInline.searchTime = [
-						this.listQuery.startTime,
-						this.listQuery.endTime,
-					];
-				});
-				this.listQuery.name = null;
-				this.listQuery.pageNo = 1;
-				this.getDataList2();
-			}
-		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
-		// 获取数据2列表
-		getDataList2() {
-			if (this.listQuery.startTime) {
-				getDeepCostStatisticsRealtimePage(this.listQuery).then((response) => {
-					this.tableData2 = response.data.list;
-					this.listQuery.total = response.data.total;
-				});
-			} else {
-				this.$message.warning('请选择时间范围');
-			}
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data, this.listQuery.statisticType);
-				});
-			} else {
-				this.otherMethods(val);
-			}
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			let exportURL, title;
-			if (this.activeName === 'his') {
-				exportURL = exportDeepCostStatisticsHisExcel;
-				title = '深加工成本统计-历史成本';
-			} else {
-				exportURL = exportDeepStatisticsRealtimeExcel;
-				title = '深加工成本统计-成本查询';
-			}
-			// 处理查询参数
-			let params = { ...this.listQuery };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					return exportURL(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, title + '报表.xls');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
-<style lang="scss">
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/src/views/cost/deep/costStatistics/typeRule.vue b/src/views/cost/deep/costStatistics/typeRule.vue
deleted file mode 100644
index 046a1261..00000000
--- a/src/views/cost/deep/costStatistics/typeRule.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-12-05 13:45:59
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-15 17:12:03
- * @Description
--->
-<template>
-	<div>
-		<span>{{ parseTime(injectData.startTime,'{y}年{m}月{d}日') + '-' + (parseTime(injectData.endTime)?parseTime(injectData.endTime,'{y}年{m}月{d}日'):'永久') }}</span>
-	</div>
-</template>
-<script>
-export default {
-	name: '',
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/index.vue b/src/views/cost/index.vue
deleted file mode 100644
index 75c7342c..00000000
--- a/src/views/cost/index.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-	<div class="home-page">
-		<div
-			class="main-footer"
-			style="
-				color: #c7c7c7;
-				user-select: none;
-				font-size: 14px;
-				letter-spacing: 1px;
-				height: 30px;
-				display: grid;
-				place-content: center;
-			">
-			&copy; 中建材智能自动化研究院有限公司
-		</div>
-	</div>
-</template>
-
-<script>
-
-export default {
-	name: 'Home',
-	mixins: [],
-	components: {},
-	computed: {},
-	data() {
-		return {};
-	},
-	created() {
-	},
-	beforeDestroy() {
-	},
-	methods: {
-		
-		
-		
-	},
-};
-</script>
-
-<style lang="scss" scoped>
-
-</style>
-<style lang="scss">
-</style>
diff --git a/src/views/cost/indexDetail.vue b/src/views/cost/indexDetail.vue
deleted file mode 100644
index 3d469aaa..00000000
--- a/src/views/cost/indexDetail.vue
+++ /dev/null
@@ -1,199 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			:table-props="tableProps1"
-			:page="1"
-			:limit="100"
-			:table-data="tableData1"></base-table>
-		<base-table
-			:table-props="tableProps2"
-			:page="1"
-			:limit="100"
-			:table-data="tableData2"></base-table>
-	</div>
-</template>
-
-<script>
-import { getDetailData } from '@/api/cost/allCost';
-import moment from 'moment';
-
-const tableProps1 = [
-	{
-		prop: 'name',
-		label: '成本项目-原片',
-	},
-	{
-		prop: 'f1',
-		label: '本期领用',
-		children: [
-			{
-				prop: 'quantity',
-				label: '数量',
-			},
-			{
-				prop: 'price',
-				label: '单价',
-			},
-			{
-				prop: 'sumPrice',
-				label: '金额',
-			},
-		],
-	},
-	{
-		prop: 'sprice',
-		label: '单位成本',
-	},
-];
-
-const tableProps2 = [
-	{
-		prop: 'name',
-		label: '成本项目-加工',
-	},
-	{
-		prop: 'quantity',
-		label: '耗用数量',
-	},
-	{
-		prop: 'price',
-		label: '平均耗用单价',
-	},
-	{
-		prop: 'sumPrice',
-		label: '总成本',
-	},
-	{
-		prop: 'sprice',
-		label: '综合单位成本',
-	},
-];
-export default {
-	data() {
-		return {
-			tableProps1,
-			tableData1: [],
-			tableProps2,
-			tableData2: [],
-			listQuery: {
-				pageSize: 10,
-				pageNo: 1,
-				statisticType: 1,
-			},
-			activeName: '日',
-			startTime:
-				moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD') +
-				' 00:00:00',
-			endTime:
-				moment(new Date()).subtract(-1, 'days').format('YYYY-MM-DD') +
-				' 00:00:00',
-			formConfig: [
-				{
-					type: 'select',
-					label: '维度',
-					selectOptions: [
-						{ id: 1, name: '日' },
-						{ id: 2, name: '周' },
-						{ id: 3, name: '月' },
-						{ id: 4, name: '年' },
-					],
-					param: 'statisticType',
-					defaultSelect: 1, // 默认值,
-					clearable: false,
-				},
-				{
-					// 日期选择
-					type: 'datePicker',
-					// label: '日期',
-					dateType: 'date',
-					placeholder: '选择日期',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd',
-					param: 'timeday',
-					clearable: false,
-					pickerOptions: {
-						disabledDate(time) {
-							return (time.getTime()+ 3600 * 1000 * 24) > Date.now();
-						},
-						shortcuts: [
-							{
-								text: '今天',
-								onClick(picker) {
-									picker.$emit('pick', new Date());
-								},
-							},
-							{
-								text: '昨天',
-								onClick(picker) {
-									const date = new Date();
-									date.setTime(date.getTime() - 3600 * 1000 * 24);
-									picker.$emit('pick', date);
-								},
-							},
-							{
-								text: '一周前',
-								onClick(picker) {
-									const date = new Date();
-									date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-									picker.$emit('pick', date);
-								},
-							},
-						],
-					},
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '返回首页',
-					name: 'back',
-					color: 'warning',
-				},
-			],
-		};
-	},
-	created() {},
-	mounted() {
-		this.listQuery.startTime = this.startTime;
-    this.$refs.searchBarForm.formInline.timeday = this.startTime.substr(0, 10)
-		this.getDataList();
-	},
-	methods: {
-		// 获取数据列表
-		getDataList() {
-			getDetailData(this.listQuery).then((response) => {
-				this.tableData1 = response.data.odata;
-				this.tableData2 = response.data.ddata;
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-          console.log(val.timeday)
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.timeday
-						? val.timeday + ' 00:00:00'
-						: null;
-					this.getDataList();
-					break;
-				case 'back':
-          this.$router.go(-1)
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/raw/24hourCostMonitor/index.vue b/src/views/cost/raw/24hourCostMonitor/index.vue
deleted file mode 100644
index 6fbb11fc..00000000
--- a/src/views/cost/raw/24hourCostMonitor/index.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-	<div class="app-container">
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:max-height="tableH"
-			:table-data="tableData">
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
-</template>
-
-<script>
-import basicPage from '@/mixins/basic-page';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import { parseTime } from '@/filter/code-filter';
-import {
-	deleteRawOthercostLog,
-	getRawOthercostLogPage,
-	exportRawOthercostLogExcel,
-} from '@/api/cost/costOthercostLog';
-import { getRawOthercostRulePage } from '@/api/cost/rawOthercostRule';
-
-const tableProps = [
-	{
-		prop: 'otherCostName',
-		label: '成本名称',
-	},
-	{
-		prop: 'recTime',
-		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	},
-	{
-		prop: 'price',
-		label: '成本金额',
-		align: 'right',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-];
-
-export default {
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getRawOthercostLogPage,
-				deleteURL: deleteRawOthercostLog,
-				exportURL: exportRawOthercostLogExcel,
-			},
-			tableProps,
-			tableData: [],
-		};
-	},
-	components: {
-	},
-	created() {
-		const params = {
-			pageNo: 1,
-			pageSize: 100,
-		};
-		getRawOthercostRulePage(params).then((response) => {
-			this.formConfig[0].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.name = val.name||null;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-						: null;
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.name = val.name;
-					this.listQuery.recTime = val.searchTime;
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/raw/costEnergy/add-or-updata.vue b/src/views/cost/raw/costEnergy/add-or-updata.vue
deleted file mode 100644
index 00367fd1..00000000
--- a/src/views/cost/raw/costEnergy/add-or-updata.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-05 15:34:14
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="能源类型" prop="energyTypeName">
-					<el-input
-						v-model="dataForm.energyTypeName"
-						disabled
-						placeholder="请输入能源类型" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="日期" prop="recTime">
-					<el-date-picker
-						v-model="dataForm.recTime"
-						type="date"
-						value-format="timestamp"
-						:style="{ width: '100%' }"
-						disabled
-						placeholder="选择日期"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					:label="dataForm.bindObjectName ? '监控对象' : '抄表名'"
-					prop="showName">
-					<el-input
-						v-model="dataForm.showName"
-						disabled
-						:placeholder="dataForm.bindObjectName ? '监控对象' : '抄表名'" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="累计用量" prop="quantity">
-					<el-input-number
-						:min="0"
-						style="width: 100%"
-						v-model="dataForm.quantity"
-						clearable
-						placeholder="请输入累计用量" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="总价" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.price"
-						clearable
-						placeholder="请输入总价" />
-					(元)
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import { updateEnergyHis } from '@/api/cost/costEnergy';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				updateURL: updateEnergyHis,
-			},
-			dataForm: {
-				id: undefined,
-				price: undefined,
-				quantity: undefined,
-				energyTypeName: undefined,
-				recTime: undefined,
-        showName: undefined
-			},
-			dataRule: {
-				price: [{ required: true, message: '总价不能为空', trigger: 'blur' }],
-				quantity: [
-					{ required: true, message: '累计用量不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	methods: {
-		init(val, statisticType) {
-			this.visible = true;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				this.dataForm = JSON.parse(JSON.stringify(val));
-				this.dataForm.statisticType = statisticType;
-        if(this.dataForm.bindObjectName){
-          this.dataForm.showName = this.dataForm.bindObjectName
-        }else{
-          this.dataForm.showName = this.dataForm.meterName
-        }
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				this.dataForm.modifyPrice = this.dataForm.price;
-				this.dataForm.modifyQuantity = this.dataForm.quantity;
-				// 修改的提交
-				this.urlOptions.updateURL(this.dataForm).then((response) => {
-					this.$modal.msgSuccess('修改成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/raw/costEnergy/index.vue b/src/views/cost/raw/costEnergy/index.vue
deleted file mode 100644
index 0177d17e..00000000
--- a/src/views/cost/raw/costEnergy/index.vue
+++ /dev/null
@@ -1,435 +0,0 @@
-<template>
-	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['历史成本', '成本查询']" @change="currentMenu">
-				<template v-slot:tab1>
-					<div>历史成本</div>
-				</template>
-				<template v-slot:tab2>
-					<div>成本查询</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div class="app-container energyOverlimitLog">
-			<div v-show="activeName === 'his'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig"
-					ref="searchBarForm"
-					@headBtnClick="buttonClick" />
-			</div>
-			<div v-show="activeName === 'now'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig2"
-					ref="searchBarForm2"
-					@headBtnClick="buttonClick" />
-			</div>
-			<!-- 列表 -->
-			<div v-if="activeName === 'his'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps"
-					:table-data="tableData"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<div v-if="activeName === 'now'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps2"
-					:table-data="tableData2"
-					:max-height="tableH" />
-			</div>
-			<pagination
-				:page.sync="listQuery.pageNo"
-				:limit.sync="listQuery.pageSize"
-				:total="listQuery.total"
-				@pagination="getNavDataList" />
-			<base-dialog
-				:dialogTitle="addOrEditTitle"
-				:dialogVisible="addOrUpdateVisible"
-				@cancel="handleCancel"
-				@confirm="handleConfirm"
-				:before-close="handleCancel"
-				width="50%">
-				<add-or-update
-					ref="addOrUpdate"
-					@refreshDataList="successSubmit"></add-or-update>
-			</base-dialog>
-		</div>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { getEnergyTypePage } from '@/api/base/energyType';
-import {
-	getEnergyHisPage,
-	getEnergyRealtimePage,
-	exportEnergyRealtimeExcel,
-	exportEnergyHisExcel,
-} from '@/api/cost/costEnergy';
-import { parseTime } from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import ButtonNav from '@/components/ButtonNav';
-
-const tableProps = [
-	{
-		prop: 'time',
-		label: '日期',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'energyTypeName',
-		label: '能源类型',
-	},
-	// {
-	// 	prop: 'bindObjectName',
-	// 	label: '监控对象',
-	// 	filter: (val) => (val != null ? val : '--'),
-	// },
-	// {
-	// 	prop: 'meterName',
-	// 	label: '抄表名',
-	// 	filter: (val) => (val != null ? val : '--'),
-	// },
-	{
-		prop: 'quantity',
-		label: '累计使用量',
-	},
-	{
-		prop: 'price',
-		label: '总价(元)',
-		align: 'right',
-	},
-];
-const tableProps2 = [
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'energyTypeName',
-		label: '能源类型',
-	},
-	// {
-	// 	prop: 'bindObjectName',
-	// 	label: '监控对象',
-	// 	filter: (val) => (val != null ? val : '--'),
-	// },
-	// {
-	// 	prop: 'meter',
-	// 	label: '抄表名',
-	// 	filter: (val) => (val != null ? val : '--'),
-	// },
-	{
-		prop: 'quantity',
-		label: '累计使用量',
-	},
-	{
-		prop: 'price',
-		label: '总价(元)',
-		align: 'right',
-	},
-];
-export default {
-	name: 'costEnergy',
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getEnergyHisPage,
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '维度',
-					selectOptions: [
-						{ id: 1, name: '日' },
-						{ id: 2, name: '周' },
-						{ id: 3, name: '月' },
-					],
-					param: 'statisticType',
-					defaultSelect: 1, // 默认值,
-					clearable: false,
-				},
-				{
-					type: 'select',
-					label: '能源类型',
-					selectOptions: [],
-					param: 'name',
-					labelField: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'searchTime',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			formConfig2: [
-				{
-					type: 'select',
-					label: '能源类型',
-					selectOptions: [],
-					param: 'name',
-					labelField: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
-					param: 'searchTime',
-					width: 350,
-					clearable: false,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			listQuery: {
-				statisticType: 1,
-			},
-			activeName: 'his',
-			tableProps,
-			tableProps2,
-			tableBtn: [
-				{
-					type: 'edit',
-					btnName: '编辑',
-				},
-			].filter((v) => v),
-			tableData: [],
-			tableData2: [],
-		};
-	},
-	components: {
-		AddOrUpdate,
-		ButtonNav,
-	},
-	created() {
-		const params = {
-			pageNo: 1,
-			pageSize: 100,
-		};
-		getEnergyTypePage(params).then((response) => {
-			this.formConfig[1].selectOptions = response.data.list;
-			this.formConfig2[0].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.energyTypeId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-						this.getDataList();
-					} else {
-						this.getDataList2();
-					}
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.energyTypeId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		currentMenu(val) {
-			this.activeName = val === '历史成本' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.name = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList();
-			} else {
-				this.$refs.searchBarForm2.resetForm();
-				const end = new Date();
-				const start = new Date();
-				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
-				this.$nextTick(() => {
-					this.$refs.searchBarForm2.formInline.searchTime = [
-						this.listQuery.startTime,
-						this.listQuery.endTime,
-					];
-				});
-				this.listQuery.name = null;
-				this.listQuery.pageNo = 1;
-				this.getDataList2();
-			}
-		},
-		getNavDataList() {
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-		},
-		// 获取数据2列表
-		getDataList2() {
-			if (this.listQuery.startTime) {
-				getEnergyRealtimePage(this.listQuery).then((response) => {
-					this.tableData2 = response.data.list;
-					this.listQuery.total = response.data.total;
-				});
-			} else {
-				this.$message.warning('请选择时间范围');
-			}
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data, this.listQuery.statisticType);
-				});
-			} else {
-				this.otherMethods(val);
-			}
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			let exportURL, title;
-			if (this.activeName === 'his') {
-				exportURL = exportEnergyHisExcel;
-				title = '能源成本-历史成本';
-			} else {
-				exportURL = exportEnergyRealtimeExcel;
-				title = '能源成本-成本查询';
-			}
-			// 处理查询参数
-			let params = { ...this.listQuery };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					return exportURL(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, title + '报表.xls');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
-<style lang="scss">
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/src/views/cost/raw/costMaterial/add-or-updata.vue b/src/views/cost/raw/costMaterial/add-or-updata.vue
deleted file mode 100644
index 2f7afc71..00000000
--- a/src/views/cost/raw/costMaterial/add-or-updata.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2024-12-27 09:18:43
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="原料名称" prop="materialName">
-					<el-input
-						v-model="dataForm.materialName"
-						disabled
-						placeholder="请输入原料名称" />
-				</el-form-item>
-			</el-col>
-			<!-- <el-col :span="12">
-				<el-form-item label="单价" prop="matPrice">
-					<el-input
-						v-model="dataForm.matPrice"
-						disabled
-						style="width: 70%"
-						placeholder="请输入单价" />
-					(元/吨)
-				</el-form-item>
-			</el-col> -->
-			<el-col :span="12">
-				<el-form-item label="累计用量" prop="quantity">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.quantity"
-						clearable
-						placeholder="请输入累计用量" />
-					(吨)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="总价" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.price"
-						clearable
-						placeholder="请输入总价" />
-					(元)
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import { updateMaterialHis } from '@/api/cost/costMaterial';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				updateURL: updateMaterialHis,
-			},
-			dataForm: {
-				id: undefined,
-				price: undefined,
-				quantity: undefined,
-				matPrice: undefined,
-				materialName: undefined,
-				recTime: undefined,
-			},
-			dataRule: {
-				price: [{ required: true, message: '总价不能为空', trigger: 'blur' }],
-				quantity: [
-					{ required: true, message: '累计用量不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	methods: {
-		init(val, statisticType) {
-			this.visible = true;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				this.dataForm = JSON.parse(JSON.stringify(val));
-				this.dataForm.statisticType = statisticType;
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				this.dataForm.modifyPrice = this.dataForm.price;
-				this.dataForm.modifyQuantity = this.dataForm.quantity;
-				// 修改的提交
-				this.urlOptions.updateURL(this.dataForm).then((response) => {
-					this.$modal.msgSuccess('修改成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/raw/costMaterial/changeStatus.vue b/src/views/cost/raw/costMaterial/changeStatus.vue
deleted file mode 100644
index b9744b78..00000000
--- a/src/views/cost/raw/costMaterial/changeStatus.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-	<el-switch
-		@change="changeStatus"
-		size="small"
-		v-model="list.enabled"
-		:active-value="1"
-		:inactive-value="0"></el-switch>
-</template>
-
-<script>
-import { updateGroup } from '@/api/group/groupSetting';
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			list: this.injectData,
-		};
-	},
-	created() {},
-	methods: {
-		changeStatus(val) {
-			const data = { ...this.injectData, enabled: val };
-			updateGroup(data).then((res) => {
-				this.$modal.msgSuccess('修改成功');
-					this.$emit('emitData');
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/raw/costMaterial/index.vue b/src/views/cost/raw/costMaterial/index.vue
deleted file mode 100644
index 46e2e6c9..00000000
--- a/src/views/cost/raw/costMaterial/index.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['历史成本', '成本查询']" @change="currentMenu">
-				<template v-slot:tab1>
-					<div>历史成本</div>
-				</template>
-				<template v-slot:tab2>
-					<div>成本查询</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div class="app-container energyOverlimitLog">
-			<div v-show="activeName === 'his'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig"
-					ref="searchBarForm"
-					@headBtnClick="buttonClick" />
-			</div>
-			<div v-show="activeName === 'now'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig2"
-					ref="searchBarForm2"
-					@headBtnClick="buttonClick" />
-			</div>
-			<!-- 列表 -->
-			<div v-if="activeName === 'his'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps"
-					:table-data="tableData"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<div v-if="activeName === 'now'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps2"
-					:table-data="tableData2"
-					:max-height="tableH" />
-			</div>
-			<pagination
-				:page.sync="listQuery.pageNo"
-				:limit.sync="listQuery.pageSize"
-				:total="listQuery.total"
-				@pagination="getNavDataList" />
-			<base-dialog
-				:dialogTitle="addOrEditTitle"
-				:dialogVisible="addOrUpdateVisible"
-				@cancel="handleCancel"
-				@confirm="handleConfirm"
-				:before-close="handleCancel"
-				width="50%">
-				<add-or-update
-					ref="addOrUpdate"
-					@refreshDataList="successSubmit"></add-or-update>
-			</base-dialog>
-		</div>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { getMaterialPage } from '@/api/base/material';
-import {
-	getMaterialHisPage,
-	getMaterialRealtimePage,
-	exportMaterialRealtimeExcel,
-	exportMaterialHisExcel,
-} from '@/api/cost/costMaterial';
-import { parseTime } from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import typeRule from './typeRule';
-import ButtonNav from '@/components/ButtonNav';
-
-const tableProps = [
-	{
-		prop: 'time',
-		label: '日期',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'materialName',
-		label: '原料名称',
-	},
-	{
-		prop: 'quantity',
-		label: '累计使用量(千克)',
-	},
-	// {
-	// 	prop: 'matPrice',
-	// 	label: '单价(元/千克)',
-	// 	align: 'right',
-	// },
-	{
-		prop: 'price',
-		label: '总价(元)',
-		align: 'right',
-	},
-];
-const tableProps2 = [
-	// {
-	// 	prop: 'remark',
-	// 	label: '备注',
-	// },
-	{
-		prop: 'materialName',
-		label: '原料名称',
-	},
-	{
-		prop: 'time',
-		label: '单价生效时间',
-		subcomponent: typeRule,
-		width: 300,
-	},
-	{
-		prop: 'quantity',
-		label: '累计使用量(千克)',
-	},
-	// {
-	// 	prop: 'materialPrice',
-	// 	label: '单价(元/千克)',
-	// 	align: 'right',
-	// },
-	{
-		prop: 'price',
-		label: '总价(元)',
-		align: 'right',
-	},
-];
-export default {
-	name: 'costMaterial',
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getMaterialHisPage,
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '维度',
-					selectOptions: [
-						{ id: 1, name: '日' },
-						{ id: 2, name: '周' },
-						{ id: 3, name: '月' },
-					],
-					param: 'statisticType',
-					defaultSelect: 1, // 默认值,
-					clearable: false,
-				},
-				{
-					type: 'select',
-					label: '原料名称',
-					selectOptions: [],
-					param: 'name',
-					labelField: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'searchTime',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			formConfig2: [
-				{
-					type: 'select',
-					label: '原料名称',
-					selectOptions: [],
-					param: 'name',
-					labelField: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
-					param: 'searchTime',
-					width: 350,
-					clearable: false,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			listQuery: {
-				statisticType: 1,
-			},
-			activeName: 'his',
-			tableProps,
-			tableProps2,
-			tableBtn: [
-				{
-					type: 'edit',
-					btnName: '编辑',
-				},
-			].filter((v) => v),
-			tableData: [],
-			tableData2: [],
-		};
-	},
-	components: {
-		AddOrUpdate,
-		ButtonNav,
-	},
-	created() {
-		const params = {
-			pageNo: 1,
-			pageSize: 100,
-		};
-		getMaterialPage(params).then((response) => {
-			this.formConfig[1].selectOptions = response.data.list;
-			this.formConfig2[0].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.materialId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-						this.getDataList();
-					} else {
-						this.getDataList2();
-					}
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.materialId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		currentMenu(val) {
-			this.activeName = val === '历史成本' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.name = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList();
-			} else {
-				this.$refs.searchBarForm2.resetForm();
-				const end = new Date();
-				const start = new Date();
-				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
-				this.$nextTick(() => {
-					this.$refs.searchBarForm2.formInline.searchTime = [
-						this.listQuery.startTime,
-						this.listQuery.endTime,
-					];
-				});
-				this.listQuery.name = null;
-				this.listQuery.pageNo = 1;
-				this.getDataList2();
-			}
-		},
-		getNavDataList() {
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-		},
-		// 获取数据2列表
-		getDataList2() {
-			if (this.listQuery.startTime) {
-				getMaterialRealtimePage(this.listQuery).then((response) => {
-					this.tableData2 = response.data.list;
-					this.listQuery.total = response.data.total;
-				});
-			} else {
-				this.$message.warning('请选择时间范围');
-			}
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data, this.listQuery.statisticType);
-				});
-			} else {
-				this.otherMethods(val);
-			}
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			let exportURL, title;
-			if (this.activeName === 'his') {
-				exportURL = exportMaterialHisExcel;
-				title = '原料成本-历史成本';
-			} else {
-				exportURL = exportMaterialRealtimeExcel;
-				title = '原料成本-成本查询';
-			}
-			// 处理查询参数
-			let params = { ...this.listQuery };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					return exportURL(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, title + '报表.xls');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
-<style lang="scss">
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/src/views/cost/raw/costMaterial/typeRule.vue b/src/views/cost/raw/costMaterial/typeRule.vue
deleted file mode 100644
index 046a1261..00000000
--- a/src/views/cost/raw/costMaterial/typeRule.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-12-05 13:45:59
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-15 17:12:03
- * @Description
--->
-<template>
-	<div>
-		<span>{{ parseTime(injectData.startTime,'{y}年{m}月{d}日') + '-' + (parseTime(injectData.endTime)?parseTime(injectData.endTime,'{y}年{m}月{d}日'):'永久') }}</span>
-	</div>
-</template>
-<script>
-export default {
-	name: '',
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/raw/costOriginRatioHis/add-or-updata.vue b/src/views/cost/raw/costOriginRatioHis/add-or-updata.vue
deleted file mode 100644
index b9bfe514..00000000
--- a/src/views/cost/raw/costOriginRatioHis/add-or-updata.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-06-13 10:59:54
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					:label="activeName === 'his' ? '产线' : '工段'"
-					prop="bindObjectName">
-					<el-input
-						style="width: 100%"
-						v-model="dataForm.bindObjectName"
-						disabled />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="所属日期" prop="recTime">
-					<el-date-picker
-						v-model="dataForm.recTime"
-						type="date"
-						value-format="timestamp"
-						:style="{ width: '100%' }"
-						disabled
-						placeholder="选择所属日期"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="activeName === 'his'">
-				<el-form-item label="厚度" prop="thick">
-					<el-input-number
-						:min="0"
-						style="width: 85%"
-						v-model="dataForm.thick"
-						clearable
-						placeholder="请输入厚度" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="activeName === 'his'">
-				<el-form-item label="在线速度" prop="speed">
-					<el-input-number
-						:min="0"
-						style="width: 85%"
-						v-model="dataForm.speed"
-						clearable
-						placeholder="请输入在线速度" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="activeName === 'his'">
-				<el-form-item label="掰边宽度" prop="width">
-					<el-input-number
-						:min="0"
-						style="width: 85%"
-						v-model="dataForm.width"
-						clearable
-						placeholder="请输入掰边宽度" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					:label="activeName === 'his' ? '拉引量' : '进片数'"
-					prop="inArea">
-					<el-input-number
-						:min="0"
-						style="width: 85%"
-						v-model="dataForm.inArea"
-						clearable />
-					{{ activeName === 'his' ? '(m²)' : '片' }}
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					:label="activeName === 'his' ? '下片面积' : '出片数'"
-					prop="outArea">
-					<el-input-number
-						:min="0"
-						style="width: 85%"
-						v-model="dataForm.outArea"
-						clearable />
-					{{ activeName === 'his' ? '(m²)' : '片' }}
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="良品率" prop="ratio">
-					<el-input-number
-						:min="0"
-						style="width: 85%"
-						v-model="dataForm.ratio"
-						clearable
-						placeholder="请输入良品率" />
-					(%)
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import { updatecostOriginRatioHis } from '@/api/cost/costOriginRatioHis';
-
-export default {
-	mixins: [basicAdd],
-	props: {
-		nameArr: {
-			type: Array,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			urlOptions: {
-				updateURL: updatecostOriginRatioHis,
-			},
-			dataForm: {
-				id: undefined,
-				bindObjectName: undefined,
-				thick: undefined,
-				speed: undefined,
-				width: undefined,
-				inArea: undefined,
-				outArea: undefined,
-				ratio: undefined,
-				recTime: undefined,
-			},
-			dataRule: {},
-			activeName: 'his',
-		};
-	},
-	methods: {
-		init(val, statisticType, activeName) {
-			this.activeName = activeName;
-			this.visible = true;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				this.dataForm = JSON.parse(JSON.stringify(val));
-				this.dataForm.statisticType = statisticType;
-				this.dataForm.ratio =
-					this.dataForm.ratio >= 0 ? this.dataForm.ratio * 100 : '';
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				let udata = {
-					id: this.dataForm.id,
-					statisticType: this.dataForm.statisticType,
-					modifyInArea: this.dataForm.inArea,
-					modifyOutArea: this.dataForm.outArea,
-					modifyRatio:
-						this.dataForm.ratio >= 0 ? this.dataForm.ratio / 100 : '',
-				};
-				if (this.activeName === 'his') {
-					udata = {
-						...udata,
-						modifyThick: this.dataForm.thick,
-						modifySpeed: this.dataForm.speed,
-						modifyWidth: this.dataForm.width,
-					};
-				}
-				// 修改的提交
-				this.urlOptions.updateURL(udata).then((response) => {
-					this.$modal.msgSuccess('修改成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/raw/costOriginRatioHis/index.vue b/src/views/cost/raw/costOriginRatioHis/index.vue
deleted file mode 100644
index faefd721..00000000
--- a/src/views/cost/raw/costOriginRatioHis/index.vue
+++ /dev/null
@@ -1,411 +0,0 @@
-<template>
-	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['产线良品率', '工段良品率']" @change="currentMenu">
-				<template v-slot:tab1>
-					<div>产线良品率</div>
-				</template>
-				<template v-slot:tab2>
-					<div>工段良品率</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div class="app-container energyOverlimitLog">
-			<search-bar
-				:formConfigs="formConfig"
-				ref="searchBarForm"
-				@headBtnClick="buttonClick" />
-			<!-- 列表 -->
-			<div v-if="activeName === 'his'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps"
-					:table-data="tableData"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<div v-if="activeName === 'now'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps2"
-					:table-data="tableData2"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<pagination
-				:page.sync="listQuery.pageNo"
-				:limit.sync="listQuery.pageSize"
-				:total="listQuery.total"
-				@pagination="getNavDataList" />
-			<base-dialog
-				:dialogTitle="addOrEditTitle"
-				:dialogVisible="addOrUpdateVisible"
-				@cancel="handleCancel"
-				@confirm="handleConfirm"
-				:before-close="handleCancel"
-				width="50%">
-				<add-or-update
-					ref="addOrUpdate"
-					:name-arr="formConfig[1].selectOptions"
-					@refreshDataList="successSubmit"></add-or-update>
-			</base-dialog>
-		</div>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { getLinePage } from '@/api/base/productionLine';
-import {
-	getcostOriginRatioHisPage,
-	getcostOriginWSRatioHisPage,
-	exportcostOriginWSRatioHisExcel,
-	exportcostOriginRatioHisExcel,
-} from '@/api/cost/costOriginRatioHis';
-import { parseTime } from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import ButtonNav from '@/components/ButtonNav';
-
-
-const tableProps = [
-	{
-		prop: 'time',
-		label: '日期',
-    width:130,
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'bindObjectName',
-		label: '产线',
-    width:145,
-	},
-	{
-		prop: 'thick',
-		label: '厚度',
-    filter: (val) => (val != null ? Number(val).toFixed(1) : '-'),
-	},
-	{
-		prop: 'speed',
-		label: '在线速度',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'width',
-		label: '掰边宽度',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'inArea',
-		label: '拉引量/m²',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'outArea',
-		label: '下片面积/m²',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'ratio',
-		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
-	},
-];
-const tableProps2  = [
-	{
-		prop: 'time',
-		label: '日期',
-    width:130,
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'bindObjectName',
-		label: '工段',
-    width:145,
-	},
-	{
-		prop: 'spec',
-		label: '规格',
-	},
-	{
-		prop: 'inArea',
-		label: '进片数',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'outArea',
-		label: '出片数',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'ratio',
-		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
-	},
-];
-export default {
-	name: 'costOriginRatioHis',
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getcostOriginRatioHisPage,
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '维度',
-					selectOptions: [
-						{ id: 1, name: '日' },
-						{ id: 2, name: '周' },
-						{ id: 3, name: '月' },
-					],
-					param: 'statisticType',
-					defaultSelect: 1, // 默认值,
-					clearable: false,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
-					param: 'searchTime',
-					width: 350,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			listQuery: {
-				statisticType: 1,
-			},
-			activeName: 'his',
-			tableProps,
-			tableProps2,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  }
-			].filter((v) => v),
-			tableData: [],
-			tableData2: [],
-		};
-	},
-	components: {
-		AddOrUpdate,
-		ButtonNav,
-	},
-	created() {
-    const params ={
-      pageNo: 1,
-      pageSize: 100,
-      pdType: 0
-    }
-		getLinePage(params).then((response) => {
-			this.formConfig[1].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.bindObjectId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.getDataList();
-					} else {
-						this.getDataList2();
-					}
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.bindObjectId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		currentMenu(val) {
-			this.activeName = val === '产线良品率' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.bindObjectId = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList();
-			} else {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.bindObjectId = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList2();
-			}
-		},
-		// 获取数据2列表
-		getDataList2() {
-			getcostOriginWSRatioHisPage(this.listQuery).then((response) => {
-				this.tableData2 = response.data.list;
-				this.listQuery.total = response.data.total;
-			});
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(
-						val.data,
-						this.listQuery.statisticType,
-						this.activeName
-					);
-				});
-			} else {
-				this.otherMethods(val);
-			}
-		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
-		successSubmit() {
-			this.handleCancel();
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			let exportURL, title;
-			if (this.activeName === 'his') {
-				exportURL = exportcostOriginRatioHisExcel;
-				title = '原片-产线良品率';
-			} else {
-				exportURL = exportcostOriginWSRatioHisExcel;
-				title = '原片-工段良品率';
-			}
-			// 处理查询参数
-			let params = { ...this.listQuery };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					return exportURL(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, title + '报表.xls');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
-<style lang="scss">
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/src/views/cost/raw/costOthercostHis/add-or-updata.vue b/src/views/cost/raw/costOthercostHis/add-or-updata.vue
deleted file mode 100644
index 5d4d7859..00000000
--- a/src/views/cost/raw/costOthercostHis/add-or-updata.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-05 15:36:45
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="成本名称" prop="name">
-					<el-select
-						v-model="dataForm.name"
-						disabled
-						:style="{ width: '100%' }"
-						placeholder="请选择成本名称">
-						<el-option
-							v-for="item in nameArr"
-							:key="item.name"
-							:label="item.label"
-							:value="item.name"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="总价" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.price"
-						clearable
-						placeholder="请输入总价" />
-					(元)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="所属日期" prop="recTime">
-					<el-date-picker
-						v-model="dataForm.recTime"
-						type="date"
-						value-format="timestamp"
-						:style="{ width: '100%' }"
-            disabled
-						placeholder="选择所属日期"></el-date-picker>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import {
-	updateRawOthercostHis,
-} from '@/api/cost/costOthercostHis';
-
-export default {
-	mixins: [basicAdd],
-	props: {
-		nameArr: {
-			type: Array,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			urlOptions: {
-				updateURL: updateRawOthercostHis,
-			},
-			dataForm: {
-				id: undefined,
-				price: undefined,
-				name: undefined,
-				recTime: undefined,
-			},
-			dataRule: {
-				price: [
-					{ required: true, message: '总价不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	methods: {
-    init(val,statisticType) {
-      this.visible = true;
-      this.$nextTick(() => {
-        this.$refs["dataForm"].resetFields();
-        this.dataForm = JSON.parse(JSON.stringify(val))
-        this.dataForm.statisticType = statisticType
-      });
-    },
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-        this.dataForm.modifyPrice = this.dataForm.price
-				// 修改的提交
-				this.urlOptions.updateURL(this.dataForm).then((response) => {
-					this.$modal.msgSuccess('修改成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-  },
-};
-</script>
diff --git a/src/views/cost/raw/costOthercostHis/index.vue b/src/views/cost/raw/costOthercostHis/index.vue
deleted file mode 100644
index 8a3cff11..00000000
--- a/src/views/cost/raw/costOthercostHis/index.vue
+++ /dev/null
@@ -1,400 +0,0 @@
-<template>
-	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['历史成本', '成本查询']" @change="currentMenu">
-				<template v-slot:tab1>
-					<div>历史成本</div>
-				</template>
-				<template v-slot:tab2>
-					<div>成本查询</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div class="app-container energyOverlimitLog">
-			<div v-show="activeName === 'his'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig"
-					ref="searchBarForm"
-					@headBtnClick="buttonClick" />
-			</div>
-			<div v-show="activeName === 'now'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig2"
-					ref="searchBarForm2"
-					@headBtnClick="buttonClick" />
-			</div>
-			<!-- 列表 -->
-			<div v-if="activeName === 'his'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps"
-					:table-data="tableData"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<div v-if="activeName === 'now'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps2"
-					:table-data="tableData2"
-					:max-height="tableH" />
-			</div>
-			<pagination
-				:page.sync="listQuery.pageNo"
-				:limit.sync="listQuery.pageSize"
-				:total="listQuery.total"
-				@pagination="getNavDataList" />
-			<base-dialog
-				:dialogTitle="addOrEditTitle"
-				:dialogVisible="addOrUpdateVisible"
-				@cancel="handleCancel"
-				@confirm="handleConfirm"
-				:before-close="handleCancel"
-				width="50%">
-				<add-or-update
-					ref="addOrUpdate"
-					:name-arr="formConfig[1].selectOptions"
-					@refreshDataList="successSubmit"></add-or-update>
-			</base-dialog>
-		</div>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { getRawOthercostRulePage } from '@/api/cost/rawOthercostRule';
-import {
-	getRawOthercostHisPage,
-	getRawOthercostSunPage,
-  exportRawOthercostSunExcel,
-  exportRawOthercostHisExcel
-} from '@/api/cost/costOthercostHis';
-import { parseTime } from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import ButtonNav from '@/components/ButtonNav';
-
-const tableProps = [
-	{
-		prop: 'time',
-		label: '日期',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'otherCostName',
-		label: '成本名称',
-	},
-	{
-		prop: 'price',
-		label: '总价（元）',
-		align: 'right',
-	},
-];
-const tableProps2 = [
-	// {
-	// 	prop: 'remark',
-	// 	label: '备注',
-	// },
-	{
-		prop: 'otherCostName',
-		label: '成本名称',
-	},
-	{
-		prop: 'price',
-		label: '总价（元）',
-		align: 'right',
-	},
-];
-export default {
-	name: 'costOthercostHis',
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getRawOthercostHisPage,
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '维度',
-					selectOptions: [
-						{ id: 1, name: '日' },
-						{ id: 2, name: '周' },
-						{ id: 3, name: '月' },
-					],
-					param: 'statisticType',
-					defaultSelect: 1, // 默认值,
-					clearable: false,
-				},
-				{
-					type: 'select',
-					label: '成本名称',
-					selectOptions: [],
-					param: 'name',
-					labelField: 'label',
-					valueField: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'searchTime',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			formConfig2: [
-				{
-					type: 'select',
-					label: '成本名称',
-					selectOptions: [],
-					param: 'name',
-					labelField: 'label',
-					valueField: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
-					param: 'searchTime',
-					width: 350,
-					clearable: false,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			listQuery: {
-				statisticType: 1,
-			},
-			activeName: 'his',
-			tableProps,
-			tableProps2,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  }
-			].filter((v) => v),
-			tableData: [],
-			tableData2: [],
-		};
-	},
-	components: {
-		AddOrUpdate,
-		ButtonNav,
-	},
-	created() {
-		const params = {
-			pageNo: 1,
-			pageSize: 100,
-		};
-		getRawOthercostRulePage(params).then((response) => {
-			this.formConfig[1].selectOptions = response.data.list;
-			this.formConfig2[0].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.name = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-						this.getDataList();
-					} else {
-						this.getDataList2();
-					}
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.name = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		currentMenu(val) {
-			this.activeName = val === '历史成本' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.name = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList();
-			} else {
-				this.$refs.searchBarForm2.resetForm();
-				this.listQuery.name = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.pageNo = 1;
-				this.getDataList2();
-			}
-		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
-		// 获取数据2列表
-		getDataList2() {
-			getRawOthercostSunPage(this.listQuery).then((response) => {
-				this.tableData2 = response.data.list;
-				this.listQuery.total = response.data.total;
-			});
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data, this.listQuery.statisticType);
-				});
-			} else {
-				this.otherMethods(val);
-			}
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			let exportURL, title;
-			if (this.activeName === 'his') {
-				exportURL = exportRawOthercostHisExcel;
-        title = '原片其它成本-历史成本';
-			} else {
-				exportURL = exportRawOthercostSunExcel;
-        title = '原片其它成本-成本查询';
-			}
-			// 处理查询参数
-			let params = { ...this.listQuery };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					return exportURL(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, title + '报表.xls');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
-<style lang="scss">
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/src/views/cost/raw/costOthercostLog/add-or-updata.vue b/src/views/cost/raw/costOthercostLog/add-or-updata.vue
deleted file mode 100644
index 18308789..00000000
--- a/src/views/cost/raw/costOthercostLog/add-or-updata.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-05 15:33:48
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="成本名称" prop="name">
-					<el-select
-						v-model="dataForm.name"
-						filterable
-						clearable
-						:style="{ width: '100%' }"
-            @change="setLabel"
-						placeholder="请选择成本名称">
-						<el-option
-							v-for="item in nameArr"
-							:key="item.name"
-							:label="item.label"
-							:value="item.name"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="成本金额" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.price"
-						clearable
-						placeholder="请输入成本金额" />
-					(元)
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="所属日期" prop="recTime">
-					<el-date-picker
-						v-model="dataForm.recTime"
-						type="date"
-						value-format="timestamp"
-						:style="{ width: '100%' }"
-						placeholder="选择所属日期"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="dataForm.remark"
-						clearable
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import {
-	createRawOthercostLog,
-	updateRawOthercostLog,
-	getRawOthercostLog,
-} from '@/api/cost/costOthercostLog';
-import moment from 'moment';
-
-const nowData = moment().format('YYYY-MM-DD').valueOf()
-export default {
-	mixins: [basicAdd],
-	props: {
-		nameArr: {
-			type: Array,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			urlOptions: {
-				createURL: createRawOthercostLog,
-				updateURL: updateRawOthercostLog,
-				infoURL: getRawOthercostLog,
-			},
-			dataForm: {
-				id: undefined,
-				price: undefined,
-				name: undefined,
-				recTime: new Date().getTime(),
-				remark: undefined,
-			},
-			dataRule: {
-				price: [
-					{ required: true, message: '成本金额不能为空', trigger: 'blur' },
-				],
-				name: [
-					{ required: true, message: '	成本名称不能为空', trigger: 'blur' },
-				],
-				recTime: [
-					{
-						required: true,
-						message: '所属日期不能为空',
-						trigger: 'change',
-					},
-				],
-			},
-		};
-	},
-	methods: {
-    setLabel(val){
-      this.dataForm.label = this.nameArr.find(item=>item.name===val).label
-    }
-  },
-};
-</script>
diff --git a/src/views/cost/raw/costOthercostLog/index.vue b/src/views/cost/raw/costOthercostLog/index.vue
deleted file mode 100644
index b34aae95..00000000
--- a/src/views/cost/raw/costOthercostLog/index.vue
+++ /dev/null
@@ -1,224 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:max-height="tableH"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				:name-arr="formConfig[0].selectOptions"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import { parseTime } from '@/filter/code-filter';
-import {
-	deleteRawOthercostLog,
-	getRawOthercostLogPage,
-	exportRawOthercostLogExcel,
-} from '@/api/cost/costOthercostLog';
-import { getRawOthercostRulePage } from '@/api/cost/rawOthercostRule';
-
-const tableProps = [
-	{
-		prop: 'otherCostName',
-		label: '成本名称',
-	},
-	{
-		prop: 'recTime',
-		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
-	},
-	{
-		prop: 'price',
-		label: '成本金额',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-];
-
-export default {
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getRawOthercostLogPage,
-				deleteURL: deleteRawOthercostLog,
-				exportURL: exportRawOthercostLogExcel,
-			},
-			tableProps,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  },{
-							type: 'delete',
-							btnName: '删除',
-					  }
-			].filter((v) => v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '成本名称',
-					selectOptions: [],
-					param: 'name',
-					labelField: 'label',
-					valueField: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'searchTime',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: this.$auth.hasPermi('monitoring:cost-othercost-log:create')
-						? 'separate'
-						: '',
-				},
-				{
-					type: this.$auth.hasPermi('monitoring:cost-othercost-log:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-				// {
-				// 	type: this.$auth.hasPermi('monitoring:cost-othercost-log:create') ? 'separate' : '',
-				// },
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {
-		const params = {
-			pageNo: 1,
-			pageSize: 100,
-		};
-		getRawOthercostRulePage(params).then((response) => {
-			this.formConfig[0].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.name = val.name||null;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-						: null;
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.name = val.name||null;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-						: null;
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-    //tableBtn点击
-    handleClick(val) {
-      if (val.type === "edit") {
-        this.addOrUpdateVisible = true;
-        this.addOrEditTitle = "编辑";
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(val.data.id);
-        });
-      } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.otherCostName, val.data._pageIndex)
-      } else {
-        this.otherMethods(val)
-      }
-    },
-		/** 导出按钮操作 */
-		handleExport() {
-			let title;
-      title = '原片其它成本-成本记录';
-			// 处理查询参数
-			let params = { ...this.listQuery };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					return this.urlOptions.exportURL(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, title + '报表.xls');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/raw/costOthercostRule/add-or-updata.vue b/src/views/cost/raw/costOthercostRule/add-or-updata.vue
deleted file mode 100644
index b64a4803..00000000
--- a/src/views/cost/raw/costOthercostRule/add-or-updata.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 13:52:10
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-03 14:53:54
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		v-if="visible"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px"
-		label-position="top">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="成本名称" prop="label">
-					<el-input v-model="dataForm.label" clearable disabled />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="自动计算策略" prop="type">
-					<el-radio-group v-model="dataForm.type" @input="setType">
-						<el-radio :label="1">每天等价</el-radio>
-						<el-radio :label="2">折旧</el-radio>
-					</el-radio-group>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="dataForm.type === 1" key="one">
-				<el-form-item label="价格" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.price"
-						clearable />
-					(元)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="dataForm.type === 2" key="two">
-				<el-form-item label="总价" prop="price">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.price"
-						clearable />
-					(元)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="dataForm.type === 2" key="three">
-				<el-form-item label="年折旧率" prop="ratio">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.ratio"
-						clearable />
-					(%)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="dataForm.type === 2" key="four">
-				<el-form-item label="折旧年限" prop="timeLimit">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.timeLimit"
-						clearable />
-					(年)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						@input="$forceUpdate()"
-						v-model="dataForm.remark"
-						clearable
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import {
-	updateRawOthercostRule,
-	getRawOthercostRule,
-} from '@/api/cost/rawOthercostRule';
-
-export default {
-	data() {
-		return {
-			urlOptions: {
-				updateURL: updateRawOthercostRule,
-				infoURL: getRawOthercostRule,
-			},
-			dataForm: {
-				label: undefined,
-				type: 1,
-				price: 0,
-				ratio: 0,
-				timeLimit: 1,
-				remark: '',
-			},
-			visible: false,
-			dataRule: {
-				price: [{ required: true, message: '价格不能为空', trigger: 'blur' }],
-				ratio: [{ required: true, message: '折旧率不能为空', trigger: 'blur' }],
-				timeLimit: [
-					{ required: true, message: '折旧年限不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	created() {},
-	methods: {
-		init(val) {
-			this.dataForm = {
-				label: undefined,
-				type: 1,
-				price: 0,
-				ratio: 0,
-				timeLimit: 1,
-				remark: '',
-			};
-			this.visible = true;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				this.dataForm = JSON.parse(JSON.stringify(val));
-			});
-		},
-		setType(val) {
-			if (val === 1) {
-			} else {
-			}
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				// 修改的提交
-				this.urlOptions.updateURL(this.dataForm).then((response) => {
-					this.$modal.msgSuccess('修改成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-		/** 清空form */
-		formClear() {
-			if (this.$refs.dataForm !== undefined) {
-				this.$refs.dataForm.resetFields();
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/raw/costOthercostRule/index.vue b/src/views/cost/raw/costOthercostRule/index.vue
deleted file mode 100644
index d8d85909..00000000
--- a/src/views/cost/raw/costOthercostRule/index.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-04-15 16:52:38
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-11 15:31:12
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<!-- 列表 -->
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:max-height="tableH"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="40%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import typeRule from './typeRule';
-import {
-	getRawOthercostRulePage,
-} from '@/api/cost/rawOthercostRule';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-
-const tableProps = [
-	{
-		prop: 'label',
-		label: '成本名称',
-	},
-	{
-		prop: 'type',
-		label: '自动计算方式',
-		subcomponent: typeRule,
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-];
-
-export default {
-	mixins: [basicPage,tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getRawOthercostRulePage,
-			},
-			tableProps,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  }
-			].filter((v) => v),
-			tableData: [],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {
-	},
-	methods: {
-    //tableBtn点击
-    handleClick(val) {
-      if (val.type === "edit") {
-        this.addOrUpdateVisible = true;
-        this.addOrEditTitle = "编辑";
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(val.data);
-        });
-      }
-    },
-	},
-};
-</script>
diff --git a/src/views/cost/raw/costOthercostRule/typeRule.vue b/src/views/cost/raw/costOthercostRule/typeRule.vue
deleted file mode 100644
index 1c7f8670..00000000
--- a/src/views/cost/raw/costOthercostRule/typeRule.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-12-05 13:45:59
- * @LastEditors: zwq
- * @LastEditTime: 2024-12-25 16:20:38
- * @Description
--->
-<template>
-	<div>
-		<span>
-			{{
-				injectData.type == 1
-					? `每天等价,${Number(injectData.price)}元`
-					: injectData.type == 2
-					? `总价${Number(injectData.price)}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
-					: '-'
-			}}
-		</span>
-	</div>
-</template>
-<script>
-export default {
-	name: '',
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/raw/costStatistics/add-or-updata.vue b/src/views/cost/raw/costStatistics/add-or-updata.vue
deleted file mode 100644
index a67243a2..00000000
--- a/src/views/cost/raw/costStatistics/add-or-updata.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-02 16:34:35
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="产线" prop="bindObjectName">
-					<el-input
-						v-model="dataForm.bindObjectName"
-						disabled
-						placeholder="产线" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="拉引量" prop="inArea">
-					<el-input-number
-						:min="0"
-						style="width: 85%"
-						v-model="dataForm.inArea"
-						clearable
-						placeholder="请输入拉引量" />
-					(m²)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="下片面积" prop="outArea">
-					<el-input-number
-						:min="0"
-						style="width: 85%"
-						v-model="dataForm.outArea"
-						clearable
-						placeholder="请输入下片面积" />
-					(m²)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="良品率" prop="ratio">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.ratio"
-						clearable
-						placeholder="请输入良品率" />
-            (%)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="原片成本" prop="costSum">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.costSum"
-						clearable
-						placeholder="请输入原片成本" />
-					(元)
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="每平米成本" prop="costArea">
-					<el-input-number
-						:min="0"
-						style="width: 80%"
-						v-model="dataForm.costArea"
-						clearable
-						placeholder="请输入每平米成本" />
-					(元)
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import { updateRawCostStatistics } from '@/api/cost/rawCostStatistics';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				updateURL: updateRawCostStatistics,
-			},
-			dataForm: {
-				id: undefined,
-				bindObjectName: undefined,
-				inArea: undefined,
-				outArea: undefined,
-				ratio: undefined,
-				costArea: undefined,
-				costSum: undefined,
-			},
-			dataRule: {
-				costSum: [
-					{ required: true, message: '原片成本成本不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	methods: {
-		init(val, statisticType) {
-			this.visible = true;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				this.dataForm = JSON.parse(JSON.stringify(val));
-				this.dataForm.statisticType = statisticType;
-				this.dataForm.ratio =
-					this.dataForm.ratio >= 0 ? this.dataForm.ratio * 100 : '';
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				const data = {
-					id: this.dataForm.id,
-          statisticType: this.dataForm.statisticType,
-					bindObjectName: this.dataForm.bindObjectName,
-					modifyInArea: this.dataForm.inArea,
-					modifyOutArea: this.dataForm.outArea,
-					modifyRatio:
-						this.dataForm.ratio >= 0 ? this.dataForm.ratio / 100 : '',
-					modifyCostArea: this.dataForm.costArea,
-					modifyCostSum: this.dataForm.costSum,
-				};
-				// 修改的提交
-				this.urlOptions.updateURL(data).then((response) => {
-					this.$modal.msgSuccess('修改成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/cost/raw/costStatistics/index.vue b/src/views/cost/raw/costStatistics/index.vue
deleted file mode 100644
index b416e1f5..00000000
--- a/src/views/cost/raw/costStatistics/index.vue
+++ /dev/null
@@ -1,474 +0,0 @@
-<template>
-	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
-			<ButtonNav :menus="['历史成本', '成本查询']" @change="currentMenu">
-				<template v-slot:tab1>
-					<div>历史成本</div>
-				</template>
-				<template v-slot:tab2>
-					<div>成本查询</div>
-				</template>
-			</ButtonNav>
-		</div>
-		<div class="app-container energyOverlimitLog">
-			<div v-show="activeName === 'his'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig"
-					ref="searchBarForm"
-					@headBtnClick="buttonClick" />
-			</div>
-			<div v-show="activeName === 'now'">
-				<!-- 搜索工作栏 -->
-				<search-bar
-					:formConfigs="formConfig2"
-					ref="searchBarForm2"
-					@headBtnClick="buttonClick" />
-			</div>
-			<!-- 列表 -->
-			<div v-if="activeName === 'his'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps"
-					:table-data="tableData"
-					:max-height="tableH">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</div>
-			<div v-if="activeName === 'now'">
-				<base-table
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-props="tableProps2"
-					:table-data="tableData2"
-					:max-height="tableH" />
-			</div>
-			<pagination
-				:page.sync="listQuery.pageNo"
-				:limit.sync="listQuery.pageSize"
-				:total="listQuery.total"
-				@pagination="getNavDataList" />
-			<base-dialog
-				:dialogTitle="addOrEditTitle"
-				:dialogVisible="addOrUpdateVisible"
-				@cancel="handleCancel"
-				@confirm="handleConfirm"
-				:before-close="handleCancel"
-				width="50%">
-				<add-or-update
-					ref="addOrUpdate"
-					@refreshDataList="successSubmit"></add-or-update>
-			</base-dialog>
-		</div>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '@/mixins/basic-page';
-import { getLinePage } from '@/api/base/productionLine';
-import {
-	getRawCostStatisticsPage,
-	getRawCostStatisticsRealtimePage,
-  exportRawStatisticsRealtimeExcel,
-  exportRawCostStatisticsHisExcel
-} from '@/api/cost/rawCostStatistics';
-import { parseTime } from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import typeRule from './typeRule';
-import ButtonNav from '@/components/ButtonNav';
-
-const tableProps = [
-	{
-		prop: 'time',
-		label: '时间',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'bindObjectName',
-		label: '产线',
-	},
-	{
-		prop: 'thick',
-		label: '厚度',
-    filter: (val) => (val != null ? Number(val).toFixed(1) : '-'),
-	},
-	{
-		prop: 'inArea',
-		label: '拉引量/m²',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'outArea',
-		label: '下片面积/m²',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'ratio',
-		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
-	},
-	{
-		prop: 'costSum',
-		label: '原片成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'costArea',
-		label: '每平米成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-];
-const tableProps2 = [
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-	{
-		prop: 'bindObjectName',
-		label: '产线',
-	},
-	{
-		prop: 'spec',
-		label: '规格',
-	},
-	{
-		prop: 'inArea',
-		label: '拉引量/m²',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'outArea',
-		label: '下片面积/m²',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'outCount',
-		label: '下片数量',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'ratio',
-		label: '良品率',
-		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
-	},
-	{
-		prop: 'costSum',
-		label: '原片成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'costPiece',
-		label: '单片成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-	{
-		prop: 'costArea',
-		label: '每平米成本/元',
-		align: 'right',
-    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
-	},
-];
-export default {
-	name: 'costMaterial',
-	mixins: [basicPage, tableHeightMixin],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getRawCostStatisticsPage,
-			},
-			formConfig: [
-				{
-					type: 'select',
-					label: '维度',
-					selectOptions: [
-						{ id: 1, name: '日' },
-						{ id: 2, name: '周' },
-						{ id: 3, name: '月' },
-					],
-					param: 'statisticType',
-					defaultSelect: 1, // 默认值,
-					clearable: false,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'name',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'searchTime',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			formConfig2: [
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['08:30:00', '08:30:00'],
-					param: 'searchTime',
-					width: 350,
-					clearable: false,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'name',
-					filterable: true,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			listQuery: {
-				statisticType: 1,
-			},
-			activeName: 'his',
-			tableProps,
-			tableProps2,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  }
-			].filter((v) => v),
-			tableData: [],
-			tableData2: [],
-		};
-	},
-	components: {
-		AddOrUpdate,
-		ButtonNav,
-	},
-	created() {
-    const params ={
-      pageNo: 1,
-      pageSize: 100,
-      pdType: 1
-    }
-		getLinePage(params).then((response) => {
-			this.formConfig[1].selectOptions = response.data.list;
-			this.formConfig2[1].selectOptions = response.data.list;
-		});
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.bindObjectId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-						this.getDataList();
-					} else {
-						this.getDataList2();
-					}
-					break;
-				case 'add':
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-					this.listQuery.bindObjectId = val.name || null;
-					this.listQuery.statisticType = val.statisticType || 1;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1]
-						: null;
-					if (this.activeName === 'his') {
-						this.listQuery.endTime = val.searchTime
-							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-							: null;
-					}
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		currentMenu(val) {
-			this.activeName = val === '历史成本' ? 'his' : 'now';
-			if (this.activeName === 'his') {
-				this.$refs.searchBarForm.resetForm();
-				this.listQuery.name = null;
-				this.listQuery.startTime = null;
-				this.listQuery.endTime = null;
-				this.listQuery.statisticType = 1;
-				this.listQuery.pageNo = 1;
-				this.getDataList();
-			} else {
-				this.$refs.searchBarForm2.resetForm();
-				const end = new Date();
-				const start = new Date();
-				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
-				this.$nextTick(() => {
-					this.$refs.searchBarForm2.formInline.searchTime = [
-						this.listQuery.startTime,
-						this.listQuery.endTime,
-					];
-				});
-				this.listQuery.name = null;
-				this.listQuery.pageNo = 1;
-				this.getDataList2();
-			}
-		},
-    getNavDataList(){
-			if (this.activeName === 'his') {
-				this.getDataList();
-			} else {
-				this.getDataList2();
-			}
-    },
-		// 获取数据2列表
-		getDataList2() {
-			if (this.listQuery.startTime) {
-				getRawCostStatisticsRealtimePage(this.listQuery).then((response) => {
-					this.tableData2 = response.data.list;
-					this.listQuery.total = response.data.total;
-				});
-			} else {
-				this.$message.warning('请选择时间范围');
-			}
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data, this.listQuery.statisticType);
-				});
-			} else {
-				this.otherMethods(val);
-			}
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			let exportURL, title;
-			if (this.activeName === 'his') {
-				exportURL = exportRawCostStatisticsHisExcel;
-        title = '原片成本统计-历史成本';
-			} else {
-				exportURL = exportRawStatisticsRealtimeExcel;
-        title = '原片成本统计-成本查询';
-			}
-			// 处理查询参数
-			let params = { ...this.listQuery };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
-					return exportURL(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, title + '报表.xls');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
-<style lang="scss">
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/src/views/cost/raw/costStatistics/typeRule.vue b/src/views/cost/raw/costStatistics/typeRule.vue
deleted file mode 100644
index 046a1261..00000000
--- a/src/views/cost/raw/costStatistics/typeRule.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-12-05 13:45:59
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-15 17:12:03
- * @Description
--->
-<template>
-	<div>
-		<span>{{ parseTime(injectData.startTime,'{y}年{m}月{d}日') + '-' + (parseTime(injectData.endTime)?parseTime(injectData.endTime,'{y}年{m}月{d}日'):'永久') }}</span>
-	</div>
-</template>
-<script>
-export default {
-	name: '',
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-};
-</script>
diff --git a/src/views/energy/analysis/contrastAnalysis/components/barChart.vue b/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
deleted file mode 100644
index 075996b6..00000000
--- a/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <div 
-    id="analysischartBar"
-    style="width: 100%"
-    :style="{ height: chartHeight + 'px' }"
-  ></div>
-</template>
-<script>
-import * as echarts from 'echarts'
-import resize from '@/utils/chartMixins/resize'
-export default {
-  name: "BarChart",
-  mixins: [resize],
-  data() {
-    return {
-      chartDom: '',
-      chart: '',
-      chartHeight: this.tableHeight(214) - 70
-    }
-  },
-  props: {
-    chartData: {
-      type: Array,
-      required: true,
-      default: () => {
-        return []
-      }
-    },
-    timeDim: {
-      type: String,
-      default: ''
-    }
-  },
-  watch: {
-    chartData: function () {
-      this.getChart()
-    }
-  },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(214) - 70
-    })
-  },
-  methods: {
-    getChart() {
-      if (
-        this.chart !== null &&
-        this.chart !== '' &&
-        this.chart !== undefined
-      ) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
-      }
-      this.chartDom = document.getElementById('analysischartBar')
-      this.chart = echarts.init(this.chartDom)
-      let tempArr = []
-      let xData = []
-      let yData = []
-      let legendData = []
-      if (this.chartData.length === 0) {
-        return false
-      } else {
-        tempArr = this.chartData[0].trendRespVOList
-      }
-      for (let k = 0; k < tempArr.length; k++) {
-        let time = ''
-        if (this.timeDim === '3') {
-          let year = tempArr[k].time.slice(0,4)
-          let weak = tempArr[k].time.slice(4,6)
-          time = year+' 第 '+weak+' 周'
-        } else {
-          time = tempArr[k].time
-        }
-        xData.push(time)
-      }
-      for (let i = 0; i < this.chartData.length; i++) {
-        let obj = {
-          name: this.chartData[i].objName + this.chartData[i].objCode,
-          type: 'bar',
-          barMaxWidth: 20,
-          label: {
-            show: true,
-            position: 'top'
-          },
-          data: []
-        }
-        legendData.push(this.chartData[i].objName + this.chartData[i].objCode)
-        let temp = this.chartData[i].trendRespVOList
-        for (let j = 0; j < temp.length; j++) {
-          let num = temp[j].useNum ? temp[j].useNum : ''
-          obj.data.push(num)
-        }
-        yData.push(obj)
-      }
-      var option = {
-        color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow'
-          },
-          formatter: function(params) {
-            return (
-              params[0].axisValue + 
-              `<br>` +
-              params.map((item) => {
-                let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`
-                let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`
-						let value = item.value ? item.value : '-'
-						let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>`
-						return `<span style="display:flex; justify-content:space-between; margin-bottom: 2px">
-									<span>${str}${seriesNameStr}</span>
-									<span>${valueStr}</span>
-								</span>`
-              }).join(``)
-            )
-          }
-        },
-        grid: {
-          left: '4%',
-          right: '1%',
-          bottom: '1%',
-          containLabel: true
-        },
-        legend: {
-          data: legendData,
-          right: '1%',
-          icon: 'rect',
-          itemHeight: 8,
-          itemWidth: 8
-        },
-        xAxis: {
-          type: 'category',
-          data: xData,
-          axisLabel: {
-            rotate: "45"
-          }
-        },
-        yAxis: {
-          type: 'value'
-        },
-        series: yData
-      };
-
-      option && this.chart.setOption(option);
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/energy/analysis/contrastAnalysis/components/lineChart.vue b/src/views/energy/analysis/contrastAnalysis/components/lineChart.vue
deleted file mode 100644
index b1cc088e..00000000
--- a/src/views/energy/analysis/contrastAnalysis/components/lineChart.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-  <div 
-    id="analysischartLine"
-    style="width: 100%"
-    :style="{ height: chartHeight + 'px' }"
-  ></div>
-</template>
-<script>
-import * as echarts from 'echarts'
-import resize from '@/utils/chartMixins/resize'
-export default {
-  name: "LineChart",
-  mixins: [resize],
-  data() {
-    return {
-      chartDom: '',
-      chart: '',
-      chartHeight: this.tableHeight(214) - 70
-    }
-  },
-  props: {
-    chartData: {
-      type: Array,
-      required: true,
-      default: () => {
-        return []
-      }
-    },
-    timeDim: {
-      type: String,
-      default: ''
-    }
-  },
-  watch: {
-    chartData: function () {
-      this.getChart()
-    }
-  },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(214) - 70
-    })
-  },
-  methods: {
-    getChart() {
-      if (
-        this.chart !== null &&
-        this.chart !== '' &&
-        this.chart !== undefined
-      ) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
-      }
-      this.chartDom = document.getElementById('analysischartLine')
-      this.chart = echarts.init(this.chartDom)
-      let tempArr = []
-      let xData = []
-      let yData = []
-      let legendData = []
-      if (this.chartData.length === 0) {
-        return false
-      } else {
-        tempArr = this.chartData[0].trendRespVOList
-      }
-      for (let k = 0; k < tempArr.length; k++) {
-        let time = ''
-        if (this.timeDim === '3') {
-          let year = tempArr[k].time.slice(0,4)
-          let weak = tempArr[k].time.slice(4,6)
-          time = year+' 第 '+weak+' 周'
-        } else {
-          time = tempArr[k].time
-        }
-        xData.push(time)
-      }
-      for (let i = 0; i < this.chartData.length; i++) {
-        let obj = {
-          name: this.chartData[i].objName + this.chartData[i].objCode,
-          type: 'line',
-          stack: 'Total',
-          data: []
-        }
-        legendData.push(this.chartData[i].objName + this.chartData[i].objCode)
-        let temp = this.chartData[i].trendRespVOList
-        for (let j = 0; j < temp.length; j++) {
-          let num = temp[j].useNum ? temp[j].useNum : ''
-          obj.data.push(num)
-        }
-        yData.push(obj)
-      }
-
-      var option = {
-        color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross'
-          }
-        },
-        grid: {
-          left: '4%',
-          right: '1%',
-          bottom: '1%',
-          containLabel: true
-        },
-        legend: {
-          data: legendData,
-          right: '1%'
-        },
-        xAxis: {
-          type: 'category',
-          data: xData,
-          axisLabel: {
-            rotate: "45"
-          }
-        },
-        yAxis: {
-          type: 'value'
-        },
-        series: yData
-      };
-
-      option && this.chart.setOption(option);
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
deleted file mode 100644
index 4370bfec..00000000
--- a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
+++ /dev/null
@@ -1,474 +0,0 @@
-<template>
-  <div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }">
-    <el-form :inline="true" class="demo-form-inline">
-      <span class="blue-block"></span>
-      <el-form-item label="能源类型">
-        <el-select v-model="queryParams.energyTypeId" placeholder="请选择" style="width: 100px;" size="small">
-          <el-option
-            v-for="item in energyTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="时间维度">
-        <el-select v-model="queryParams.timeDim" placeholder="请选择" style="width: 80px;" size="small">
-          <el-option
-            v-for="item in getDictDatas(this.DICT_TYPE.TIME_DIM)"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="时间范围">
-        <div v-show="queryParams.timeDim === '1'">
-          <el-date-picker
-            v-model="timeValue"
-            type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            format="yyyy-MM-dd HH:mm"
-            value-format="timestamp"
-            :picker-options="pickerOptions"
-            popper-class="noneMinute"
-            @change="timeSelect"
-            size="small"
-            style='width:350px;'
-            :clearable="false"
-            >
-          </el-date-picker>
-        </div>
-        <div v-show="queryParams.timeDim === '2'">
-          <el-date-picker
-            v-model="dateValue"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="timestamp"
-            :picker-options="pickerOptions"
-            :clearable="false"
-            size="small"
-            style='width:350px;'
-            @change="timeSelect"
-            >
-          </el-date-picker>
-        </div>
-        <div v-show="queryParams.timeDim === '3'">
-          <el-date-picker
-            v-model="weekValue1"
-            type="week"
-            format="yyyy 第 WW 周"
-            style='width:170px;'
-            :picker-options="pickerOptionsWeek"
-            @change="startWeek"
-            :clearable="false"
-            size="small"
-            placeholder="选择周">
-          </el-date-picker>-
-          <el-date-picker
-            v-model="weekValue2"
-            type="week"
-            format="yyyy 第 WW 周"
-            :picker-options="pickerOptionsWeek"
-            style='width:170px;'
-            @change="endWeek"
-            :clearable="false"
-            size="small"
-            placeholder="选择周">
-          </el-date-picker>
-        </div>
-        <div v-show="queryParams.timeDim === '4'">
-          <el-date-picker
-            v-model="monthValue"
-            type="monthrange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="timestamp"
-            :clearable="false"
-            :picker-options="pickerOptions"
-            size="small"
-            style='width:350px;'
-            @change="timeSelect"
-            >
-          </el-date-picker>
-        </div>
-        <div v-show="queryParams.timeDim === '5'">
-          <el-date-picker
-            style='width:170px;'
-            v-model="yearValue1"
-            type="year"
-            :picker-options="pickerOptions"
-            value-format="timestamp"
-            placeholder="选择年"
-            @change="startYear"
-            size="small"
-            :clearable="false"
-          >
-          </el-date-picker>-
-          <el-date-picker
-            style='width:170px;'
-            v-model="yearValue2"
-            type="year"
-            :picker-options="pickerOptions"
-            value-format="timestamp"
-            placeholder="选择年"
-            @change="endYear"
-            size="small"
-            :clearable="false"
-          >
-          </el-date-picker>
-        </div>
-      </el-form-item>
-      <el-form-item label="对象维度">
-        <el-select v-model="queryParams.objType" placeholder="请选择" style="width: 80px;" @change="selectObjs" size="small">
-          <el-option
-            v-for="item in getDictDatas(this.DICT_TYPE.OBJECT_TYPE)"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="对象选择">
-        <el-select v-model="queryParams.objIds" placeholder="请选择" multiple :multiple-limit='5' collapse-tags style="width: 200px;" size="small">
-          <el-option
-            v-for="item in objectList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-            <span style="float: left">{{ item.name }}</span>
-            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" size="small" @click="search">查询</el-button>
-      </el-form-item>
-    </el-form>
-    <span v-if="isFold" class="foldClass" @click='switchMode'>
-      {{ isExpand ? '收起' : '展开' }}
-      <svg-icon :icon-class="isExpand ? 'upward' : 'downward'" />
-    </span>
-  </div>
-</template>
-<script>
-import { getEnergyTypeListAll } from "@/api/base/energyType"
-import { getLineAll } from "@/api/base/productionLine"
-import { getWorkShopAll } from "@/api/base/workshopSection"
-import { getEquipmentAll } from "@/api/base/equipment"
-import moment from 'moment'
-export default {
-  name: 'searchArea',
-  props: {
-    isFold: {// 多行模式（默认否）
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      isExpand: false, // 展开收起
-      // 查询参数
-      queryParams: {
-        energyTypeId: null,
-        objIds: [],
-        objType: '',
-        timeDim: null,
-        startTime: null,
-        endTime: null
-      },
-      timeValue: [],// 最大7天只能整点
-      dateValue: [],// 最大30天
-      weekValue1: null,//最多24周
-      weekValue2: null,
-      monthValue: [],//最多24月
-      yearValue1: null,//最多10年
-      yearValue2: null,
-      energyTypeList: [],
-      objectList: [],
-      pickerOptions: {
-        disabledDate(date) {
-          return date.getTime() > Date.now()
-        }
-      },
-      pickerOptionsWeek: {
-        disabledDate(time) {
-          let day = Date.now()
-          let limitTime = moment(day).day(-1)
-          return time.getTime() > new Date(limitTime).getTime()
-        }
-      }
-    }
-  },
-  mounted() {
-    this.getTypeList()
-    this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
-  },
-  methods: {
-    getTypeList() {
-      getEnergyTypeListAll().then((res) => {
-        this.energyTypeList = res.data || []
-      })
-    },
-    // 范围选择器
-    timeSelect() {
-      switch (this.queryParams.timeDim) {
-        case '1':
-          if (this.timeValue[1] - this.timeValue[0] > 7*24*3600000) {
-            this.$modal.msgError('最大时间范围为7天，请重新选择')
-            this.timeValue = []
-          }
-          break
-        case '2':
-          if (this.dateValue[1] - this.dateValue[0] > 29*24*3600000) {
-            this.$modal.msgError('最大时间范围为30天，请重新选择') // 自动选择默认是0:00:00要求是23:59:59
-            this.dateValue = []
-          }
-          break
-        case '4':
-          if (this.monthValue[1] - this.monthValue[0] > 729*24*3600000) {
-            this.$modal.msgError('最大时间范围为24个月，请重新选择')// 同理上面
-            this.monthValue = []
-          }
-          break
-          default:
-      }
-    },
-    // 年选择器
-    startYear() {
-      if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
-        this.$modal.msgError('开始时间不能晚于结束时间，请重新选择')
-        this.yearValue1 = null
-        return false
-      }
-      if (this.yearValue1 && this.yearValue2) {
-        if (this.yearValue2 - this.yearValue1 > 10*365*24*3600000) {
-          this.$modal.msgError('最大时间范围为10年，请重新选择')
-          this.yearValue1 = null
-          return false
-        }
-      }
-    },
-    endYear() {
-      if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
-        this.$modal.msgError('结束时间不能早于开始时间，请重新选择')
-        this.yearValue2 = null
-        return false
-      }
-      if (this.yearValue1 && this.yearValue2) {
-        if (this.yearValue2 - this.yearValue1 > 10*365*24*3600000) {
-          this.$modal.msgError('最大时间范围为10年，请重新选择')
-          this.yearValue2 = null
-          return false
-        }
-      }
-    },
-    // 周选择器
-    startWeek() {
-      if (this.weekValue1 && this.weekValue2) {
-        let a = new Date(this.weekValue1).getTime()
-        let b = new Date(this.weekValue2).getTime()
-        if (a > b) {
-          this.$modal.msgError('开始时间不能晚于结束时间，请重新选择')
-          this.weekValue1 = null
-          return false
-        }
-        if (b - a > 167*24*3600000) {
-          this.$modal.msgError('最大时间范围为24周，请重新选择')
-          this.weekValue1 = null
-          return false
-        }
-      }
-    },
-    endWeek() {
-      if (this.weekValue1 && this.weekValue2) {
-        let a = new Date(this.weekValue1).getTime()
-        let b = new Date(this.weekValue2).getTime()
-        if (a > b) {
-          this.$modal.msgError('结束时间不能早于开始时间，请重新选择')
-          this.weekValue2 = null
-          return false
-        }
-        if (b - a > 167*24*3600000) {
-          this.$modal.msgError('最大时间范围为24周，请重新选择')
-          this.weekValue2 = null
-          return false
-        }
-      }
-    },
-    // 对象维度
-    selectObjs(val) {
-      console.log(val)
-      switch (val) {
-        case '1':
-          getLineAll().then(res => {
-            this.objectList = res.data || []
-            this.queryParams.objIds = []
-          })
-          break;
-        case '2':
-          getWorkShopAll().then(res => {
-            this.objectList = res.data || []
-            this.queryParams.objIds = []
-          })
-          break;
-        default:
-          getEquipmentAll().then(res => {
-            this.objectList = res.data || []
-            this.queryParams.objIds = []
-          })
-      }
-    },
-    // 查询
-    search() {
-      if (!this.queryParams.energyTypeId) {
-        this.$modal.msgError('请选择能源类型')
-        return false
-      }
-      if (!this.queryParams.timeDim) {
-        this.$modal.msgError('请选择时间维度')
-        return false
-      }
-      switch (this.queryParams.timeDim) {
-        case '1':
-          if (this.timeValue.length > 0) {
-            this.queryParams.startTime = this.timeValue[0]
-            this.queryParams.endTime = this.timeValue[1] // 不用转
-          } else {
-            this.$modal.msgError('时间范围不能为空')
-            return false
-          }
-          break
-        case '2':
-          if (this.dateValue.length > 0) {
-            this.queryParams.startTime = this.dateValue[0]
-            this.queryParams.endTime = this.dateValue[1] + 86399000 // 转为23:59:59
-          } else {
-            this.$modal.msgError('日范围不能为空')
-            return false
-          }
-          break
-        case '3':
-          if (this.weekValue1 && this.weekValue2) {
-            let a = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 00:00:00'
-            let b = moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 23:59:59'
-            this.queryParams.startTime = new Date(a).getTime()
-            this.queryParams.endTime = new Date(b).getTime()
-          } else {
-            this.$modal.msgError('周范围不能为空')
-            return false
-          }
-          break
-        case '4':// 转为本月最后一天的最后一秒
-          if (this.monthValue.length > 0) {
-            this.queryParams.startTime = this.monthValue[0]
-            this.queryParams.endTime = this.transformTime(this.monthValue[1])
-          } else {
-            this.$modal.msgError('月范围不能为空')
-            return false
-          }
-          break
-        default://本年最后一天
-          if (this.yearValue1 && this.yearValue2) {
-            if (this.yearValue2 < this.yearValue1) {
-              this.$modal.msgError('结束时间不能早于开始时间')
-              return false
-            } else {
-              this.queryParams.startTime = this.yearValue1
-              this.queryParams.endTime = this.transformYear(this.yearValue2)
-            }
-          } else {
-            this.$modal.msgError('年范围不能为空')
-            return false
-          }
-      }
-      if (!this.queryParams.objType) {
-        this.$modal.msgError('请选择对象维度')
-        return false
-      }
-      if (this.queryParams.objIds.length === 0) {
-        this.$modal.msgError('请选择对象')
-        return false
-      }
-      this.queryParams.startTime = this.queryParams.startTime + ''
-      this.queryParams.endTime = this.queryParams.endTime + ''
-      console.log(this.queryParams)
-      this.$emit('submit', this.queryParams)
-    },
-    transformTime(timeStamp) {// 本月最后一天
-      let year = moment(timeStamp).format('YYYY')
-      let month = moment(timeStamp).format('MM')
-      let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
-      let value = new Date(newData).getTime()
-      return value
-    },
-    transformYear(timeStamp) {// 本年最后一天
-      let year = moment(timeStamp).format('YYYY')
-      let newData = year+'-12-31 23:59:59'
-      let value = new Date(newData).getTime()
-      return value
-    },
-    switchMode() {// 展开和收起切换
-      this.isExpand = !this.isExpand
-      const element = this.$refs.searchBarRef
-      if (this.isExpand) {
-        element.classList.remove('divHeight')
-      } else {
-        element.classList.add('divHeight')
-      }
-    }
-  }
-}
-</script>
-<style lang='scss'>
-/* 时间整点 */
-.noneMinute .el-time-spinner__wrapper {
-  width: 100%;
-}
-.noneMinute .el-scrollbar:nth-of-type(2) {
-  display: none;
-}
-.demo-form-inline {
-  .el-date-editor .el-range__icon {
-    font-size: 16px;
-    color: #0B58FF;
-  }
-  .el-input__prefix .el-icon-date {
-    font-size: 16px;
-    color: #0B58FF;
-  }
-}
-</style>
-<style lang="scss" scoped>
-.demo-form-inline {
-  .blue-block {
-    display: inline-block;
-    width: 4px;
-    height: 16px;
-    background-color: #0B58FF;
-    border-radius: 1px;
-    margin-right: 8px;
-    margin-top: 12px;
-  }
-}
-.searchBarBox .foldClass {
-  position: absolute;
-  top: 14px;
-  right: 0;
-  cursor: pointer;
-  font-size: 12px;
-  color:#0B58FF;
-}
-.searchBarBox .foldClass .iconfont {
-  font-size: 14px;
-}
-.divHeight {
-  height: 45px;
-  overflow: hidden;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/energy/analysis/contrastAnalysis/index.vue b/src/views/energy/analysis/contrastAnalysis/index.vue
deleted file mode 100644
index 5c9f640c..00000000
--- a/src/views/energy/analysis/contrastAnalysis/index.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-  <div class="app-container contrastAnalysisBox" id="contrastAnalysisBox">
-    <!-- 搜索工作栏 -->
-    <search-area  :isFold="isFold" @submit="getList"/>
-		<div v-show="chartData.length">
-			<bar-chart
-				ref="analysisBarChart"
-				:chartData="chartData"
-				:timeDim="timeDim" />
-			<base-table
-				:table-props="tableProps"
-				:table-data="list"
-				:max-height="tableH"
-				class="contrast-out-table" />
-		</div>
-    <!-- 没有数据 -->
-    <div class="no-data-bg" v-show='!chartData.length'></div>
-  </div>
-</template>
-<script>
-import { getCompare } from "@/api/analysis/energyAnalysis"
-import SearchArea from "./components/searchArea"
-import BarChart from "./components/barChart"
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import FileSaver from 'file-saver';
-import * as XLSX from 'xlsx/xlsx.mjs';
-// import moment from 'moment'
-export default {
-  name: 'ContrastAnalysis',
-  components: { SearchArea, BarChart },
-	mixins: [tableHeightMixin],
-  data() {
-    return {
-      isFold: false,
-			chartData: [],
-			timeDim: '',
-			tableProps: [],
-			list: [],
-			tableH: this.tableHeight(250) / 2,
-    }
-  },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-      this.isFold = this.searchBarWidth('contrastAnalysisBox', 1310)
-      // console.log(document.getElementById("contrastAnalysisBox").offsetWidth)
-    })
-    this.isFold = this.searchBarWidth('contrastAnalysisBox', 1310)
-  },
-  methods: {
-		_setTableHeight() {
-			this.tableH = this.tableHeight(250) / 2;
-		},
-    getList(params) {
-      this.timeDim = params.timeDim
-      getCompare({ ...params }).then((res) => {
-				if (res.code === 0) {
-					this.getTableList(res.data || []);
-					this.chartData = res.data || [];
-        } else {
-          this.chartData = []
-        }
-      })
-    },
-		getTableList(arr) {
-			this.tableProps = [];
-			this.list = [];
-			let tempX = [];
-			let timeArr = arr[0].trendRespVOList || [];
-			this.list = timeArr.map((item) => {
-				return { time: item.time };
-			});
-			for (let i = 0; i < arr.length; i++) {
-				let obj = {};
-				obj.prop = arr[i].objId;
-				obj.label = arr[i].objName;
-				obj.minWidth = 100;
-				tempX.push(obj);
-				let tiemList = arr[i].trendRespVOList;
-				for (let j = 0; j < tiemList.length; j++) {
-					this.list[j][arr[i].objId] = tiemList[j].useNum
-						? tiemList[j].useNum.toFixed(2)
-						: null;
-				}
-			}
-			this.tableProps = [{ prop: 'time', label: '时间' }].concat(tempX);
-		},
-		// 导出
-		exportExl() {
-			if (this.list.length > 0) {
-				var wb = XLSX.utils.table_to_book(
-					document.querySelector('.contrast-out-table')
-				);
-				let fileName = '对比分析.xlsx';
-				var wbout = XLSX.write(wb, {
-					bookType: 'xlsx',
-					bookSST: true,
-					type: 'array',
-				});
-				try {
-					FileSaver.saveAs(
-						new Blob([wbout], { type: 'application/octet-stream' }),
-						fileName
-					);
-					this.$message.success('导出成功');
-				} catch (e) {
-					if (typeof console !== 'undefined') console.log(e, wbout);
-				}
-				return wbout;
-			} else {
-				this.$modal.msgWarning('暂无数据导出');
-			}
-		},
-  }
-}
-</script>
-<style lang='scss'>
-.contrastAnalysisBox {
-  .el-tabs__nav::after {
-    content: "";
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    height: 2px;
-    background-color: #e4e7ed;
-    /* z-index: 1; */
-  }
-  .el-tabs__nav-wrap::after {
-    width: 0;
-  }
-  .el-tabs__item {
-    padding: 0 10px;
-  }
-  .el-tabs__item:hover {
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .el-tabs__item.is-active {
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .el-tabs__item {
-    color: rgba(0, 0, 0, 0.45);
-  }
-}
-</style>
diff --git a/src/views/energy/analysis/qoqAnalysis/components/lineChart.vue b/src/views/energy/analysis/qoqAnalysis/components/lineChart.vue
deleted file mode 100644
index ec8e3d7c..00000000
--- a/src/views/energy/analysis/qoqAnalysis/components/lineChart.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <div 
-    id="analysischartLine"
-    style="width: 100%"
-    :style="{ height: chartHeight + 'px' }"
-  ></div>
-</template>
-<script>
-import * as echarts from 'echarts'
-import resize from '@/utils/chartMixins/resize'
-export default {
-  name: "LineChart",
-  mixins: [resize],
-  data() {
-    return {
-      chartDom: '',
-      chart: '',
-      chartHeight: this.tableHeight(370)
-    }
-  },
-  props: {
-    chartData: {
-      type: Array,
-      required: true,
-      default: () => {
-        return []
-      }
-    }
-  },
-  watch: {
-    chartData: function () {
-      this.getChart()
-    }
-  },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(370)
-    })
-  },
-  methods: {
-    getChart() {
-      if (
-        this.chart !== null &&
-        this.chart !== '' &&
-        this.chart !== undefined
-      ) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
-      }
-      this.chartDom = document.getElementById('analysischartLine')
-      this.chart = echarts.init(this.chartDom)
-      if (this.chartData.length === 0) {
-        return false
-      }
-      let arr = this.chartData[0].type // [水，电，煤]
-      let keys = Object.keys(this.chartData[0])
-      let yData = [
-        {
-          name: '本期',
-          type: 'bar',
-          data: [],
-          barWidth: 20,
-          label: {
-            show: true,
-            position: 'top'
-          }
-        },
-        {
-          name: '上期',
-          type: 'bar',
-          data: [],
-          barWidth: 20,
-          label: {
-            show: true,
-            position: 'top'
-          }
-        }
-      ]
-      for (let j = 0; j < arr.length; j++) {
-        for (let k = 0; k < keys.length; k++) {
-          if (keys[k].indexOf(arr[j]+'_上期') > -1) {
-            yData[1].data.push(this.chartData[0][keys[k]])
-          }
-          if (keys[k].indexOf(arr[j]+'_能源消耗') > -1) {
-            yData[0].data.push(this.chartData[0][keys[k]])
-          }
-        }
-      }
-      var option = {
-        color:['#288AFF','#8EF0AB'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow'
-          },
-          formatter: function(params) {
-            return (
-              params[0].axisValue + 
-              `<br>` +
-              params.map((item) => {
-                let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`
-                let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`
-						let value = item.value ? item.value : '-'
-						let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>`
-						return `<span style="display:flex; justify-content:space-between; margin-bottom: 2px">
-									<span>${str}${seriesNameStr}</span>
-									<span>${valueStr}</span>
-								</span>`
-              }).join(``)
-            )
-          }
-        },
-        legend: {
-          right: '1%',
-          icon: 'rect',
-          itemHeight: 8,
-          itemWidth: 8
-        },
-        grid: {
-          left: '1%',
-          right: '1%',
-          bottom: '3%',
-          containLabel: true
-        },
-        yAxis: {
-          type: 'value',
-          boundaryGap: [0, 0.01]
-        },
-        xAxis: {
-          type: 'category',
-          data: arr
-        },
-        series: yData
-      }
-      option && this.chart.setOption(option);
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/energy/analysis/qoqAnalysis/components/searchArea.vue b/src/views/energy/analysis/qoqAnalysis/components/searchArea.vue
deleted file mode 100644
index d98a27ba..00000000
--- a/src/views/energy/analysis/qoqAnalysis/components/searchArea.vue
+++ /dev/null
@@ -1,232 +0,0 @@
-<template>
-  <el-form :inline="true" class="demo-form-inline">
-    <span class="blue-block"></span>
-    <el-form-item label="对象选择">
-      <el-cascader
-        v-model="objArr"
-        :options="objList"
-        :props="{ checkStrictly: true, value: 'id', label: 'name' }"
-        popper-class="cascaderParent"
-        size="small"
-        style="width: 250px;"
-        clearable></el-cascader>
-    </el-form-item>
-    <el-form-item label="时间维度">
-      <el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small">
-        <el-option
-          v-for="item in timeType"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id"
-          :clearable="false">
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="时间">
-      <div v-show="queryParams.type === 1">
-        <el-date-picker
-          v-model="monthValue"
-          type="month"
-          :picker-options="pickerOptions"
-          @change="selectTime"
-          :clearable="false"
-          size="small"
-          placeholder="选择月">
-        </el-date-picker>
-      </div>
-      <div v-show="queryParams.type === 2">
-        <el-date-picker
-          v-model="weekValue"
-          type="week"
-          format="yyyy 第 WW 周"
-          :picker-options="pickerOptionsWeek"
-          @change="selectTime"
-          :clearable="false"
-          size="small"
-          placeholder="选择周">
-        </el-date-picker>
-      </div>
-      <div v-show="queryParams.type === 3">
-        <el-date-picker
-          v-model="dateValue"
-          type="date"
-          :picker-options="pickerOptions"
-          @change="selectTime"
-          :clearable="false"
-          size="small"
-          placeholder="选择日">
-        </el-date-picker>
-      </div>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="small" @click="search">查询</el-button>
-    </el-form-item>
-    <el-form-item>
-      <span class="separateStyle"></span>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="small" @click="exportData" plain>导出</el-button>
-    </el-form-item>
-  </el-form>
-</template>
-<script>
-import { getTree } from '@/api/base/factory'
-import moment from 'moment'
-export default {
-  name: 'searchArea',
-  data() {
-    return {
-      // 查询参数
-      queryParams: {
-        type: 1,
-        searchTime: null,
-        objId: null
-      },
-      timeType: [
-        {id: 1, name: '月'},
-        {id: 2, name: '周'},
-        {id: 3, name: '日'}
-      ],
-      monthValue: '',
-      weekValue: '',
-      dateValue: '',
-      objArr: [],
-      objList: [],
-      pickerOptions: {
-        disabledDate(date) {
-          return date.getTime() > Date.now()
-        }
-      },
-      pickerOptionsWeek: {
-        disabledDate(time) {
-          let day = Date.now()
-          let limitTime = moment(day).day(-1)
-          return time.getTime() > new Date(limitTime).getTime()
-        }
-      }
-    }
-  },
-  mounted() {
-    this.getObjTree()
-  },
-  methods: {
-    getObjTree() {
-      getTree().then(res => {
-        this.objList = res.data || []
-      })
-    },
-    selectTime() {
-      switch (this.queryParams.type) {
-        case 1:
-          this.queryParams.searchTime = this.monthValue
-          break;
-        case 2:
-          this.queryParams.searchTime = this.weekValue
-          break;
-        default:
-          this.queryParams.searchTime = this.dateValue
-      }
-    },
-    // 查询
-    search() {
-      if (!this.objArr.length === 0) {
-        this.$modal.msgError('请选择对象')
-        return false
-      } else {
-        this.queryParams.objId = this.objArr[this.objArr.length-1]
-      }
-      if (!this.queryParams.type) {
-        this.$modal.msgError('请选择时间维度')
-        return false
-      }
-      if (!this.queryParams.searchTime) {
-        this.$modal.msgError('请选择时间')
-        return false
-      }
-      switch (this.queryParams.type) {
-        case 1:
-          this.queryParams.searchTime = this.transformTime(this.monthValue)
-          break;
-        case 2:
-          let value = moment(this.weekValue).day(6).format('YYYY-MM-DD') + ' 23:59:59'
-          this.queryParams.searchTime = new Date(value).getTime()
-          break;
-        default:
-           let value2 = moment(this.dateValue).format('YYYY-MM-DD') + ' 23:59:59'
-           this.queryParams.searchTime = new Date(value2).getTime()
-      }
-      this.$emit('submit', this.queryParams)
-    },
-    exportData() {
-      let name
-      if (this.queryParams.objId) {
-        name = this.getObjName(this.objList, this.queryParams.objId)
-      } else {
-        this.$modal.msgWarning("对象不能为空")
-        return false
-      }
-      this.$emit('exportD', {name: name})
-    },
-    // 递归取对象name
-    getObjName(list, id) {
-      let _this = this
-      for (let i = 0; i < list.length; i++) {
-        let a = list[i]
-        if (a.id === id) {
-          return a.name
-        } else {
-          if (a.children && a.children.length > 0) {
-            let res = _this.getObjName(a.children, id)
-            if (res) {
-              return res
-            }
-          }
-        }
-      }
-    },
-    transformTime(timeStamp) {// 本月最后一天
-      let year = moment(timeStamp).format('YYYY')
-      let month = moment(timeStamp).format('MM')
-      let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
-      let value = new Date(newData).getTime()
-      return value
-    }
-  }
-}
-</script>
-<style lang='scss'>
-/* 级联选择器 */
-.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
-  display: none;
-}
-.demo-form-inline {
-  .el-date-editor .el-range__icon {
-    font-size: 16px;
-    color: #0B58FF;
-  }
-  .el-input__prefix .el-icon-date {
-    font-size: 16px;
-    color: #0B58FF;
-  }
-}
-</style>
-<style lang="scss" scoped>
-.separateStyle {
-  display: inline-block;
-  width: 1px;
-  height: 24px;
-  background: #E8E8E8;
-  vertical-align: middle;
-}
-.demo-form-inline {
-  .blue-block {
-    display: inline-block;
-    width: 4px;
-    height: 16px;
-    background-color: #0B58FF;
-    border-radius: 1px;
-    margin-right: 8px;
-    margin-top: 10px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/energy/analysis/qoqAnalysis/index.vue b/src/views/energy/analysis/qoqAnalysis/index.vue
deleted file mode 100644
index 6c2ac964..00000000
--- a/src/views/energy/analysis/qoqAnalysis/index.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 搜索工作栏 -->
-    <search-area @submit="getList" @exportD="exportData"/>
-    <!-- 表格 -->
-    <div v-show="chartData.length">
-      <base-table
-        :table-props="tableProps"
-        :table-data="list"
-        class="qoq-out-table"
-      />
-      <div class="chartTitle">环比分析图</div>
-      <div style='width: 100%'>
-        <line-chart ref="analysisLineChart" :chartData="chartData"/>
-      </div>
-    </div>
-    <!-- 没有数据 -->
-    <div class="no-data-bg" v-show='!chartData.length'></div>
-  </div>
-</template>
-<script>
-import { getQoq } from "@/api/analysis/energyAnalysis"
-import SearchArea from "./components/searchArea"
-import LineChart from "./components/lineChart"
-import FileSaver from "file-saver"
-import * as XLSX from 'xlsx/xlsx.mjs'
-export default {
-  name: 'QoqAnalysis',
-  components: { SearchArea, LineChart },
-  data() {
-    return {
-      chartData: [],
-      tableProps: [],
-      list: []
-    }
-  },
-  methods: {
-    getList(params) {
-      getQoq({ ...params }).then((res) => {
-        if (res.code === 0 && res.data) {
-          this.getTableList(res.data)
-        } else {
-          this.chartData = []
-          this.list = []
-        }
-      })
-    },
-    getTableList(arr) {
-      let data = arr.data
-      let nameData = arr.nameData
-      let tempX = []
-      data[0].data.map((item) => {
-        let obj = {}
-        obj.prop = item.dynamicName
-        obj.label = item.dynamicName
-        obj.id = item.id
-        obj.children = []
-        tempX.push(obj)
-      })
-      for (let i = 0; i < nameData.length; i++) {
-        for (let j = 0; j < tempX.length; j++) {
-          if (tempX[j].id === nameData[i].parentId) {
-            let obj = {}
-            obj.prop = tempX[j].prop + '_' + nameData[i].name
-            obj.label = nameData[i].name
-            tempX[j].children.push(obj)
-          }
-        }
-      }
-      this.tableProps = [{prop: 'time',label: '时间'}].concat(tempX)
-      // 数据
-      this.list = []
-      for (let k = 0; k < data.length; k++) {
-        let obj = {}
-        obj.time = data[k].time
-        let arr1 = data[k].data
-        obj.type = []
-        for (let q = 0; q < arr1.length; q++) {
-          let name = arr1[q].dynamicName
-          obj.type.push(name)
-          let arr2 = arr1[q].children
-          for (let p = 0; p < arr2.length; p++) {
-            let prop = name + '_' + arr2[p].dynamicName
-            obj[prop] = arr2[p].dynamicValue
-          }
-        }
-        this.list.push(obj)
-      }
-      this.chartData = this.list
-    },
-    exportData(val) {
-      if (this.list.length > 0) {
-        var wb = XLSX.utils.table_to_book(document.querySelector(".qoq-out-table"))
-        let fileName = val.name + "环比分析.xlsx"
-        var wbout = XLSX.write(wb, {
-            bookType: "xlsx",
-            bookSST: true,
-            type: "array"
-        })
-        try {
-            FileSaver.saveAs(
-            new Blob([wbout], { type: "application/octet-stream" }),
-            fileName
-            )
-        } catch (e) {
-            if (typeof console !== "undefined") console.log(e, wbout);
-        }
-        return wbout
-      } else {
-        this.$modal.msgWarning("暂无数据导出")
-      }
-    }
-  }
-}
-</script>
-<style lang='scss' scoped>
-.chartTitle {
-  font-size: 16px;
-  color: #000;
-  margin-top: 20px;
-}
-.chartTitle::before {
-  content: '';
-  display: inline-block;
-  width: 4px;
-  height: 18px;
-  background-color: #0B58FF;
-  border-radius: 1px;
-  margin-right: 8px;
-  vertical-align: bottom;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/energy/analysis/trendAnalysis/components/barChart.vue b/src/views/energy/analysis/trendAnalysis/components/barChart.vue
deleted file mode 100644
index 4b4e91b9..00000000
--- a/src/views/energy/analysis/trendAnalysis/components/barChart.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <div 
-    id="analysischartBar"
-    style="width: 100%"
-    :style="{ height: chartHeight + 'px' }"
-  ></div>
-</template>
-<script>
-import * as echarts from 'echarts'
-import resize from '@/utils/chartMixins/resize'
-export default {
-  name: "BarChart",
-  mixins: [resize],
-  data() {
-    return {
-      chartDom: '',
-      chart: '',
-      chartHeight: this.tableHeight(214) - 70
-    }
-  },
-  props: {
-    chartData: {
-      type: Array,
-      required: true,
-      default: () => {
-        return []
-      }
-    },
-    timeDim: {
-      type: String,
-      default: ''
-    }
-  },
-  watch: {
-    chartData: function () {
-      this.getChart()
-    }
-  },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(214) - 70
-    })
-  },
-  methods: {
-    getChart() {
-      if (
-        this.chart !== null &&
-        this.chart !== '' &&
-        this.chart !== undefined
-      ) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
-      }
-      this.chartDom = document.getElementById('analysischartBar')
-      this.chart = echarts.init(this.chartDom)
-      let xData = []
-      let yData = []
-      for (let i = 0; i < this.chartData.length; i++) {
-        let time = ""
-        if (this.timeDim === '3') {
-          let year = this.chartData[i].time.slice(0,4)
-          let weak = this.chartData[i].time.slice(4,6)
-          time = year+' 第 '+weak+' 周'
-        } else {
-          time = this.chartData[i].time
-        }
-        xData.push(time)
-        yData.push(this.chartData[i].useNum)
-      }
-      var option = {
-        color:['#288AFF'],
-        grid: {
-          left: '4%',
-          right: '1%',
-          bottom: '1%',
-          containLabel: true
-        },
-        xAxis: {
-          type: 'category',
-          data: xData,
-          axisLabel: {
-            rotate: "45"
-          }
-        },
-        yAxis: {
-          type: 'value'
-        },
-        series: [
-          {
-            data: yData,
-            type: 'bar',
-            barMaxWidth: 20,
-            label: {
-              show: true,
-              position: 'top'
-            }
-          }
-        ]
-      };
-
-      option && this.chart.setOption(option);
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/energy/analysis/trendAnalysis/components/lineChart.vue b/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
deleted file mode 100644
index 82c8c900..00000000
--- a/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <div 
-    id="analysischartLine"
-    style="width: 100%"
-    :style="{ height: chartHeight + 'px' }"
-  ></div>
-</template>
-<script>
-import * as echarts from 'echarts'
-import resize from '@/utils/chartMixins/resize'
-import moment from 'moment'
-export default {
-  name: "LineChart",
-  mixins: [resize],
-  data() {
-    return {
-      chartDom: '',
-      chart: '',
-      chartHeight: this.tableHeight(214) - 70
-    }
-  },
-  props: {
-    chartData: {
-      type: Array,
-      required: true,
-      default: () => {
-        return []
-      }
-    },
-    timeDim: {
-      type: String,
-      default: ''
-    }
-  },
-  watch: {
-    chartData: function () {
-      this.getChart()
-    }
-  },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(214) - 70
-    })
-  },
-  methods: {
-    getChart() {
-      if (
-        this.chart !== null &&
-        this.chart !== '' &&
-        this.chart !== undefined
-      ) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
-      }
-      this.chartDom = document.getElementById('analysischartLine')
-      this.chart = echarts.init(this.chartDom)
-      let xData = []
-      let yData = []
-      for (let i = 0; i < this.chartData.length; i++) {
-        let time = ""
-        if (this.timeDim === '3') {
-          let year = this.chartData[i].time.slice(0,4)
-          let weak = this.chartData[i].time.slice(4,6)
-          time = year+' 第 '+weak+' 周'
-        } else {
-          time = this.chartData[i].time
-        }
-        xData.push(time)
-        yData.push(this.chartData[i].useNum)
-      }
-
-      var option = {
-        color:['#288AFF'],
-        // tooltip: {
-        //   trigger: 'axis'
-        // },
-        grid: {
-          left: '4%',
-          right: '1%',
-          bottom: '1%',
-          containLabel: true
-        },
-        xAxis: {
-          type: 'category',
-          data: xData,
-          axisLabel: {
-            rotate: "45"
-          }
-        },
-        yAxis: {
-          type: 'value'
-        },
-        series: [
-          {
-            data: yData,
-            type: 'line'
-          }
-        ]
-      };
-
-      option && this.chart.setOption(option);
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue b/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
deleted file mode 100644
index 48e024a4..00000000
--- a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
+++ /dev/null
@@ -1,453 +0,0 @@
-<template>
-  <div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }">
-    <el-form :inline="true" class="demo-form-inline">
-      <span class="blue-block"></span>
-      <el-form-item label="能源类型">
-        <el-select v-model="queryParams.energyTypeId" placeholder="请选择" style="width: 100px;" size="small">
-          <el-option
-            v-for="item in energyTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="对象选择">
-        <el-cascader
-          v-model="objArr"
-          :options="objList"
-          :props="{ checkStrictly: true, value: 'id', label: 'name' }"
-          popper-class="cascaderParent"
-          size="small"
-          clearable></el-cascader>
-      </el-form-item>
-      <el-form-item label="时间维度">
-        <el-select v-model="queryParams.timeDim" placeholder="请选择" style="width: 80px;" size="small">
-          <el-option
-            v-for="item in getDictDatas(this.DICT_TYPE.TIME_DIM)"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-            size="small">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="时间范围">
-        <div v-show="queryParams.timeDim === '1'">
-          <el-date-picker
-            v-model="timeValue"
-            type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            format="yyyy-MM-dd HH:mm"
-            value-format="timestamp"
-            :picker-options="pickerOptions"
-            popper-class="noneMinute"
-            @change="timeSelect"
-            size="small"
-            style='width:350px;'
-            >
-          </el-date-picker>
-        </div>
-        <div v-show="queryParams.timeDim === '2'">
-          <el-date-picker
-            v-model="dateValue"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="timestamp"
-            :picker-options="pickerOptions"
-            @change="timeSelect"
-            size="small"
-            style='width:350px;'
-            >
-          </el-date-picker>
-        </div>
-        <div v-show="queryParams.timeDim === '3'">
-          <el-date-picker
-            v-model="weekValue1"
-            type="week"
-            format="yyyy 第 WW 周"
-            style='width:170px;'
-            :picker-options="pickerOptionsWeek"
-            @change="startWeek"
-            size="small"
-            placeholder="选择周">
-          </el-date-picker>-
-          <el-date-picker
-            v-model="weekValue2"
-            type="week"
-            format="yyyy 第 WW 周"
-            :picker-options="pickerOptionsWeek"
-            style='width:170px;'
-            @change="endWeek"
-            size="small"
-            placeholder="选择周">
-          </el-date-picker>
-        </div>
-        <div v-show="queryParams.timeDim === '4'">
-          <el-date-picker
-            v-model="monthValue"
-            type="monthrange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="timestamp"
-            :picker-options="pickerOptions"
-            size="small"
-            style='width:350px;'
-            @change="timeSelect"
-            >
-          </el-date-picker>
-        </div>
-        <div v-show="queryParams.timeDim === '5'">
-          <el-date-picker
-            style='width:170px;'
-            v-model="yearValue1"
-            type="year"
-            :picker-options="pickerOptions"
-            value-format="timestamp"
-            placeholder="选择年"
-            size="small"
-            @change="startYear"
-          >
-          </el-date-picker>-
-          <el-date-picker
-            style='width:170px;'
-            v-model="yearValue2"
-            type="year"
-            :picker-options="pickerOptions"
-            value-format="timestamp"
-            placeholder="选择年"
-            size="small"
-            @change="endYear"
-          >
-          </el-date-picker>
-        </div>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" size="small" @click="search('search')">查询</el-button>
-				<!-- <span
-					class="separateStyle"
-					v-hasPermi="['analysis:energy-analysis:query']"></span>
-				<el-button
-					v-hasPermi="['analysis:energy-analysis:query']"
-					type="primary"
-					size="small"
-					plain
-					@click="search('exportBtn')">
-					导出
-				</el-button> -->
-      </el-form-item>
-    </el-form>
-    <span v-if="isFold" class="foldClass" @click='switchMode'>
-      {{ isExpand ? '收起' : '展开' }}
-      <svg-icon :icon-class="isExpand ? 'upward' : 'downward'" />
-    </span>
-  </div>
-</template>
-<script>
-import { getEnergyTypeListAll } from "@/api/base/energyType"
-import { getTree } from '@/api/base/factory'
-import moment from 'moment'
-export default {
-  name: 'searchArea',
-  props: {
-    isFold: {// 多行模式（默认否）
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      isExpand: false, // 展开收起
-      // 查询参数
-      queryParams: {
-        energyTypeId: null,
-        objId: null,
-        timeDim: null,
-        startTime: null,
-        endTime: null
-      },
-      objArr: [],
-      timeValue: [],// 最大7天只能整点
-      dateValue: [],// 最大30天
-      weekValue1: null,//最多24周
-      weekValue2: null,
-      monthValue: [],//最多24月
-      yearValue1: null,//最多10年
-      yearValue2: null,
-      energyTypeList: [],
-      objList: [],
-      pickerOptions: {
-        disabledDate(date) {
-          return date.getTime() > Date.now()
-        }
-      },
-      pickerOptionsWeek: {
-        disabledDate(time) {
-          let day = Date.now()
-          let limitTime = moment(day).day(-1)
-          return time.getTime() > new Date(limitTime).getTime()
-        }
-      }
-    }
-  },
-  mounted() {
-    this.getTypeList()
-    this.getObjTree()
-    this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
-    this.timeValue = [moment().startOf('day'), moment().endOf('day')-59*61*1000]
-  },
-  methods: {
-    getTypeList() {
-      getEnergyTypeListAll().then((res) => {
-        this.energyTypeList = res.data || []
-      })
-    },
-    getObjTree() {
-      getTree().then(res => {
-        this.objList = res.data || []
-      })
-    },
-    // 范围选择器
-    timeSelect() {
-      switch (this.queryParams.timeDim) {
-        case '1':
-          if (this.timeValue[1] - this.timeValue[0] > 7*24*3600000) {
-            this.$modal.msgError('最大时间范围为7天，请重新选择')
-            this.timeValue = []
-          }
-          break
-        case '2':
-          if (this.dateValue[1] - this.dateValue[0] > 29*24*3600000) {
-            this.$modal.msgError('最大时间范围为30天，请重新选择') // 自动选择默认是0:00:00要求是23:59:59
-            this.dateValue = []
-          }
-          break
-        case '4':
-          if (this.monthValue[1] - this.monthValue[0] > 729*24*3600000) {
-            this.$modal.msgError('最大时间范围为24个月，请重新选择')// 同理上面
-            this.monthValue = []
-          }
-          break
-          default:
-      }
-    },
-    // 年选择器
-    startYear() {
-      if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
-        this.$modal.msgError('开始时间不能晚于结束时间，请重新选择')
-        this.yearValue1 = null
-        return false
-      }
-      if (this.yearValue1 && this.yearValue2) {
-        if (this.yearValue2 - this.yearValue1 > 10*365*24*3600000) {
-          this.$modal.msgError('最大时间范围为10年，请重新选择')
-          this.yearValue1 = null
-          return false
-        }
-      }
-    },
-    endYear() {
-      if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
-        this.$modal.msgError('结束时间不能早于开始时间，请重新选择')
-        this.yearValue2 = null
-        return false
-      }
-      if (this.yearValue1 && this.yearValue2) {
-        if (this.yearValue2 - this.yearValue1 > 10*365*24*3600000) {
-          this.$modal.msgError('最大时间范围为10年，请重新选择')
-          this.yearValue2 = null
-          return false
-        }
-      }
-    },
-    // 周选择器
-    startWeek() {
-      if (this.weekValue1 && this.weekValue2) {
-        let a = new Date(this.weekValue1).getTime()
-        let b = new Date(this.weekValue2).getTime()
-        if (a > b) {
-          this.$modal.msgError('开始时间不能晚于结束时间，请重新选择')
-          this.weekValue1 = null
-          return false
-        }
-        if (b - a > 167*24*3600000) {
-          this.$modal.msgError('最大时间范围为24周，请重新选择')
-          this.weekValue1 = null
-          return false
-        }
-      }
-    },
-    endWeek() {
-      if (this.weekValue1 && this.weekValue2) {
-        let a = new Date(this.weekValue1).getTime()
-        let b = new Date(this.weekValue2).getTime()
-        if (a > b) {
-          this.$modal.msgError('结束时间不能早于开始时间，请重新选择')
-          this.weekValue2 = null
-          return false
-        }
-        if (b - a > 167*24*3600000) {
-          this.$modal.msgError('最大时间范围为24周，请重新选择')
-          this.weekValue2 = null
-          return false
-        }
-      }
-    },
-    // 查询
-    search(val) {
-      if (!this.queryParams.energyTypeId) {
-        this.$modal.msgError('请选择能源类型')
-        return false
-      }
-      if (this.objArr.length === 0) {
-        this.$modal.msgError('请选择对象')
-        return false
-      } else {
-        this.queryParams.objId = this.objArr[this.objArr.length-1]
-      }
-      if (!this.queryParams.timeDim) {
-        this.$modal.msgError('请选择时间维度')
-        return false
-      }
-      switch (this.queryParams.timeDim) {
-        case '1':
-          if (this.timeValue.length > 0) {
-            this.queryParams.startTime = this.timeValue[0]
-            this.queryParams.endTime = this.timeValue[1] // 不用转
-          } else {
-            this.$modal.msgError('时间范围不能为空')
-            return false
-          }
-          break
-        case '2':
-          if (this.dateValue.length > 0) {
-            this.queryParams.startTime = this.dateValue[0]
-            this.queryParams.endTime = this.dateValue[1] + 86399000 // 转为23:59:59
-          } else {
-            this.$modal.msgError('日范围不能为空')
-            return false
-          }
-          break
-        case '3':
-          if (this.weekValue1 && this.weekValue2) {
-            let a = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 00:00:00'
-            let b = moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 23:59:59'
-            this.queryParams.startTime = new Date(a).getTime()
-            this.queryParams.endTime = new Date(b).getTime()
-          } else {
-            this.$modal.msgError('周范围不能为空')
-            return false
-          }
-          break
-        case '4':// 转为本月最后一天的最后一秒
-          if (this.monthValue.length > 0) {
-            this.queryParams.startTime = this.monthValue[0]
-            this.queryParams.endTime = this.transformTime(this.monthValue[1])
-          } else {
-            this.$modal.msgError('月范围不能为空')
-            return false
-          }
-          break
-        default://本年最后一天
-          if (this.yearValue1 && this.yearValue2) {
-            if (this.yearValue2 < this.yearValue1) {
-              this.$modal.msgError('结束时间不能早于开始时间')
-              return false
-            } else {
-              this.queryParams.startTime = this.yearValue1
-              this.queryParams.endTime = this.transformYear(this.yearValue2)
-            }
-          } else {
-            this.$modal.msgError('年范围不能为空')
-            return false
-          }
-      }
-      this.queryParams.startTime = this.queryParams.startTime + ''
-      this.queryParams.endTime = this.queryParams.endTime + ''
-			if (val === 'search') {
-				this.$emit('submit', this.queryParams);
-			} else {
-				this.$emit('export', this.queryParams);
-			}
-    },
-    transformTime(timeStamp) {// 本月最后一天
-      let year = moment(timeStamp).format('YYYY')
-      let month = moment(timeStamp).format('MM')
-      let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
-      let value = new Date(newData).getTime()
-      return value
-    },
-    transformYear(timeStamp) {// 本年最后一天
-      let year = moment(timeStamp).format('YYYY')
-      let newData = year+'-12-31 23:59:59'
-      let value = new Date(newData).getTime()
-      return value
-    },
-    switchMode() {// 展开和收起切换
-      this.isExpand = !this.isExpand
-      const element = this.$refs.searchBarRef
-      if (this.isExpand) {
-        element.classList.remove('divHeight')
-      } else {
-        element.classList.add('divHeight')
-      }
-    }
-  }
-}
-</script>
-<style lang='scss'>
-/* 级联选择器 */
-.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
-  display: none;
-}
-/* 时间整点 */
-.noneMinute .el-time-spinner__wrapper {
-  width: 100%;
-}
-.noneMinute .el-scrollbar:nth-of-type(2) {
-  display: none;
-}
-.demo-form-inline {
-  .el-date-editor .el-range__icon {
-    font-size: 16px;
-    color: #0B58FF;
-  }
-  .el-input__prefix .el-icon-date {
-    font-size: 16px;
-    color: #0B58FF;
-  }
-}
-</style>
-<style lang="scss" scoped>
-.demo-form-inline {
-  .blue-block {
-    display: inline-block;
-    width: 4px;
-    height: 16px;
-    background-color: #0B58FF;
-    border-radius: 1px;
-    margin-right: 8px;
-    margin-top: 12px;
-  }
-}
-.searchBarBox .foldClass {
-  position: absolute;
-  top: 14px;
-  right: 0;
-  cursor: pointer;
-  font-size: 12px;
-  color:#0B58FF;
-}
-.searchBarBox .foldClass .iconfont {
-  font-size: 14px;
-}
-.divHeight {
-  height: 45px;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/energy/analysis/trendAnalysis/index.vue b/src/views/energy/analysis/trendAnalysis/index.vue
deleted file mode 100644
index 09784e83..00000000
--- a/src/views/energy/analysis/trendAnalysis/index.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-03-27 15:49:55
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-15 15:47:17
- * @Description:
--->
-<template>
-  <div class="app-container trendAnalysisBox" id="trendAnalysisBox">
-    <!-- 搜索工作栏 -->
-    <search-area :isFold="isFold" @submit="getList" @export="exportExl"/>
-		<div v-show="chartData.length">
-			<base-table
-				:table-props="tableProps"
-				:table-data="list"
-				class="trend-out-table" />
-			<line-chart
-				ref="analysisLineChart"
-				:chartData="chartData"
-				:timeDim="timeDim" />
-		</div>
-    <!-- 没有数据 -->
-    <div class="no-data-bg" v-show='!chartData.length'></div>
-  </div>
-</template>
-<script>
-import { getEnergyTrend, exportTrend } from "@/api/analysis/energyAnalysis"
-import SearchArea from "./components/searchArea"
-import LineChart from "./components/lineChart"
-// import moment from 'moment'
-export default {
-  name: 'TrendAnalysis',
-  components: { SearchArea, LineChart },
-  data() {
-    return {
-      isFold: false,
-      chartData: [],
-			timeDim: '',
-			tableProps: [],
-			list: [],
-    }
-  },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-      this.isFold = this.searchBarWidth('trendAnalysisBox', 1146)
-    })
-    this.isFold = this.searchBarWidth('trendAnalysisBox', 1146)
-  },
-  methods: {
-    getList(params) {
-      this.timeDim = params.timeDim
-      getEnergyTrend({ ...params }).then((res) => {
-        if (res.code === 0) {
-					this.getTableList(res.data || []);
-					this.chartData = res.data || [];
-        } else {
-          this.chartData = []
-        }
-      })
-    },
-		getTableList(arr) {
-			this.tableProps = [];
-			this.list = [];
-			let tempX = [];
-			let listObj = { useNum: '消耗量' }; // 数据
-			for (let i = 0; i < arr.length; i++) {
-				let obj = {};
-				if (this.timeDim === '3') {
-					let fName = arr[i].time.slice(0, 4);
-					let lName = arr[i].time.slice(4, 6);
-					obj.label = fName + ' 第 ' + lName + ' 周';
-				} else {
-					obj.label = arr[i].time;
-				}
-				obj.prop = arr[i].time;
-				obj.minWidth = 100;
-				tempX.push(obj);
-				listObj[arr[i].time] = arr[i].useNum || null;
-			}
-			this.tableProps = [{ prop: 'useNum', label: '时间' }].concat(tempX);
-			this.list.push(listObj);
-		},
-		// 导出excel
-		exportExl(params) {
-			exportTrend({ ...params })
-				.then((response) => {
-					this.$download.excel(response, '走势分析.xls');
-					this.$message.success('导出成功');
-				})
-				.catch(() => {});
-		},
-  }
-}
-</script>
-<style lang='scss'>
-.trendAnalysisBox {
-	.trend-out-table {
-		margin-bottom: 15px;
-	}
-}
-</style>
diff --git a/src/views/energy/analysis/yoyAnalysis/components/lineChart.vue b/src/views/energy/analysis/yoyAnalysis/components/lineChart.vue
deleted file mode 100644
index b7e4f9a3..00000000
--- a/src/views/energy/analysis/yoyAnalysis/components/lineChart.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-  <div 
-    id="analysischartLine"
-    style="width: 100%;height: 100%;"
-  ></div>
-</template>
-<script>
-import * as echarts from 'echarts'
-import resize from '@/utils/chartMixins/resize'
-export default {
-  name: "LineChart",
-  mixins: [resize],
-  data() {
-    return {
-      chartDom: '',
-      chart: '',
-      chartHeight: this.tableHeight(214) - 70
-    }
-  },
-  props: {
-    chartData: {
-      type: Array,
-      required: true,
-      default: () => {
-        return []
-      }
-    }
-  },
-  watch: {
-    chartData: function () {
-      this.getChart()
-    }
-  },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(214) - 70
-    })
-  },
-  methods: {
-    getChart() {
-      if (
-        this.chart !== null &&
-        this.chart !== '' &&
-        this.chart !== undefined
-      ) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
-      }
-      this.chartDom = document.getElementById('analysischartLine')
-      this.chart = echarts.init(this.chartDom)
-      if (this.chartData.length === 0) {
-        return false
-      }
-      let xData = []
-      let arr = this.chartData[0].type
-      let keys = Object.keys(this.chartData[0])
-      let yData = []
-      for (let j = 0; j < arr.length; j++) {
-        for (let k = 0; k < keys.length; k++) {
-          if (keys[k].indexOf(arr[j]+'_上年同期') > -1 || keys[k].indexOf(arr[j]+'_能源消耗') > -1) {
-            let obj = {
-              name: '',
-              type: 'line',
-              stack: 'Total',
-              data: []
-            }
-            obj.name = keys[k]
-            yData.push(obj)
-          }
-        }
-      }
-      for (let i = 0; i < this.chartData.length; i++) {
-        xData.push(this.chartData[i].time)
-        for (let p = 0; p < yData.length; p++) {
-          yData[p].data.push(this.chartData[i][ yData[p].name])
-        }
-      }
-      var option = {
-        color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF','#FF6860','#FF9747','#B0EB42','#D680FF','#0043D2'],
-        legend: {
-          data: keys,
-          right:'1%'
-        },
-        tooltip: {
-          trigger: 'axis'
-        },
-        grid: {
-          left: '1%',
-          right: '1%',
-          bottom: '3%',
-          containLabel: true
-        },
-        xAxis: {
-          type: 'category',
-          data: xData
-        },
-        yAxis: {
-          type: 'value'
-        },
-        series: yData
-      };
-
-      option && this.chart.setOption(option);
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/energy/analysis/yoyAnalysis/components/searchArea.vue b/src/views/energy/analysis/yoyAnalysis/components/searchArea.vue
deleted file mode 100644
index 3b74bd70..00000000
--- a/src/views/energy/analysis/yoyAnalysis/components/searchArea.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<template>
-  <el-form :inline="true" class="demo-form-inline">
-    <span class="blue-block"></span>
-    <el-form-item label="对象选择">
-      <el-cascader
-        v-model="objArr"
-        :options="objList"
-        :props="{ checkStrictly: true, value: 'id', label: 'name' }"
-        popper-class="cascaderParent"
-        size="small"
-        clearable></el-cascader>
-    </el-form-item>
-    <el-form-item label="时间维度">
-      <el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small">
-        <el-option
-          v-for="item in timeType"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id"
-          :clearable="false">
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="时间">
-      <div v-show="queryParams.type === 1 || queryParams.type === 2">
-        <el-date-picker
-          v-model="yearValue"
-          type="year"
-          :picker-options="pickerOptions"
-          @change="selectTime"
-          :clearable="false"
-          size="small"
-          placeholder="选择年">
-        </el-date-picker>
-      </div>
-      <div v-show="queryParams.type === 3">
-        <el-date-picker
-          v-model="yearMonth"
-          type="month"
-          :picker-options="pickerOptions"
-          @change="selectTime"
-          :clearable="false"
-          size="small"
-          placeholder="选择月">
-        </el-date-picker>
-      </div>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="small" @click="search">查询</el-button>
-    </el-form-item>
-    <el-form-item>
-      <span class="separateStyle"></span>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="small" @click="exportData" plain>导出</el-button>
-    </el-form-item>
-  </el-form>
-</template>
-<script>
-import { getTree } from '@/api/base/factory'
-import moment from 'moment'
-export default {
-  name: 'searchArea',
-  data() {
-    return {
-      // 查询参数
-      queryParams: {
-        type: 1, // 1季度2月3日
-        searchTime: null,
-        objId: null
-      },
-      timeType: [
-        {id: 1, name: '季度'},
-        {id: 2, name: '月'},
-        {id: 3, name: '日'}
-      ],
-      yearValue: '',
-      yearMonth: '',
-      objArr: [],
-      objList: [],
-      pickerOptions: {
-        disabledDate(date) {
-          return date.getTime() > Date.now()
-        }
-      }
-    }
-  },
-  mounted() {
-    this.getObjTree()
-  },
-  methods: {
-    getObjTree() {
-      getTree().then(res => {
-        this.objList = res.data || []
-      })
-    },
-    selectTime() {
-      if (this.queryParams.type === 3) {
-        this.queryParams.searchTime = this.yearMonth
-      } else {
-        this.queryParams.searchTime = this.yearValue
-      }
-    },
-    // 查询
-    search() {
-      if (!this.objArr.length === 0) {
-        this.$modal.msgError('请选择对象')
-        return false
-      } else {
-        this.queryParams.objId = this.objArr[this.objArr.length-1]
-      }
-      if (!this.queryParams.type) {
-        this.$modal.msgError('请选择时间维度')
-        return false
-      }
-      if (!this.queryParams.searchTime) {
-        this.$modal.msgError('请选择时间')
-        return false
-      }
-      if (this.queryParams.type === 3) {
-        this.queryParams.searchTime = this.transformTime(this.yearMonth) + ''
-      } else {
-        this.queryParams.searchTime = this.transformYear(this.yearValue) + ''
-      }
-      this.$emit('submit', this.queryParams)
-    },
-    exportData() {
-      let name
-      if (this.queryParams.objId) {
-        name = this.getObjName(this.objList, this.queryParams.objId)
-      } else {
-        this.$modal.msgWarning("对象不能为空")
-        return false
-      }
-      this.$emit('exportD', {name: name})
-    },
-    // 递归取对象name
-    getObjName(list, id) {
-      let _this = this
-      for (let i = 0; i < list.length; i++) {
-        let a = list[i]
-        if (a.id === id) {
-          return a.name
-        } else {
-          if (a.children && a.children.length > 0) {
-            let res = _this.getObjName(a.children, id)
-            if (res) {
-              return res
-            }
-          }
-        }
-      }
-    },
-    transformTime(timeStamp) {// 本月最后一天
-      let year = moment(timeStamp).format('YYYY')
-      let month = moment(timeStamp).format('MM')
-      let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
-      let value = new Date(newData).getTime()
-      return value
-    },
-    transformYear(timeStamp) {// 本年最后一天
-      let year = moment(timeStamp).format('YYYY')
-      let newData = year+'-12-31 23:59:59'
-      let value = new Date(newData).getTime()
-      return value
-    }
-  }
-}
-</script>
-<style lang='scss'>
-/* 级联选择器 */
-.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
-  display: none;
-}
-.demo-form-inline {
-  .el-date-editor .el-range__icon {
-    font-size: 16px;
-    color: #0B58FF;
-  }
-  .el-input__prefix .el-icon-date {
-    font-size: 16px;
-    color: #0B58FF;
-  }
-}
-</style>
-<style lang="scss" scoped>
-.demo-form-inline {
-  .blue-block {
-    display: inline-block;
-    width: 4px;
-    height: 16px;
-    background-color: #0B58FF;
-    border-radius: 1px;
-    margin-right: 8px;
-    margin-top: 10px;
-  }
-}
-.separateStyle {
-  display: inline-block;
-  width: 1px;
-  height: 24px;
-  background: #E8E8E8;
-  vertical-align: middle;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/energy/analysis/yoyAnalysis/components/subRate.vue b/src/views/energy/analysis/yoyAnalysis/components/subRate.vue
deleted file mode 100644
index 9aef9955..00000000
--- a/src/views/energy/analysis/yoyAnalysis/components/subRate.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-  <div>
-    <svg-icon icon-class="upArrow" v-show='injectData[injectData.prop] > 0'/>
-    <svg-icon icon-class="downArrow"  v-show='injectData[injectData.prop] < 0'/>
-    <span style="margin-left: 5px;">{{ injectData[injectData.prop] }}</span>
-  </div>
-</template>
-<script>
-export default {
-  name: 'subRate',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/energy/analysis/yoyAnalysis/index.vue b/src/views/energy/analysis/yoyAnalysis/index.vue
deleted file mode 100644
index a9778b84..00000000
--- a/src/views/energy/analysis/yoyAnalysis/index.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 搜索工作栏 -->
-    <search-area @submit="getList" @exportD="exportData"/>
-    <div v-show='chartData.length'>
-      <div class="chartTitle">同比分析图</div>
-      <div style='width: 100%;height: 400px;'>
-        <line-chart ref="analysisLineChart" :chartData="chartData"/>
-      </div>
-      <!-- 表格 -->
-      <base-table
-        :table-props="tableProps"
-        :table-data="list"
-        :max-height="tableH"
-        class="yoy-out-table"
-      />
-    </div>
-    <!-- 没有数据 -->
-    <div class="no-data-bg" v-show='!chartData.length'></div>
-  </div>
-</template>
-<script>
-import { getYoy } from "@/api/analysis/energyAnalysis"
-import subRate from "./components/subRate.vue"
-import SearchArea from "./components/searchArea"
-import LineChart from "./components/lineChart"
-import FileSaver from "file-saver"
-import * as XLSX from 'xlsx/xlsx.mjs'
-export default {
-  name: 'YoyAnalysis',
-  components: { SearchArea, LineChart },
-  data() {
-    return {
-      chartData: [],
-      tableProps: [],
-      list: [],
-      tableH: this.tableHeight(640)
-    }
-  },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(640)
-    })
-  },
-  methods: {
-    getList(params) {
-      getYoy({ ...params }).then((res) => {
-        if (res.code === 0 && res.data) {
-          this.getTableList(res.data)
-        } else {
-          this.chartData = []
-          this.list = []
-        }
-      })
-    },
-    getTableList(arr) {
-      let data = arr.data
-      let nameData = arr.nameData
-      let tempX = []
-      data[0].data.map((item) => {
-        let obj = {}
-        obj.prop = item.dynamicName
-        obj.label = item.dynamicName
-        obj.id = item.id
-        obj.children = []
-        tempX.push(obj)
-      })
-      for (let i = 0; i < nameData.length; i++) {
-        for (let j = 0; j < tempX.length; j++) {
-          if (tempX[j].id === nameData[i].parentId) {
-            let obj = {}
-            obj.prop = tempX[j].prop + '_' + nameData[i].name
-            obj.label = nameData[i].name
-            if (obj.label.indexOf('同比')!= -1) {
-              obj.subcomponent = subRate
-            }
-            tempX[j].children.push(obj)
-          }
-        }
-      }
-      this.tableProps = [{prop: 'time',label: '时间'}].concat(tempX)
-      console.log(this.tableProps)
-      // 数据
-      this.list = []
-      for (let k = 0; k < data.length; k++) {
-        let obj = {}
-        obj.time = data[k].time
-        let arr1 = data[k].data
-        obj.type = []
-        for (let q = 0; q < arr1.length; q++) {
-          let name = arr1[q].dynamicName
-          obj.type.push(name)
-          let arr2 = arr1[q].children
-          for (let p = 0; p < arr2.length; p++) {
-            let prop = name + '_' + arr2[p].dynamicName
-            obj[prop] = arr2[p].dynamicValue
-          }
-        }
-        this.list.push(obj)
-      }
-      this.chartData = this.list
-    },
-    exportData(val) {
-      if (this.list.length > 0) {
-        var wb = XLSX.utils.table_to_book(document.querySelector(".yoy-out-table"))
-        let fileName = val.name + "同比分析.xlsx"
-        var wbout = XLSX.write(wb, {
-            bookType: "xlsx",
-            bookSST: true,
-            type: "array"
-        })
-        try {
-            FileSaver.saveAs(
-            new Blob([wbout], { type: "application/octet-stream" }),
-            fileName
-            )
-        } catch (e) {
-            if (typeof console !== "undefined") console.log(e, wbout);
-        }
-        return wbout
-      } else {
-        this.$modal.msgWarning("暂无数据导出")
-      }
-    }
-  }
-}
-</script>
-<style lang='scss' scoped>
-.chartTitle {
-  font-size: 16px;
-  color: #000;
-}
-.chartTitle::before {
-  content: '';
-  display: inline-block;
-  width: 4px;
-  height: 18px;
-  background-color: #0B58FF;
-  border-radius: 1px;
-  margin-right: 8px;
-  vertical-align: bottom;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/energy/base/energyPlc/components/energyPlcAdd.vue b/src/views/energy/base/energyPlc/components/energyPlcAdd.vue
deleted file mode 100644
index 043a881d..00000000
--- a/src/views/energy/base/energyPlc/components/energyPlcAdd.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="关联表名" prop="plcTableName">
-          <el-input v-model="form.plcTableName"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="关联表编码" prop="code">
-          <el-input v-model="form.code" disabled></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="标识名" prop="name">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="英文标识名" prop="enName">
-          <el-input v-model="form.enName"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form-item label="描述" prop="description">
-          <el-input v-model="form.description"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form-item label="是否采集" prop="collection">
-          <el-switch v-model="form.collection"></el-switch>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-<script>
-import { getEnergyPlc, updateEnergyPlc, createEnergyPlc, getCode } from '@/api/base/energyPlc'
-export default {
-  name: 'energyPlcAdd',
-  data() {
-    return {
-      form: {
-        id: '',
-        plcTableName: '',
-        code: '',
-        name: '',
-        enName: '',
-        description: '',
-        collection: true
-      },
-      isEdit: false, //是否是编辑
-      rules: {
-        plcTableName: [{ required: true, message: '关联表名不能为空', trigger: 'blur' }],
-        code: [{ required: true, message: '关联表编码不能为空', trigger: 'blur' }],
-        name: [{ required: true, message: '标识名称不能为空', trigger: 'blur' }]
-      }
-    }
-  },
-  methods: {
-    init(id) {
-      if (id) {
-        this.isEdit = true
-        this.form.id = id
-        getEnergyPlc( id ).then((res) => {
-          if (res.code === 0) {
-            this.form = res.data
-            this.form.collection = this.form.collection === 0 ? false : true
-          }
-        })
-      } else {
-        this.isEdit = false
-        this.form.id = ''
-        getCode().then((res) => {
-          this.form.code = res.data
-        })
-      }
-    },
-    submitForm() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.form.collection = this.form.collection === false ? 0 : 1
-          if (this.isEdit) {
-            // 编辑
-            updateEnergyPlc({...this.form}).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          } else {
-            createEnergyPlc({...this.form}).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    formClear() {
-      this.$refs.form.resetFields()
-      this.isEdit = false
-    }
-  }
-}
-</script>
diff --git a/src/views/energy/base/energyPlc/index.vue b/src/views/energy/base/energyPlc/index.vue
deleted file mode 100644
index 84629de4..00000000
--- a/src/views/energy/base/energyPlc/index.vue
+++ /dev/null
@@ -1,218 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
-    <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="80"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
-    <!-- 新增 -->
-    <base-dialog
-      :dialogTitle="addOrEditTitle"
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-    >
-      <energy-plc-add ref="energyPlc" @successSubmit="successSubmit" />
-    </base-dialog>
-  </div>
-</template>
-
-<script>
-import { getEnergyPlcPage, deleteEnergyPlc } from "@/api/base/energyPlc";
-// import { publicFormatter } from '@/utils/dict'
-import EnergyPlcAdd from './components/energyPlcAdd.vue'
-const tableProps = [
-  {
-    prop: 'plcTableName',
-    label: '关联表名'
-  },
-  {
-    prop: 'code',
-    label: '关联表编码',
-    minWidth: 150,
-    showOverflowtooltip: true
-  },
-  {
-    prop: 'name',
-    label: '标识名'
-  },
-  {
-    prop: 'enName',
-    label: '英文标识名'
-  },
-  {
-    prop: 'collection',
-    label: '是否采集'
-  },
-  {
-    prop: 'description',
-    label: '描述',
-    showOverflowtooltip: true
-  }
-]
-export default {
-  name: "EnergyPlc",
-  components: { EnergyPlcAdd },
-  data() {
-    return {
-      formConfig: [
-        {
-          type: 'input',
-          label: '标识名',
-          placeholder: '标识名',
-          param: 'name'
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: 'separate'
-        },
-        {
-          type: this.$auth.hasPermi('base:energy-plc:create') ? 'button' : '',
-          btnName: '新增',
-          name: 'add',
-          color: 'success',
-          plain: true
-        }
-      ],
-      tableProps,
-      tableBtn: [
-        this.$auth.hasPermi('base:energy-plc:update')
-          ? {
-              type: 'edit',
-              btnName: '编辑'
-            }
-          : undefined,
-        this.$auth.hasPermi('base:energy-plc:delete')
-          ? {
-              type: 'delete',
-              btnName: '删除'
-            }
-          : undefined
-      ].filter((v) => v),
-      tableH: this.tableHeight(260),
-      collectionList: [
-        {value: 0,label: '否'},
-        {value: 1,label: '是'}
-      ],
-      // 总条数
-      total: 0,
-      // 班次基础信息列表
-      list: [],
-      // 弹出层标题
-      addOrEditTitle: "",
-      // 是否显示弹出层
-      centervisible: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20,
-        name: null
-      }
-    };
-  },
-  created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
-    this.getList();
-  },
-  methods: {
-    buttonClick(val) {
-      switch (val.btnName) {
-        case 'search':
-          this.queryParams.pageNo = 1;
-          this.queryParams.name = val.name
-          this.getList()
-          break
-        default:
-          this.addOrEditTitle = '新增'
-          this.centervisible = true
-          this.$nextTick(() => {
-            this.$refs.energyPlc.init()
-          })
-      }
-    },
-    /** 查询列表 */
-    getList() {
-      getEnergyPlcPage(this.queryParams).then(response => {
-        let arr = response.data.list || [];
-        arr&&arr.map(item => {
-          this.collectionList.map(i => {
-            if (item.collection === i.value) {
-              item.collection = i.label
-            }
-          })
-        })
-        this.list = arr
-        this.total = response.data.total;
-      });
-    },
-    handleClick(val) {
-      switch (val.type) {
-        case 'edit':
-          this.addOrEditTitle = '编辑'
-          this.$nextTick(() => {
-            this.$refs.energyPlc.init(val.data.id)
-          })
-          this.centervisible = true
-          break
-        default:
-        this.handleDelete(val.data)
-      }
-    },
-    handleCancel() {
-      this.$refs.energyPlc.formClear()
-      this.centervisible = false
-      this.addOrEditTitle = ''
-    },
-    handleConfirm() {
-      this.$refs.energyPlc.submitForm()
-    },
-    successSubmit() {
-      this.handleCancel()
-      this.getList()
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除关联表名为"' + row.name + '"的数据项?').then(function() {
-          return deleteEnergyPlc(row.id);
-        }).then(() => {
-          this.queryParams.pageNo = 1;
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue b/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
deleted file mode 100644
index b4b28522..00000000
--- a/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
-    <el-form-item label="关联表名" prop="plcId">
-      <el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;">
-        <el-option
-          v-for="item in plcList"
-          :key="item.id"
-          :label="item.plcTableName"
-          :value="item.id">
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="对象" prop="bindObjectId">
-      <el-cascader
-        style='width: 100%;'
-        v-model="objIds"
-        :options="objList"
-        :props="{ checkStrictly: true, value: 'id', label: 'name' }"
-        @change="selectObj"
-        clearable></el-cascader>
-    </el-form-item>
-    <el-form-item label="对象备注" prop="remark">
-      <el-input v-model="form.remark"/>
-    </el-form-item>
-  </el-form>
-</template>
-<script>
-import { getEnergyPlcConnect, updateEnergyPlcConnect, createEnergyPlcConnect } from '@/api/base/energyPlcConnect'
-import { getEnergyPlcAll } from '@/api/base/energyPlc'
-export default {
-  name: 'EnergyPlcConnectAdd',
-  props: {
-    objList: {
-      type: Array,
-      default: () => []
-    },
-  },
-  data() {
-    return {
-      form: {
-        id: '',
-        plcId: '',
-        bindObjectId: '',
-        bindObjectType: '',
-        remark: ''
-      },
-      objIds: [],// 回显数组
-      plcList: [],
-      isEdit: false, //是否是编辑
-      rules: {
-        plcId: [{ required: true, message: '关联表名不能为空', trigger: 'change' }],
-        bindObjectId: [{ required: true, message: '对象不能为空', trigger: 'change' }]
-      }
-    }
-  },
-  methods: {
-    init(id) {
-      getEnergyPlcAll().then((res) => {
-        this.plcList = res.data || []
-      })
-      if (id) {
-        this.isEdit = true
-        this.form.id = id
-        getEnergyPlcConnect( id ).then((res) => {
-          if (res.code === 0) {
-            this.form = res.data
-            this.objIds = this.changeDetSelect(this.form.bindObjectId, this.objList)
-          }
-        })
-      } else {
-        this.isEdit = false
-        this.form.id = ''
-      }
-    },
-    // 递归处理分类回显问题
-    changeDetSelect(key, treeData) {
-      let arr = [] // 递归时操作的数组
-      let returnArr = [] // 存放结果的数组
-      let depth = 0 // 定义全局层级
-      // 定义递归函数
-      function childrenEach(childrendData, depthN) {
-        for (var j = 0; j < childrendData.length; j++) {
-          depth = depthN
-          arr[depthN] = childrendData[j].id
-          if (childrendData[j].id == key) {
-            returnArr = arr.slice(0, depthN + 1)
-            break
-          } else {
-            if (childrendData[j].children) {
-              depth++
-              childrenEach(childrendData[j].children, depth)
-            }
-          }
-        }
-        return returnArr
-      }
-      return childrenEach(treeData, depth)
-    },
-    selectObj(val) {
-      this.form.bindObjectId = val[val.length-1]
-      this.form.bindObjectType = val.length-1
-    },
-    submitForm() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          if (this.isEdit) {
-            // 编辑
-            updateEnergyPlcConnect({...this.form}).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          } else {
-            createEnergyPlcConnect({...this.form}).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    formClear() {
-      this.form.id = ''
-      this.form.plcId = ''
-      this.form.bindObjectId = ''
-      this.form.bindObjectType = ''
-      this.form.remark = ''
-      this.objIds = []
-      this.isEdit = false
-    }
-  }
-}
-</script>
-<style>
-.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
-  display: none;
-}
-</style>
diff --git a/src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue b/src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue
deleted file mode 100644
index ab1dd648..00000000
--- a/src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
-  <div>
-    <el-drawer title="参数绑定" :visible.sync="visible" size="70%" @close='closeD'>
-      <div class="box">
-        <el-form :inline="true">
-          <el-form-item label="关联表名">
-            <el-input v-model="plcTableName" size='small' readonly></el-input>
-          </el-form-item>
-          <el-form-item label="对象">
-            <el-input v-model="objName" size='small' readonly></el-input>
-          </el-form-item>
-          <el-form-item v-if="showBtn">
-            <el-button type="success" size='small' plain @click="addNew">新增</el-button>
-          </el-form-item>
-        </el-form>
-        <base-table
-          :page="queryParams.pageNo"
-          :limit="queryParams.pageSize"
-          :table-props="tableProps"
-          :table-data="tableData"
-          :max-height="tableH"
-        >
-          <method-btn
-            v-if="tableBtn.length"
-            slot="handleBtn"
-            :width="100"
-            label="操作"
-            :method-list="tableBtn"
-            @clickBtn="handleClick"
-          />
-        </base-table>
-        <pagination
-          :page.sync="queryParams.pageNo"
-          :limit.sync="queryParams.pageSize"
-          :total="total"
-          @pagination="getList"
-        />
-      </div>
-    </el-drawer>
-    <!-- 新增 -->
-    <base-dialog
-      :dialogTitle="addOrEditTitle"
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-    >
-      <energy-plc-param-add ref="energyPlcParam" @successSubmit="successSubmit" />
-    </base-dialog>
-  </div>
-</template>
-<script>
-import { getEnergyPlcParamPage, deleteEnergyPlcParam } from '@/api/base/energyPlcParam'
-import EnergyPlcParamAdd from './energyPlcParamAdd'
-import { publicFormatter } from '@/utils/dict'
-const tableProps = [
-  {
-    prop: 'typeId',
-    label: '能源类型'
-  },
-  {
-    prop: 'plcParamName',
-    label: '参数列名'
-  },
-  {
-    prop: 'name',
-    label: '参数名称'
-  },
-  {
-    prop: 'unit',
-    label: '单位',
-    filter: publicFormatter('energy_unit')
-  },
-  {
-    prop: 'collection',
-    label: '是否采集'
-  },
-  {
-    prop: 'description',
-    label: '描述'
-  }
-]
-export default {
-  name: 'EnergyPlcParam',
-  props: {
-    energyTypeList: {
-      type: Array,
-      required: true,
-      default: () => {
-        return []
-      }
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      tableProps,
-      tableData: [],
-      tableBtn: [],
-      tableH: this.tableHeight(115),
-      total: 0,
-      queryParams: {
-        pageNo: 1,
-        pageSize: 30,
-        connectId: null
-      },
-      plcTableName: '',
-      objName: '',
-      // 弹出层标题
-      addOrEditTitle: "",
-      // 是否显示弹出层
-      centervisible: false,
-      collectionList: [
-        {value: 0,label: '否'},
-        {value: 1,label: '是'}
-      ],
-      showBtn: true
-    }
-  },
-  components: { EnergyPlcParamAdd },
-  created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(115)
-    })
-  },
-  methods: {
-    init(data,title) {
-      this.visible = true
-      this.queryParams.connectId = data.id
-      this.plcTableName = data.plcTableName
-      this.objName = data.objName
-      this.getList()
-      if (title === 'detail') {
-        this.showBtn = false
-        this.tableBtn = []
-      } else {
-        this.showBtn = true
-        this.tableBtn = [
-          {
-            type: 'edit',
-            btnName: '编辑'
-          },
-          {
-            type: 'delete',
-            btnName: '删除'
-          }
-        ]
-      }
-    },
-    getList() {
-      getEnergyPlcParamPage({...this.queryParams}).then((res) => {
-        let arr = res.data.list || []
-        arr&&arr.map(item => {
-          this.collectionList.map(i => {
-            if (item.collection === i.value) {
-              item.collection = i.label
-            }
-          })
-          this.energyTypeList.map(j => {
-            if (item.typeId === j.id) {
-              item.typeId = j.name
-            }
-          })
-        })
-        this.tableData = arr
-        this.total = res.data.total;
-      })
-    },
-    // 新增
-    addNew() {
-      this.addOrEditTitle = '新增'
-      this.centervisible = true
-      this.$nextTick(() => {
-        this.$refs.energyPlcParam.init({'connectId': this.queryParams.connectId, id: ''})
-      })
-    },
-    handleCancel() {
-      this.$refs.energyPlcParam.formClear()
-      this.centervisible = false
-      this.addOrEditTitle = ''
-    },
-    handleConfirm() {
-      this.$refs.energyPlcParam.submitForm()
-    },
-    successSubmit() {
-      this.handleCancel()
-      this.getList()
-    },
-    handleClick(val) {
-      console.log(val)
-      switch (val.type) {
-        case 'edit':
-          this.addOrEditTitle = '编辑'
-          this.centervisible = true
-          this.$nextTick(() => {
-            this.$refs.energyPlcParam.init({'connectId': this.queryParams.connectId, id: val.data.id})
-          })
-          break
-        default:
-          this.handleDelete(val.data)
-      }
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除参数列名为"' + row.plcParamName + '"的数据项?').then(function() {
-          return deleteEnergyPlcParam(row.id);
-        }).then(() => {
-          this.queryParams.pageNo = 1;
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    closeD() {
-      this.$emit('closeDrawer')
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.box {
-  padding: 0 32px;
-}
-</style>
diff --git a/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue b/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
deleted file mode 100644
index 428b165e..00000000
--- a/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="能源类型" prop="typeId">
-          <el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;">
-            <el-option
-              v-for="item in energyListType"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="参数列名" prop="plcParamName">
-          <el-input v-model="form.plcParamName"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="参数名称" prop="name">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="单位" prop="unit">
-          <el-select v-model="form.unit" placeholder="请选择" style="width: 100%;">
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.ENERGY_UNIT)"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form-item label="是否采集" prop="collection">
-          <el-switch v-model="form.collection"></el-switch>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form-item label="描述" prop="description">
-          <el-input v-model="form.description"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-<script>
-import { getEnergyPlcParam, updateEnergyPlcParam, createEnergyPlcParam } from '@/api/base/energyPlcParam'
-import { getEnergyTypeListAll } from '@/api/base/energyType'
-export default {
-  name: 'EnergyPlcParamAdd',
-  data() {
-    return {
-      form: {
-        id: '',
-        typeId: '',
-        plcParamName: '',
-        name: '',
-        unit: '',
-        description: '',
-        collection: true,
-        connectId: ''
-      },
-      energyListType: [],
-      isEdit: false, //是否是编辑
-      rules: {
-        typeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
-        plcParamName: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
-        name: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }]
-      }
-    }
-  },
-  methods: {
-    init(param) {
-      this.form.connectId = param.connectId
-      getEnergyTypeListAll().then((res) => {
-        this.energyListType = res.data || []
-      })
-      if (param.id) {
-        this.isEdit = true
-        this.form.id = param.id
-        getEnergyPlcParam(this.form.id).then((res) => {
-          if (res.code === 0) {
-            this.form = res.data
-            this.form.collection = this.form.collection === 0 ? false : true
-          }
-        })
-      } else {
-        this.isEdit = false
-        this.form.id = ''
-      }
-    },
-    submitForm() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.form.collection = this.form.collection === false ? 0 : 1
-          if (this.isEdit) {
-            // 编辑
-            updateEnergyPlcParam({...this.form}).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          } else {
-            createEnergyPlcParam({...this.form}).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    formClear() {
-      this.$refs.form.resetFields()
-      this.isEdit = false
-    }
-  }
-}
-</script>
diff --git a/src/views/energy/base/energyPlcConnect/index.vue b/src/views/energy/base/energyPlcConnect/index.vue
deleted file mode 100644
index 925da5ac..00000000
--- a/src/views/energy/base/energyPlcConnect/index.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
-    <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="160"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
-    <!-- 新增 -->
-    <base-dialog
-      :dialogTitle="addOrEditTitle"
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-    >
-      <energy-plc-connect-add ref="energyPlcConnect" :objList="objList" @successSubmit="successSubmit" />
-    </base-dialog>
-    <!-- 参数绑定/查看 -->
-    <energy-plc-param v-if="paramVisible" ref="plcParam" @closeDrawer="closeDrawer" :energyTypeList="energyTypeList"></energy-plc-param>
-  </div>
-</template>
-
-<script>
-import { getEnergyPlcConnectPage, deleteEnergyPlcConnect } from "@/api/base/energyPlcConnect";
-// import { publicFormatter } from '@/utils/dict'
-import { getTree } from '@/api/base/factory'
-import { getEnergyTypeListAll } from '@/api/base/energyType'
-import EnergyPlcConnectAdd from './components/energyPlcConnectAdd'
-import EnergyPlcParam from './components/energyPlcParam'
-const tableProps = [
-  {
-    prop: 'objName',
-    label: '对象'
-  },
-  {
-    prop: 'objCode',
-    label: '对象编码'
-  },
-  {
-    prop: 'remark',
-    label: '对象备注'
-  },
-  {
-    prop: 'plcTableName',
-    label: '关联表名'
-  },
-  {
-    prop: 'plcTableCode',
-    label: '关联表编码'
-  },
-  {
-    prop: 'cnName',
-    label: '标识名'
-  },
-  {
-    prop: 'varNum',
-    label: '绑定参数数量'
-  }
-]
-export default {
-  name: "EnergyPlcConnect",
-  components: { EnergyPlcConnectAdd, EnergyPlcParam },
-  data() {
-    return {
-      formConfig: [
-        {
-          type: 'input',
-          label: '标识名',
-          placeholder: '标识名',
-          param: 'cnName'
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: 'separate'
-        },
-        {
-          type: this.$auth.hasPermi('base:energy-plc-connect:create') ? 'button' : '',
-          btnName: '新增',
-          name: 'add',
-          color: 'success',
-          plain: true
-        }
-      ],
-      tableProps,
-      tableBtn: [
-        this.$auth.hasPermi('base:energy-plc-connect:bind')
-          ? {
-              type: 'connect',
-              btnName: '绑定'
-            }
-          : undefined,
-        {
-          type: 'detail',
-          btnName: '详情'
-        },
-        this.$auth.hasPermi('base:energy-plc-connect:update')
-          ? {
-              type: 'edit',
-              btnName: '编辑'
-            }
-          : undefined,
-        this.$auth.hasPermi('base:energy-plc-connect:delete')
-          ? {
-              type: 'delete',
-              btnName: '删除'
-            }
-          : undefined
-      ].filter((v) => v),
-      tableH: this.tableHeight(260),
-      // 总条数
-      total: 0,
-      // 班次基础信息列表
-      list: [],
-      // 弹出层标题
-      addOrEditTitle: "",
-      // 是否显示弹出层
-      centervisible: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20,
-        cnName: null
-      },
-      paramVisible: false,
-      energyTypeList: [],
-      objList: []
-    };
-  },
-  created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
-    this.getList();
-  },
-  mounted() {
-    // 获取能源列表
-    this.getEnergyTypeList()
-    // 获取对象树形结构
-    this.getObjTree()
-  },
-  methods: {
-    buttonClick(val) {
-      switch (val.btnName) {
-        case 'search':
-          this.queryParams.pageNo = 1;
-          this.queryParams.cnName = val.cnName
-          this.getList()
-          break
-        default:
-          this.addOrEditTitle = '新增'
-          this.centervisible = true
-          this.$nextTick(() => {
-            this.$refs.energyPlcConnect.init()
-          })
-      }
-    },
-    /** 查询列表 */
-    getList() {
-      getEnergyPlcConnectPage(this.queryParams).then(response => {
-        let arr = response.data.list || [];
-        this.list = arr
-        this.total = response.data.total;
-      });
-    },
-    handleClick(val) {
-      switch (val.type) {
-        case 'edit':
-          this.addOrEditTitle = '编辑'
-          this.$nextTick(() => {
-            this.$refs.energyPlcConnect.init(val.data.id)
-          })
-          this.centervisible = true
-          break
-        case 'delete':
-          this.handleDelete(val.data)
-          break
-        case 'detail':
-          this.paramVisible = true
-          this.$nextTick(() => {
-            this.$refs.plcParam.init(val.data, 'detail')
-          })
-          break
-        default:
-          this.paramVisible = true
-          this.$nextTick(() => {
-            this.$refs.plcParam.init(val.data, 'connect')
-          })
-      }
-    },
-    handleCancel() {
-      this.$refs.energyPlcConnect.formClear()
-      this.centervisible = false
-      this.addOrEditTitle = ''
-    },
-    handleConfirm() {
-      this.$refs.energyPlcConnect.submitForm()
-    },
-    successSubmit() {
-      this.handleCancel()
-      this.getList()
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除对象为"' + row.objName + '"的数据项?').then(function() {
-          return deleteEnergyPlcConnect(row.id);
-        }).then(() => {
-          this.queryParams.pageNo = 1;
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    closeDrawer() {
-      this.getList()
-    },
-    getEnergyTypeList() {
-      getEnergyTypeListAll().then((res) => {
-        this.energyTypeList = res.data || []
-      })
-    },
-    getObjTree() {
-      getTree().then(res => {
-        this.objList = res.data || []
-      })
-    }
-  }
-};
-</script>
diff --git a/src/views/energy/base/energyQuantityManual/components/AddTable.vue b/src/views/energy/base/energyQuantityManual/components/AddTable.vue
deleted file mode 100644
index 2e31aa78..00000000
--- a/src/views/energy/base/energyQuantityManual/components/AddTable.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-	<div class="energyQuantityManualAddTable">
-		<el-table
-			:data="renderData"
-			border
-			style="width: 100%"
-			:header-cell-style="{
-				background: '#F2F4F9',
-				color: '#606266',
-			}">
-			<el-table-column prop="meter" label="表名*">
-				<template slot-scope="scope">
-					<div class="tableInner">
-						<el-select
-							v-model="scope.row.meter"
-							placeholder="请选择"
-							style="width: 100%"
-							:disabled="isEdit"
-							@change="changeSelect(scope.row, 'meter')">
-							<el-option
-								v-for="item in tableNameList"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value"></el-option>
-						</el-select>
-					</div>
-				</template>
-			</el-table-column>
-			<el-table-column prop="readingQuantity" label="抄表数*">
-				<template slot-scope="scope">
-					<div class="tableInner">
-						<el-input-number
-							v-model="scope.row.readingQuantity"
-							:min="0"
-							:max="999999999"
-							style="width: 100%"
-							:controls="false"
-							@change="changeInput(scope.row, 'readingQuantity')"
-							:precision="2"></el-input-number>
-					</div>
-				</template>
-			</el-table-column>
-		</el-table>
-		<el-button
-			v-show="!isEdit"
-			class="addButton"
-			icon="el-icon-plus"
-			@click="emitButtonClick">
-			新增
-		</el-button>
-	</div>
-</template>
-<script>
-export default {
-	name: 'AddTable',
-	props: {
-		tableData: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-		tableNameList: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-		isEdit: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	data() {
-		return {};
-	},
-	computed: {
-		renderData() {
-			return this.tableData.map((item, index) => {
-				return {
-					...item,
-					_pageIndex: index + 1,
-				};
-			});
-		},
-	},
-	methods: {
-		emitButtonClick() {
-			this.$emit('emitButtonClick');
-		},
-		changeInput(val1, val2) {
-			val1.prop = val2;
-			this.$emit('emitFun', val1);
-		},
-		changeSelect(val1, val2) {
-			val1.prop = val2;
-			this.$emit('emitFun', val1);
-		},
-	},
-};
-</script>
-<style lang="scss" scoped>
-.energyQuantityManualAddTable {
-	.el-table .el-table__cell {
-		padding: 0;
-		height: 35px;
-	}
-	.addButton {
-		width: 100%;
-		height: 35px;
-		border-top: none;
-		color: #0b58ff;
-		border-color: #ebeef5;
-		border-radius: 0;
-	}
-	.addButton:hover {
-		color: #0b58ff;
-		border-color: #ebeef5;
-		background-color: #fff;
-	}
-	.addButton:focus {
-		border-color: #ebeef5;
-		background-color: #fff;
-	}
-	.tableInner .el-input__inner {
-		border: none;
-		padding: 0;
-		height: 33px;
-	}
-}
-</style>
-<style lang="scss">
-.energyQuantityManualAddTable {
-	.el-table .el-table__cell {
-		padding: 0;
-		height: 35px;
-	}
-}
-</style>
diff --git a/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
deleted file mode 100644
index 614dd10b..00000000
--- a/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-	<el-form
-		ref="energyQuantityManualForm"
-		:rules="rules"
-		label-width="90px"
-		:model="form">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="能源类型" prop="energyTypeId">
-					<el-select
-						v-model="form.energyTypeId"
-						placeholder="请选择"
-						style="width: 100%"
-						@change="selEnergyType"
-						:disabled="isEdit"
-						filterable>
-						<el-option
-							v-for="item in this.energyTypeList"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="抄表日期" prop="recordTime">
-					<el-date-picker
-						v-model="form.recordTime"
-						type="date"
-						format="yyyy-MM-dd"
-						value-format="timestamp"
-						placeholder="选择日期"
-						style="width: 100%"></el-date-picker>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="24">
-				<add-table
-					:table-data="tableData"
-					:table-name-list="tableNameList"
-					:isEdit="isEdit"
-					@emitFun="inputChange"
-					@emitButtonClick="emitButtonClick" />
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-<script>
-import {
-	energyQuantityManualCreate,
-	energyQuantityManualUpdate,
-	energyQuantityManualGet,
-} from '@/api/base/energyQuantityManual';
-import moment from 'moment';
-import AddTable from './AddTable';
-import { energyTableGet } from '@/api/base/energyQuantityManual';
-export default {
-	name: 'EnergyQuantityManualAdd',
-	props: {
-		energyTypeList: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-	},
-	data() {
-		return {
-			tableData: [],
-			tableNameList: [], //表名list
-			addButtonShow: '新增',
-			form: {
-				id: '',
-				energyTypeId: '',
-				unit: '',
-				recordTime: '',
-			},
-			rules: {
-				energyTypeId: [
-					{ required: true, message: '能源类型不能为空', trigger: 'change' },
-				],
-				recordTime: [
-					{ required: true, message: '抄表日期不能为空', trigger: 'change' },
-				],
-			},
-			isEdit: false,
-			meterArr: [],
-		};
-	},
-	components: { AddTable },
-	methods: {
-		init(params) {
-			this.form.recordTime = moment().valueOf();
-			this.meterArr = this.getDictDatas('meter');
-			if (params.type === 'add') {
-				this.isEdit = false;
-			} else if (params.type === 'meterReading') {
-				this.isEdit = false;
-				this.form.energyTypeId = params.energyTypeId;
-				this.selEnergyType(this.form.energyTypeId);
-				let obj = {};
-				obj.meter = params.meter + '';
-				obj.readingQuantity = 0;
-				this.tableData.push(obj);
-			} else {
-				this.isEdit = true;
-				this.form.id = params.id;
-				this.addButtonShow = '';
-				energyQuantityManualGet({ id: this.form.id }).then((res) => {
-					if (res.code === 0) {
-						this.form.energyTypeId = res.data.energyTypeId;
-						this.selEnergyType(this.form.energyTypeId);
-						this.form.recordTime = res.data.recordTime
-							? res.data.recordTime
-							: null;
-						let obj = {};
-						obj.meter = res.data.meter ? res.data.meter + '' : '';
-						obj.readingQuantity = res.data.readingQuantity;
-						this.tableData.push(obj);
-					}
-				});
-			}
-		},
-		inputChange(val) {
-			this.tableData[val._pageIndex - 1][val.prop] = val[val.prop];
-		},
-		emitButtonClick() {
-			if (!this.form.energyTypeId) {
-				this.$modal.msgWarning('请先选择能源类型');
-				return false;
-			}
-			let obj = {};
-			obj.meter = '';
-			obj.readingQuantity = 0;
-			this.tableData.push(obj);
-		},
-		selEnergyType(id) {
-			// 切换能源类型
-			this.tableData = [];
-			this.tableNameList = [];
-			energyTableGet({ energyTypeId: id }).then((res) => {
-				if (res.data.length === 0) {
-					this.$modal.msgWarning(
-						'当前能源类型暂无配置表名，请先到《表名配置》页面配置'
-					);
-					return;
-				}
-				res.data[0].meters.forEach((meter) => {
-					this.tableNameList.push(this.meterArr.find((i) => i.value === meter));
-				});
-			});
-		},
-		submitForm() {
-			this.$refs['energyQuantityManualForm'].validate((valid) => {
-				if (valid) {
-					// 校验表格
-					if (this.tableData.length === 0) {
-						this.$modal.msgError('抄表数据不能为空');
-						return false;
-					} else {
-						for (let item of this.tableData) {
-							if (
-								!item.meter ||
-								(!item.readingQuantity && item.readingQuantity !== 0)
-							) {
-								this.$modal.msgError('抄表数据有空值，请检查');
-								return false;
-							}
-						}
-					}
-					if (this.isEdit) {
-						// 编辑
-						energyQuantityManualUpdate({
-							id: this.form.id,
-							recordTime: this.form.recordTime,
-							readingQuantity: this.tableData[0].readingQuantity,
-						}).then((res) => {
-							if (res.code === 0) {
-								this.$modal.msgSuccess('操作成功');
-								this.$emit('successSubmit');
-							}
-						});
-					} else {
-						let obj = {};
-						this.tableData.forEach((item) => {
-							obj[item.meter] = item.readingQuantity;
-						});
-						energyQuantityManualCreate({
-							energyTypeId: this.form.energyTypeId,
-							recordTime: this.form.recordTime,
-							meters: obj,
-						}).then((res) => {
-							if (res.code === 0) {
-								this.$modal.msgSuccess('操作成功');
-								this.$emit('successSubmit');
-							}
-						});
-					}
-				} else {
-					return false;
-				}
-			});
-		},
-		formClear() {
-			this.$refs.energyQuantityManualForm.resetFields();
-			this.form.unit = '';
-			this.isEdit = false;
-			this.addButtonShow = '新增';
-			this.tableData = [];
-		},
-	},
-};
-</script>
diff --git a/src/views/energy/base/energyQuantityManual/index.vue b/src/views/energy/base/energyQuantityManual/index.vue
deleted file mode 100644
index 314cfc18..00000000
--- a/src/views/energy/base/energyQuantityManual/index.vue
+++ /dev/null
@@ -1,332 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<!-- 列表 -->
-		<base-table
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-props="tableProps"
-			:table-data="list"
-			:max-height="tableH"
-			@selection-change="selectChange">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-		<!-- 新增 -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="centervisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel">
-			<energy-quantity-manual-add
-				ref="energyQuantityManualAdd"
-				:energyTypeList="energyTypeList"
-				@successSubmit="successSubmit" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	energyQuantityManualPage,
-	energyQuantityManualDelete,
-	energyQuantityManualExport,
-} from '@/api/base/energyQuantityManual';
-import { getEnergyTypeListAll } from '@/api/base/energyType';
-import { publicFormatter } from '@/utils/dict';
-import { parseTimeTable } from '@/utils/ruoyi';
-import EnergyQuantityManualAdd from './components/energyQuantityManualAdd';
-import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-const tableProps = [
-	{
-		prop: 'energyType',
-		label: '能源类型',
-		minWidth: 110,
-		showOverflowtooltip: true,
-	},
-	{
-		prop: 'unit',
-		label: '单位',
-		filter: publicFormatter('unit_dict'),
-		minWidth: 110,
-	},
-	{
-		prop: 'meter',
-		label: '能源表名',
-		filter: publicFormatter('meter'),
-		minWidth: 110,
-		showOverflowtooltip: true,
-	},
-	{
-		prop: 'recordTime',
-		label: '抄表日期',
-		filter: parseTimeTable('{y}-{m}-{d}'),
-		minWidth: 110,
-	},
-	{
-		prop: 'readingQuantity',
-		label: '抄表值',
-	},
-	{
-		prop: 'usingQuantity',
-		label: '差值',
-	},
-];
-export default {
-	name: 'EnergyQuantityManual',
-	data() {
-		return {
-			formConfig: [
-				{
-					type: 'select',
-					label: '能源类型',
-					labelField: 'name',
-					selectOptions: [],
-					param: 'energyTypeId',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '抄表日期',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					valueFormat:"yyyy-MM-dd HH:mm:ss",
-					param: 'timeVal',
-					defaultSelect: [],
-				},
-				{
-					type: this.$auth.hasPermi('base:energy-quantity-manual:query')
-						? 'button'
-						: '',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: this.$auth.hasPermiOr([
-						'base:energy-quantity-manual:export',
-						'base:energy-quantity-manual:create',
-					])
-						? 'separate'
-						: '',
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:energy-quantity-manual:export')
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'primary',
-				// 	plain: true,
-				// },
-				{
-					type: this.$auth.hasPermi('base:energy-quantity-manual:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-			],
-			tableProps,
-			// 总条数
-			total: 0,
-			// 班次基础信息列表
-			list: [],
-			tableBtn: [
-				this.$auth.hasPermiAnd([
-					'base:energy-quantity-manual:query',
-					'base:energy-quantity-manual:create',
-				])
-					? {
-							type: 'meterReading',
-							btnName: '抄表',
-					  }
-					: undefined,
-				this.$auth.hasPermiAnd([
-					'base:energy-quantity-manual:update',
-					'base:energy-quantity-manual:query',
-				])
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:energy-quantity-manual:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				energyTypeId: '',
-				startTime: '',
-				endTime: '',
-			},
-			energyTypeList: [],
-			exportList: [],
-			addOrEditTitle: '',
-			centervisible: false,
-		};
-	},
-	components: { EnergyQuantityManualAdd },
-	mixins: [tableHeightMixin],
-	created() {
-		let end = moment().format('YYYY-MM-DD 23:59:59').valueOf();
-		let start = moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00').valueOf();
-		this.formConfig[1].defaultSelect = [start, end];
-		this.queryParams.startTime = start;
-		this.queryParams.endTime = end;
-		this.getList();
-		this.getTypeList();
-	},
-	methods: {
-		buttonClick(val) {
-			console.log(val.timeVal)
-			this.queryParams.pageNo = 1;
-			this.queryParams.energyTypeId = val.energyTypeId;
-			this.queryParams.startTime = val.timeVal
-				? val.timeVal[0]
-				: null;
-			this.queryParams.endTime = val.timeVal
-				? val.timeVal[1].substr(0, 10) + " 23:59:59"
-				: null;
-			switch (val.btnName) {
-				case 'search':
-					this.getList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.centervisible = true;
-					let params = {};
-					params.type = 'add';
-					this.$nextTick(() => {
-						this.$refs.energyQuantityManualAdd.init(params);
-					});
-					break;
-				default:
-					this.$modal
-						.confirm('是否确认导出')
-						.then(() => {
-							return energyQuantityManualExport({
-								energyTypeId: this.queryParams.energyTypeId,
-								startTime: this.queryParams.startTime,
-								endTime: this.queryParams.endTime,
-							});
-						})
-						.then((response) => {
-							this.$download.excel(response, '能源报表.xls');
-						})
-						.catch(() => {});
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			energyQuantityManualPage(this.queryParams).then((response) => {
-				let arr = response.data.list || [];
-				arr &&
-					arr.map((item) => {
-						item.amount = item.amount
-							? !isNaN(parseFloat(item.amount)) && isFinite(item.amount)
-								? item.amount.toFixed(2)
-								: ''
-							: '';
-					});
-				this.list = arr;
-				this.total = response.data.total;
-				this.exportList = [];
-			});
-		},
-		getTypeList() {
-			getEnergyTypeListAll().then((res) => {
-				this.formConfig[0].selectOptions = res.data || [];
-				this.energyTypeList = res.data || [];
-			});
-		},
-		selectChange(val) {
-			console.log(val);
-			this.exportList = val;
-		},
-		handleClick(val) {
-			console.log(val);
-			switch (val.type) {
-				case 'edit':
-					this.addOrEditTitle = '编辑';
-					this.centervisible = true;
-					let paramA = {};
-					paramA.type = 'edit';
-					paramA.id = val.data.id;
-					this.$nextTick(() => {
-						this.$refs.energyQuantityManualAdd.init(paramA);
-					});
-					break;
-				case 'meterReading':
-					this.addOrEditTitle = '新增';
-					this.centervisible = true;
-					let paramB = {};
-					paramB.type = 'meterReading';
-					paramB.energyTypeId = val.data.energyTypeId;
-					paramB.meter = val.data.meter;
-					this.$nextTick(() => {
-						this.$refs.energyQuantityManualAdd.init(paramB);
-					});
-					break;
-				default:
-					this.handleDelete(val.data);
-			}
-		},
-		// 新增
-		handleCancel() {
-			this.$refs.energyQuantityManualAdd.formClear();
-			this.centervisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.$refs.energyQuantityManualAdd.submitForm();
-		},
-		successSubmit() {
-			this.handleCancel();
-			this.getList();
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			console.log(row.id);
-			this.$modal
-				.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?')
-				.then(function () {
-					return energyQuantityManualDelete({ id: row.id });
-				})
-				.then(() => {
-					this.queryParams.pageNo = 1;
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/energy/base/energyQuantityRealtime/index.vue b/src/views/energy/base/energyQuantityRealtime/index.vue
deleted file mode 100644
index 96642075..00000000
--- a/src/views/energy/base/energyQuantityRealtime/index.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
-    <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :selectWidth="55"
-      :max-height="tableH"
-      @selection-change="selectChange"
-    />
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
-  </div>
-</template>
-
-<script>
-import { getEnergyQuantityRealtimePage, exportEnergyQuantityRealtimeExcel } from "@/api/base/energyQuantityRealtime"
-import { getEnergyTypeListAll } from "@/api/base/energyType"
-// import { publicFormatter } from '@/utils/dict'
-import FileSaver from "file-saver"
-import * as XLSX from 'xlsx/xlsx.mjs'
-const tableProps = [
-  {
-    prop: 'objName',
-    label: '统计对象'
-  },
-  {
-    prop: 'objRemark',
-    label: '对象备注'
-  },
-  {
-    prop: 'energyTypeName',
-    label: '能源类型'
-  },
-  {
-    prop: 'startValue',
-    label: '初始值'
-  },
-  {
-    prop: 'endValue',
-    label: '当前值'
-  },
-  {
-    prop: 'diffValue',
-    label: '差值'
-  },
-  {
-    prop: 'amount',
-    label: '金额'
-  }
-]
-export default {
-  name: "EnergyPlc",
-  data() {
-    return {
-      formConfig: [
-        {
-          type: 'select',
-          label: '能源类型',
-          selectOptions: [],
-          param: 'energyTypeId'
-        },
-        {
-          type: 'datePicker',
-          label: '时间',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "timestamp",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultSelect: [],
-          width: 350
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: 'separate'
-        },
-        {
-          type: this.$auth.hasPermi('base:energy-quantity-realtime:export') ? 'button' : '',
-          btnName: '导出',
-          name: 'export',
-					color: 'warning',
-        }
-      ],
-      tableProps,
-      tableH: this.tableHeight(260),
-      // 总条数
-      total: 0,
-      // 班次基础信息列表
-      list: [],
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20,
-        energyTypeId: '',
-        startTime: null,
-        endTime: null
-      },
-      energyTypeList: [],
-      exportList: []
-    };
-  },
-  created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
-    this.getList();
-    this.getTypeList()
-  },
-  methods: {
-    buttonClick(val) {
-      this.queryParams.pageNo = 1;
-      this.queryParams.energyTypeId = val.energyTypeId
-      this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
-      this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
-      switch (val.btnName) {
-        case 'search':
-          this.getList()
-          break
-        default:
-          this.exportTable()
-          // this.$modal.confirm('是否确认导出').then(() => {
-          //     return exportEnergyQuantityRealtimeExcel({...this.queryParams});
-          //   }).then(response => {
-          //     console.log(response)
-          //     this.$download.excel(response, '能源抄表.xls');
-          //   }).catch(() => {})
-      }
-    },
-    /** 查询列表 */
-    getList() {
-      getEnergyQuantityRealtimePage(this.queryParams).then(response => {
-        this.list = response.data.list || []
-        this.total = response.data.total;
-        this.exportList = []
-      });
-    },
-    getTypeList() {
-      getEnergyTypeListAll().then((res) => {
-        this.formConfig[0].selectOptions = res.data || []
-        this.energyTypeList = res.data || []
-      })
-    },
-    selectChange(val) {
-      this.exportList = val
-    },
-    // 勾选导出
-    exportTable() {
-      if (this.exportList.length > 0) {
-        let body = this.exportList.map((x) => [
-          x.objName,
-          x.objRemark,
-          x.energyTypeName,
-          x.startValue,
-          x.endValue,
-          x.diffValue,
-          x.amount
-        ])
-        let header = []
-        this.tableProps.map((y) => {
-          header.push(y.label)
-        })
-        body.unshift(header)
-        console.log(body)
-        const filename = '能源抄表.xlsx'
-        const ws_name = 'Sheet1'
-        const wb = XLSX.utils.book_new()
-        const ws = XLSX.utils.aoa_to_sheet(body)
-        XLSX.utils.book_append_sheet(wb, ws, ws_name)
-        let wbout = XLSX.write(wb, {
-          bookType: 'xlsx',
-          bookSST: false,
-          type: 'array'
-        })
-        FileSaver.saveAs(
-          new Blob([wbout], {
-            type: 'application/octet-stream'
-          }),
-          filename
-        )
-      } else {
-        this.$modal.msgWarning('请勾选需要导出的数据')
-      }
-    }
-  }
-};
-</script>
diff --git a/src/views/energy/base/energyType/components/InnerTable.vue b/src/views/energy/base/energyType/components/InnerTable.vue
deleted file mode 100644
index ff3adce7..00000000
--- a/src/views/energy/base/energyType/components/InnerTable.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <el-popover placement="right" width="400" trigger="click">
-    <el-table :data="tableData" v-if='tableProps.length'>
-      <el-table-column
-        v-for='item in tableProps'
-        :key="item.prop"
-        :prop="item.prop" 
-        :label="item.label" 
-        width="120">
-      </el-table-column>
-    </el-table>
-    <span v-if='singlePrice'><span class='priceTitle'>单价(元): </span>{{ singlePrice }}</span>
-    <el-button
-      slot="reference"
-      type="text"
-      class="tableInnerButton"
-      @click="showInnerTable(injectData)"
-      >详情</el-button
-    >
-  </el-popover>
-</template>
-<script>
-import { getEnergyType } from '@/api/base/energyType'
-const temp1 = [
-  {
-    prop: 'startTime',
-    label: '开始时间'
-  },
-  {
-    prop: 'endTime',
-    label: '结束时间'
-  },
-  {
-    prop: 'price',
-    label: '单价(元)'
-  }
-]
-const temp2 = [
-  {
-    prop: 'startUsed',
-    label: '下限值'
-  },
-  {
-    prop: 'endUsed',
-    label: '上限值'
-  },
-  {
-    prop: 'price',
-    label: '单价(元)'
-  }
-]
-export default {
-  name: 'InnerTable',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    },
-    itemProp: {
-      type: String
-    }
-  },
-  data() {
-    return {
-      list: this.injectData,
-      tableData: [],
-      tableProps: [],
-      singlePrice:'',
-      temp1,
-      temp2
-    }
-  },
-  methods: {
-    showInnerTable(data) {
-      let id = data.id
-      getEnergyType(id).then((res) => {
-        if (res.code === 0) {
-          console.log(res)
-          if (res.data.pricingMethod === 0) {
-            this.tableProps = this.temp1
-            this.tableData = res.data.segPriceList
-            this.singlePrice = ''
-          } else if (res.data.pricingMethod === 1) {
-            this.tableProps = this.temp2
-            this.tableData = res.data.usedPriceList
-            this.singlePrice = ''
-          } else {
-            this.tableProps = []
-            this.tableData = []
-            this.singlePrice = res.data.singlePrice
-          }
-        }
-      })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.tableInnerButton {
-  padding: 0;
-}
-.priceTitle {
-  color: #515A5E;
-  font-weight: bold;
-  margin-right: 10px;
-}
-</style>
diff --git a/src/views/energy/base/energyType/components/InputArea.vue b/src/views/energy/base/energyType/components/InputArea.vue
deleted file mode 100644
index 94088653..00000000
--- a/src/views/energy/base/energyType/components/InputArea.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-  <div class="tableInner">
-    <el-input-number v-model="list[itemProp]" @blur="changeInput" :min="0" :max="100000000" style="width: 100%" :controls='false'></el-input-number>
-  </div>
-</template>
-<script>
-export default {
-  name: 'InputArea',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    },
-    itemProp: {
-      type: String
-    }
-  },
-  data() {
-    return {
-      list: this.injectData
-    }
-  },
-  methods: {
-    changeInput() {
-      console.log(this.list)
-      this.$emit('emitData', this.list)
-    }
-  }
-}
-</script>
-<style lang="scss">
-.tableInner .el-input__inner {
-  border: none;
-  padding: 0;
-  height: 33px;
-}
-</style>
diff --git a/src/views/energy/base/energyType/components/TimePickerArea.vue b/src/views/energy/base/energyType/components/TimePickerArea.vue
deleted file mode 100644
index d3b6810b..00000000
--- a/src/views/energy/base/energyType/components/TimePickerArea.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-  <div class="tableInner">
-    <el-time-picker
-      v-model="list[itemProp]"
-      @blur="changeInput"
-      style="width: 100%"
-      format='HH:mm:ss'
-      value-format='HH:mm:ss'
-    ></el-time-picker>
-  </div>
-</template>
-<script>
-export default {
-  name: 'TimePickerArea',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    },
-    itemProp: {
-      type: String
-    }
-  },
-  data() {
-    return {
-      list: this.injectData
-    }
-  },
-  methods: {
-    changeInput() {
-      console.log(this.list)
-      this.$emit('emitData', this.list)
-    }
-  }
-}
-</script>
-<style lang="scss">
-.tableInner .el-input--prefix .el-input__inner {
-  border: none;
-  padding-left: 30px;
-  height: 33px;
-}
-</style>
diff --git a/src/views/energy/base/energyType/components/energyTypeAdd.vue b/src/views/energy/base/energyType/components/energyTypeAdd.vue
deleted file mode 100644
index 1ad4f753..00000000
--- a/src/views/energy/base/energyType/components/energyTypeAdd.vue
+++ /dev/null
@@ -1,334 +0,0 @@
-<template>
-  <el-form ref="form" :rules="rules" label-width="80px" :model="form">
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="能源类型" prop="name">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="类型编码" prop="code">
-          <el-input v-model="form.code" disabled></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="单位" prop="unit">
-          <el-select v-model="form.unit" placeholder="请选择" style="width: 100%;">
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.ENERGY_UNIT)"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="计价方式" prop="pricingMethod">
-          <el-select v-model="form.pricingMethod" placeholder="请选择" style="width: 100%;">
-            <el-option label="时间段" :value= '0' ></el-option>
-            <el-option label="使用量" :value= '1' ></el-option>
-            <el-option label="固定价位" :value= '2' ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12" v-show="form.pricingMethod === 2">
-        <el-form-item label="单价(元)" prop="pricingMethod">
-          <el-input-number v-model="form.singlePrice" :precision="2" :min="0" :max="999999999" style="width: 100%;"></el-input-number>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24"  v-show="form.pricingMethod === 0">
-        <el-form-item label="时间段" prop="pricingMethod">
-          <base-table
-            :key='timeKye'
-            :table-props="tableProps1"
-            :table-data="tableData1"
-            :add-button-show="addButtonShow"
-            @emitButtonClick="emitButtonClick1"
-            @emitFun="inputChange1"
-          >
-            <method-btn
-              v-if="tableBtn.length"
-              slot="handleBtn"
-              :width="80"
-              label="操作"
-              :method-list="tableBtn"
-              @clickBtn="handleClick1"
-            />
-          </base-table>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24" v-show="form.pricingMethod === 1">
-        <el-form-item label="使用量" prop="pricingMethod">
-          <base-table
-            :key='usedKye'
-            :table-props="tableProps2"
-            :table-data="tableData2"
-            :add-button-show="addButtonShow"
-            @emitButtonClick="emitButtonClick2"
-            @emitFun="inputChange2"
-          >
-            <method-btn
-              v-if="tableBtn.length"
-              slot="handleBtn"
-              :width="80"
-              label="操作"
-              :method-list="tableBtn"
-              @clickBtn="handleClick2"
-            />
-          </base-table>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form-item label="描述" prop="description">
-          <el-input v-model="form.description"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-<script>
-import { getEnergyType, updateEnergyType, createEnergyType, getEnergyTypeCode } from '@/api/base/energyType'
-import inputArea from './InputArea.vue'
-import timePickerArea from './TimePickerArea.vue'
-const tableProps1 = [
-  {
-    prop: 'startTime',
-    label: '开始时间',
-    subcomponent: timePickerArea
-  },
-  {
-    prop: 'endTime',
-    label: '结束时间',
-    subcomponent: timePickerArea
-  },
-  {
-    prop: 'price',
-    label: '单价(元)',
-    subcomponent: inputArea
-  }
-]
-const tableProps2 = [
-  {
-    prop: 'startUsed',
-    label: '下限值',
-    // subcomponent: inputArea
-  },
-  {
-    prop: 'endUsed',
-    label: '上限量',
-    subcomponent: inputArea
-  },
-  {
-    prop: 'price',
-    label: '单价(元)',
-    subcomponent: inputArea
-  }
-]
-export default {
-  name: 'energyTypeAdd',
-  data() {
-    return {
-      form: {
-        id: '',
-        name: '',
-        code: '',
-        nuit: '',
-        pricingMethod: 2,
-        leaderName: ''
-      },
-      isEdit: false, //是否是编辑
-      rules: {
-        name: [{ required: true, message: '能源类型不能为空', trigger: 'blur' }],
-        pricingMethod: [{ required: true, message: '计价方式不能为空', trigger: 'change' }]
-      },
-      timeKye: 0,
-      usedKye: 0,
-      tableProps1,
-      tableProps2,
-      tableData1: [],
-      tableData2: [],
-      tableBtn: [
-        {
-          type: 'delete',
-          name: '删除'
-        }
-      ],
-      addButtonShow: '新增'
-    }
-  },
-  methods: {
-    init(id) {
-      if (id) {
-        this.isEdit = true
-        this.form.id = id
-        getEnergyType( id ).then((res) => {
-          if (res.code === 0) {
-            this.form = res.data
-            switch(this.form.pricingMethod) {
-              case 0:
-                this.tableData1 = this.form.segPriceList
-                break;
-              case 1:
-                this.tableData2 = this.form.usedPriceList
-                break;
-              default:
-            }
-          }
-        })
-      } else {
-        this.isEdit = false
-        this.form.id = ''
-        getEnergyTypeCode().then((res) => {
-          this.form.code = res.data
-        })
-      }
-    },
-    // 输入框失去焦点
-    inputChange1(val) {
-      this.tableData1[val._pageIndex - 1][val.prop] = val[val.prop]
-      if ((this.tableData1.length > val._pageIndex) && val.prop === 'endTime') {
-        this.tableData1[val._pageIndex].startTime = val[val.prop]
-      }
-      this.timeKye++
-    },
-    inputChange2(val) {
-      // 上限值必须大于下限值
-      if (!!val.endUsed && (val.endUsed <= val.startUsed)) {
-        this.$modal.msgError('上限值不能等于或者小于下限值')
-        return false
-      }
-      this.tableData2[val._pageIndex - 1][val.prop] = val[val.prop]
-      if ((this.tableData2.length > val._pageIndex) && val.prop === 'endUsed') {
-        this.tableData2[val._pageIndex].startUsed = val[val.prop]
-      }
-      this.usedKye++
-    },
-    // 增加
-    emitButtonClick1() {
-      let n = this.tableData1.length
-      if (n >=3) {
-        this.$modal.msgWarning('最多可添加3档计价')
-        return false
-      }
-      let obj = {}
-      obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime
-      obj.endTime = ''
-      obj.price = 0
-      this.tableData1.push(obj)
-    },
-    emitButtonClick2() {
-      let n = this.tableData2.length
-      if (n >=3) {
-        this.$modal.msgWarning('最多可添加3档计价')
-        return false
-      }
-      let obj = {}
-      obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed
-      obj.endUsed = 0
-      obj.price = 0
-      this.tableData2.push(obj)
-    },
-    // 删除
-    handleClick1(val) {
-      this.tableData1.splice(val.data._pageIndex - 1, 1)
-      this.timeKye++
-    },
-    handleClick2(val) {
-      this.tableData2.splice(val.data._pageIndex - 1, 1)
-      this.usedKye++
-    },
-    submitForm() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          switch(this.form.pricingMethod) {
-            case 0:// 时间段
-              if (this.tableData1.length === 0) {
-                this.$modal.msgError('时间段表格数据不能为空')
-                return false
-              } else {
-                this.tableData1.map(item => {
-                  if (item.price <= 0) {
-                    this.$modal.msgError('单价有误请检查，请检查')
-                    return false
-                  }
-                })
-              }
-              break;
-            case 1:// 使用量
-              if (this.tableData2.length === 0) {
-                this.$modal.msgError('使用量表格数据不能为空')
-                return false
-              } else {
-                this.tableData1.map(item => {
-                  if (item.price <= 0) {
-                    this.$modal.msgError('单价有误请检查，请检查')
-                    return false
-                  }
-                })
-              }
-              break;
-            default:// 固定单价
-              if (!this.form.singlePrice) {
-                this.$modal.msgError('单价有误请检查，请检查')
-                  return false
-              }
-          }
-          if (this.isEdit) {
-            // 编辑
-            updateEnergyType({
-              id: this.form.id,
-              code: this.form.code,
-              name: this.form.name,
-              unit: this.form.unit,
-              pricingMethod: this.form.pricingMethod,
-              description: this.form.description,
-              singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
-              segPriceList: this.form.pricingMethod === 0 ? this.tableData1: [],
-              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2: []
-            }).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          } else {
-            createEnergyType({
-              code: this.form.code,
-              name: this.form.name,
-              unit: this.form.unit,
-              pricingMethod: this.form.pricingMethod,
-              description: this.form.description,
-              singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
-              segPriceList: this.form.pricingMethod === 0 ? this.tableData1: [],
-              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2: []
-            }).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    formClear() {
-      this.$refs.form.resetFields()
-      this.form.singlePrice = 0
-      this.isEdit = false
-      this.timeKye = 0
-      this.usedKye = 0
-      this.tableData1 = []
-      this.tableData2 = []
-    }
-  }
-}
-</script>
diff --git a/src/views/energy/base/energyType/index.vue b/src/views/energy/base/energyType/index.vue
deleted file mode 100644
index 428fb11d..00000000
--- a/src/views/energy/base/energyType/index.vue
+++ /dev/null
@@ -1,218 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
-    <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="80"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
-    <!-- 新增 -->
-    <base-dialog
-      :dialogTitle="addOrEditTitle"
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-    >
-      <energy-type-add ref="energyType" @successSubmit="successSubmit" />
-    </base-dialog>
-  </div>
-</template>
-
-<script>
-import { getEnergyTypePage, deleteEnergyType } from "@/api/base/energyType";
-import { publicFormatter } from '@/utils/dict'
-import InnerTable from './components/InnerTable'
-import EnergyTypeAdd from './components/energyTypeAdd'
-const tableProps = [
-  {
-    prop: 'code',
-    label: '类型编码',
-    showOverflowtooltip: true
-  },
-  {
-    prop: 'name',
-    label: '能源类型'
-  },
-  {
-    prop: 'unit',
-    label: '单位',
-    filter: publicFormatter('energy_unit')
-  },
-  {
-    prop: 'pricingMethod',
-    label: '计价方式'
-  },
-  {
-    prop: 'price',
-    label: '价格(元)',
-    subcomponent: InnerTable
-  }
-]
-export default {
-  name: "EnergyType",
-  components: { EnergyTypeAdd },
-  data() {
-    return {
-      formConfig: [
-        {
-          type: 'input',
-          label: '能源类型',
-          placeholder: '能源类型',
-          param: 'name'
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: 'separate'
-        },
-        {
-          type: this.$auth.hasPermi('base:energy-type:create') ? 'button' : '',
-          btnName: '新增',
-          name: 'add',
-          color: 'success',
-          plain: true
-        }
-      ],
-      tableProps,
-      tableBtn: [
-        this.$auth.hasPermi('base:energy-type:update')
-          ? {
-              type: 'edit',
-              btnName: '编辑'
-            }
-          : undefined,
-        this.$auth.hasPermi('base:energy-type:delete')
-          ? {
-              type: 'delete',
-              btnName: '删除'
-            }
-          : undefined
-      ].filter((v) => v),
-      tableH: this.tableHeight(260),
-      pricingMethodList: [
-        {value: 0,label: '分时间段计价'},
-        {value: 1,label: '分使用量计价'},
-        {value: 2,label: '单一计价'}
-      ],
-      // 总条数
-      total: 0,
-      // 班次基础信息列表
-      list: [],
-      // 弹出层标题
-      addOrEditTitle: "",
-      // 是否显示弹出层
-      centervisible: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20,
-        name: null,
-        code: null
-      }
-    };
-  },
-  created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
-    this.getList();
-  },
-  methods: {
-    buttonClick(val) {
-      switch (val.btnName) {
-        case 'search':
-          this.queryParams.pageNo = 1;
-          this.queryParams.name = val.name
-          this.queryParams.code = val.code
-          this.getList()
-          break
-        default:
-          this.addOrEditTitle = '新增'
-          this.centervisible = true
-          this.$nextTick(() => {
-            this.$refs.energyType.init()
-          })
-      }
-    },
-    /** 查询列表 */
-    getList() {
-      getEnergyTypePage(this.queryParams).then(response => {
-        let arr = response.data.list || [];
-        arr&&arr.map(item => {
-          this.pricingMethodList.map(i => {
-            if (item.pricingMethod === i.value) {
-              item.pricingMethod = i.label
-            }
-          })
-        })
-        this.list = arr
-        this.total = response.data.total;
-      });
-    },
-    handleClick(val) {
-      switch (val.type) {
-        case 'edit':
-          this.addOrEditTitle = '编辑'
-          this.$nextTick(() => {
-            this.$refs.energyType.init(val.data.id)
-          })
-          this.centervisible = true
-          break
-        default:
-        this.handleDelete(val.data)
-      }
-    },
-    handleCancel() {
-      this.$refs.energyType.formClear()
-      this.centervisible = false
-      this.addOrEditTitle = ''
-    },
-    handleConfirm() {
-      this.$refs.energyType.submitForm()
-    },
-    successSubmit() {
-      this.handleCancel()
-      this.getList()
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除能源类型为"' + row.name + '"的数据项?').then(function() {
-          return deleteEnergyType(row.id);
-        }).then(() => {
-          this.queryParams.pageNo = 1;
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/src/views/energy/base/tableNameConfig/components/tableNameConfigUpdate.vue b/src/views/energy/base/tableNameConfig/components/tableNameConfigUpdate.vue
deleted file mode 100644
index 67a47a2b..00000000
--- a/src/views/energy/base/tableNameConfig/components/tableNameConfigUpdate.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-04-11 14:57:57
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-12 08:53:41
- * @Description:
--->
-<template>
-	<el-form ref="form" label-width="100px" :model="form" :rules="rules">
-		<el-form-item label="能源类型" prop="energyType">
-			<el-input v-model="form.energyType"></el-input>
-		</el-form-item>
-		<el-form-item label="能源表名" prop="meters">
-			<el-select
-				v-model="form.meters"
-				placeholder="请选择"
-				style="width: 100%"
-				:multiple="true"
-				filterable>
-				<el-option
-					v-for="dict in getDictDatas('meter')"
-					:key="dict.id"
-					:label="dict.label"
-					:value="dict.value" />
-			</el-select>
-		</el-form-item>
-	</el-form>
-</template>
-<script>
-import {
-	energyTableGet,
-	energyTableUpdate,
-} from '@/api/base/energyQuantityManual';
-export default {
-	name: 'TableNameConfigUpdate',
-	data() {
-		return {
-			form: {
-				energyType: '',
-				energyTypeId: '',
-				meters: [],
-			},
-			rules: {
-				meters: [
-					{ required: true, message: '能源表名不能为空', trigger: 'change' },
-				],
-			},
-		};
-	},
-	methods: {
-		init(id) {
-			energyTableGet({ energyTypeId: id }).then((res) => {
-				if (res.data.length > 0) {
-					this.form.energyType = res.data[0].energyType || '';
-					this.form.energyTypeId = res.data[0].energyTypeId || '';
-					this.form.meters =
-						res.data[0].meters &&
-						res.data[0].meters.map((item) => {
-							return item;
-						});
-				}
-			});
-		},
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					// 编辑
-					energyTableUpdate({ ...this.form }).then((res) => {
-						if (res.code === 0) {
-							this.$modal.msgSuccess('操作成功');
-							this.$emit('successSubmit');
-						}
-					});
-				}
-			});
-		},
-		formClear() {
-			this.form.energyType = '';
-			this.form.energyTypeId = '';
-			this.form.meters = [];
-			this.isEdit = false;
-		},
-	},
-};
-</script>
diff --git a/src/views/energy/base/tableNameConfig/index.vue b/src/views/energy/base/tableNameConfig/index.vue
deleted file mode 100644
index c851f6c1..00000000
--- a/src/views/energy/base/tableNameConfig/index.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 列表 -->
-		<base-table
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-props="tableProps"
-			:table-data="list"
-			:max-height="tableH">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<!-- 新增 -->
-		<base-dialog
-			dialogTitle="编辑"
-			:dialogVisible="centervisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel">
-			<table-name-config-update
-				ref="tableNameConfigU"
-				@successSubmit="successSubmit" />
-		</base-dialog>
-	</div>
-</template>
-<script>
-import { energyTablePage } from '@/api/base/energyQuantityManual';
-import tableNameConfigUpdate from './components/tableNameConfigUpdate.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-const tableProps = [
-	{
-		prop: 'energyType',
-		label: '能源类型',
-		width: 200,
-	},
-	{
-		prop: 'tableName',
-		label: '能源表名',
-	},
-];
-export default {
-	name: 'TableNameConfig',
-	components: { tableNameConfigUpdate },
-	data() {
-		return {
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermiAnd(['base:energy-table:update'])
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-			].filter((v) => v),
-			list: [],
-			queryParams: {
-				pageNo: 1,
-				pageSize: 100,
-			},
-			heightNum: 165,
-			centervisible: false,
-			meterArr: [],
-		};
-	},
-	mixins: [tableHeightMixin],
-	created() {
-		this.meterArr = this.getDictDatas('meter');
-		this.$nextTick(() => {
-			this.getList();
-		});
-	},
-	methods: {
-		getList() {
-			energyTablePage().then((res) => {
-				let temp = res.data || [];
-				this.list = temp.map((item) => {
-					let meters = [];
-					item.meters.forEach((meter) => {
-						meters.push(
-							this.meterArr.find((i) =>
-								i.value === meter
-							).label
-						);
-					});
-					return {
-						energyType: item.energyType,
-						energyTypeId: item.energyTypeId,
-						tableName: meters.join('、'),
-					};
-				});
-			});
-		},
-		handleClick(val) {
-			console.log('编辑');
-			this.centervisible = true;
-			this.$nextTick(() => {
-				this.$refs.tableNameConfigU.init(val.data.energyTypeId);
-			});
-		},
-		handleCancel() {
-			this.$refs.tableNameConfigU.formClear();
-			this.centervisible = false;
-		},
-		handleConfirm() {
-			this.$refs.tableNameConfigU.submitForm();
-		},
-		successSubmit() {
-			this.handleCancel();
-			this.getList();
-		},
-	},
-};
-</script>
diff --git a/src/views/energy/monitoring/energyLimit/components/InputArea.vue b/src/views/energy/monitoring/energyLimit/components/InputArea.vue
deleted file mode 100644
index 659de947..00000000
--- a/src/views/energy/monitoring/energyLimit/components/InputArea.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-03-27 15:49:55
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-12 15:16:48
- * @Description:
--->
-<template>
-  <div class="tableInner">
-    <el-input-number v-model="list[itemProp]" @blur="changeInput" :min="0" :max="100000000" style="width: 100%" :controls='false'></el-input-number>
-  </div>
-</template>
-<script>
-export default {
-  name: 'InputArea',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    },
-    itemProp: {
-      type: String
-    }
-  },
-  data() {
-    return {
-      list: this.injectData
-    }
-  },
-  methods: {
-    changeInput() {
-      console.log(this.list)
-      this.$emit('emitData', this.list)
-    }
-  }
-}
-</script>
-<style lang="scss">
-.tableInner .el-input__inner {
-  border: none;
-  padding: 0;
-  height: 33px;
-}
-</style>
diff --git a/src/views/energy/monitoring/energyLimit/components/TimePickerArea.vue b/src/views/energy/monitoring/energyLimit/components/TimePickerArea.vue
deleted file mode 100644
index 25a5984b..00000000
--- a/src/views/energy/monitoring/energyLimit/components/TimePickerArea.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-03-27 15:49:55
- * @LastEditors: zwq
- * @LastEditTime: 2024-04-12 15:16:56
- * @Description:
--->
-<template>
-  <div class="tableInner">
-    <el-time-picker
-      v-model="list[itemProp]"
-      @blur="changeInput"
-      style="width: 100%"
-      format='HH:mm:ss'
-      value-format='HH:mm:ss'
-    ></el-time-picker>
-  </div>
-</template>
-<script>
-export default {
-  name: 'TimePickerArea',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    },
-    itemProp: {
-      type: String
-    }
-  },
-  data() {
-    return {
-      list: this.injectData
-    }
-  },
-  methods: {
-    changeInput() {
-      console.log(this.list)
-      this.$emit('emitData', this.list)
-    }
-  }
-}
-</script>
-<style lang="scss">
-.tableInner .el-input--prefix .el-input__inner {
-  border: none;
-  padding-left: 30px;
-  height: 33px;
-}
-</style>
diff --git a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
deleted file mode 100644
index 8fa41494..00000000
--- a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
+++ /dev/null
@@ -1,360 +0,0 @@
-<template>
-	<el-form ref="form" :rules="rules" label-width="110px" :model="form">
-		<el-row>
-			<el-col :span="12">
-				<el-form-item label="抄表方式" prop="manual">
-					<el-select
-						v-model="form.manual"
-						placeholder="请选择"
-						style="width: 100%"
-						@change="changeMethod,$forceUpdate">
-						<el-option
-							v-for="item in manualArr"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="form.manual == 0">
-				<el-form-item label="监控对象" prop="objectId">
-					<el-cascader
-						style="width: 100%"
-						v-model="objIds"
-						:options="objList"
-						:props="{ checkStrictly: true, value: 'id', label: 'name' }"
-						@change="selectObj"
-						clearable></el-cascader>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="监控能源类型" prop="energyTypeId">
-					<el-select
-						v-model="form.energyTypeId"
-						placeholder="请选择"
-						style="width: 100%"
-						filterable
-						@change="toggleType">
-						<el-option
-							v-for="item in this.energyTypeList"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="form.manual == 1">
-				<el-form-item label="能源表名" prop="meter">
-					<el-select
-						v-model="form.meter"
-						placeholder="请选择"
-						style="width: 100%"
-						@change="$forceUpdate()">
-						<el-option
-							v-for="item in tableNameList"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="form.manual == 0">
-				<el-form-item label="监控模式" prop="type">
-					<el-select
-						v-model="form.type"
-						placeholder="请选择"
-						style="width: 100%"
-						@change="typeChange">
-						<el-option label="合并" :value="1"></el-option>
-						<el-option label="详细" :value="2"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="form.manual == 0">
-				<el-form-item label="监控详细参数" prop="type" v-if="form.type === 2">
-					<el-select
-						v-model="form.plcParamId"
-						placeholder="请选择"
-						style="width: 100%"
-						@change="selectDetail">
-						<el-option
-							v-for="item in detailList"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="指标类型" prop="limitType">
-					<el-select
-						v-model="form.limitType"
-						placeholder="请选择"
-						style="width: 100%"
-						:disabled="form.manual == 1"
-						@change="$forceUpdate()">
-						<el-option
-							v-for="item in getDictDatas(DICT_TYPE.MONITOR_INDEX_TYPE)"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="消耗量阈值">
-					<el-input-number
-						v-model="form.downValue"
-						placeholder="最小值"
-						:max="9999999"
-						style="width: 50%"></el-input-number>
-					<el-input-number
-						v-model="form.upValue"
-						placeholder="最大值"
-						:max="9999999"
-						style="width: 50%"></el-input-number>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-<script>
-import {
-	getEnergyLimit,
-	updateEnergyLimit,
-	createEnergyLimit,
-	getEnergyParamList,
-} from '@/api/monitoring/energyLimit';
-import { energyTableGet } from '@/api/base/energyQuantityManual';
-export default {
-	name: 'energyLimitAdd',
-	props: {
-		energyTypeList: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-		objList: {
-			type: Array,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			form: {
-				id: '',
-				manual: '0',
-				objectId: '',
-				objectType: '',
-				energyTypeId: '',
-				type: '',
-				plcParamId: '',
-				limitType: '',
-				downValue: 0,
-				upValue: 0,
-				meter: '',
-			},
-			objIds: [], // 回显数组
-			tableNameList: [],
-			isEdit: false, //是否是编辑
-			manualArr: [
-				{
-					value: '1',
-					label: '手动',
-				},
-				{
-					value: '0',
-					label: '自动',
-				},
-			],
-			rules: {
-				manual: [
-					{ required: true, message: '抄表方式不能为空', trigger: 'change' },
-				],
-				objectId: [
-					{ required: true, message: '监控对象不能为空', trigger: 'change' },
-				],
-				energyTypeId: [
-					{ required: true, message: '能源类型不能为空', trigger: 'change' },
-				],
-				type: [
-					{ required: true, message: '监控模式不能为空', trigger: 'change' },
-				],
-				limitType: [
-					{ required: true, message: '指标类型不能为空', trigger: 'change' },
-				],
-			},
-			detailList: [],
-			meterArr: [],
-		};
-	},
-	methods: {
-		init(id) {
-			this.meterArr = this.getDictDatas('meter');
-			if (id) {
-				this.isEdit = true;
-				this.form.id = id;
-				getEnergyLimit(id).then((res) => {
-					if (res.code === 0) {
-						this.form = res.data;
-						this.form.plcParamId = res.data.plcParamId || '';
-						this.form.meter = this.form.meter ? this.form.meter + '' : '';
-						this.form.manual =
-							this.form.manual >= 0 ? this.form.manual + '' : '';
-						this.form.limitType = this.form.limitType
-							? this.form.limitType + ''
-							: '';
-						this.objIds = this.changeDetSelect(
-							this.form.objectId,
-							this.objList
-						);
-						if (this.form.type === 2) {
-							this.getDetailList();
-						}
-						if (this.form.energyTypeId) {
-							this.getTableNameList(this.form.energyTypeId);
-						}
-					}
-				});
-			} else {
-				this.isEdit = false;
-				this.form.id = '';
-			}
-		},
-		// 切换方式
-		changeMethod() {
-			if (this.form.manual === '1') {
-				this.form.limitType = '2';
-			} else {
-				this.form.limitType = '';
-			}
-		},
-		// 监控详细参数
-		getDetailList() {
-			getEnergyParamList({
-				objId: this.form.objectId,
-				energyTypeId: this.form.energyTypeId,
-			}).then((res) => {
-				if (res.code === 0) {
-					this.detailList = res.data;
-				} else {
-					this.detailList = [];
-				}
-			});
-		},
-		typeChange(val) {
-			this.form.plcParamId = '';
-			if (val === 2) {
-				if (this.form.objectId && this.form.energyTypeId) {
-					this.getDetailList();
-				}
-			}
-		},
-		toggleType() {
-			if (this.form.energyTypeId && this.form.manual == 1) {
-				this.form.meter = '';
-				this.getTableNameList(this.form.energyTypeId);
-			}
-		},
-		// 获取能源表名list
-		getTableNameList(id) {
-			// 切换能源类型
-			this.tableNameList = [];
-			energyTableGet({ energyTypeId: id }).then((res) => {
-				if (res.data.length === 0) {
-					this.$modal.msgWarning(
-						'当前能源类型暂无配置表名，请先到《表名配置》页面配置'
-					);
-					return;
-				}
-				res.data[0].meters.forEach((meter) => {
-					this.tableNameList.push(this.meterArr.find((i) => i.value === meter));
-				});
-			});
-		},
-		// 递归处理分类回显问题
-		changeDetSelect(key, treeData) {
-			let arr = []; // 递归时操作的数组
-			let returnArr = []; // 存放结果的数组
-			let depth = 0; // 定义全局层级
-			// 定义递归函数
-			function childrenEach(childrendData, depthN) {
-				for (var j = 0; j < childrendData.length; j++) {
-					depth = depthN;
-					arr[depthN] = childrendData[j].id;
-					if (childrendData[j].id == key) {
-						returnArr = arr.slice(0, depthN + 1);
-						break;
-					} else {
-						if (childrendData[j].children) {
-							depth++;
-							childrenEach(childrendData[j].children, depth);
-						}
-					}
-				}
-				return returnArr;
-			}
-			return childrenEach(treeData, depth);
-		},
-		selectObj(val) {
-			this.form.objectId = val[val.length - 1];
-			this.form.objectType = val.length;
-			if (this.form.energyTypeId && this.form.type) {
-				this.getDetailList();
-				this.form.plcParamId = '';
-			}
-		},
-		selectDetail() {
-			this.$forceUpdate();
-		},
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					if (this.form.type === 2 && !this.form.plcParamId) {
-						this.$modal.msgError('监控模式为详细时，详细参数为必填');
-						return false;
-					}
-					if (this.form.downValue && this.form.upValue) {
-						if (this.form.downValue > this.form.upValue) {
-							this.$modal.msgError('消耗量阈值，最小值不能大于最大值');
-							return false;
-						}
-					}
-					this.form.downValue = this.form.downValue || 0;
-					this.form.upValue = this.form.upValue || 0;
-					if (this.isEdit) {
-						// 编辑
-						updateEnergyLimit({ ...this.form }).then((res) => {
-							if (res.code === 0) {
-								this.$modal.msgSuccess('操作成功');
-								this.$emit('successSubmit');
-							}
-						});
-					} else {
-						createEnergyLimit({ ...this.form }).then((res) => {
-							if (res.code === 0) {
-								this.$modal.msgSuccess('操作成功');
-								this.$emit('successSubmit');
-							}
-						});
-					}
-				} else {
-					return false;
-				}
-			});
-		},
-		formClear() {
-			this.$refs.form.resetFields();
-			this.form.type = '';
-			this.form.plcParamId = '';
-			this.form.downValue = null;
-			this.form.upValue = null;
-			this.objIds = '';
-			this.detailList = [];
-			this.isEdit = false;
-		},
-	},
-};
-</script>
diff --git a/src/views/energy/monitoring/energyLimit/index.vue b/src/views/energy/monitoring/energyLimit/index.vue
deleted file mode 100644
index ba8a31c6..00000000
--- a/src/views/energy/monitoring/energyLimit/index.vue
+++ /dev/null
@@ -1,275 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
-    <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="80"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
-    <!-- 新增 -->
-    <base-dialog
-      :dialogTitle="addOrEditTitle"
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-    >
-      <energy-limit-add ref="energyLimit" @successSubmit="successSubmit" :energyTypeList="energyTypeList" :objList="objList"/>
-    </base-dialog>
-  </div>
-</template>
-
-<script>
-import { getEnergyLimitPage, deleteEnergyLimit } from "@/api/monitoring/energyLimit";
-import { getEnergyTypeListAll } from "@/api/base/energyType";
-import { getTree } from '@/api/base/factory'
-import { publicFormatter } from '@/utils/dict'
-import EnergyLimitAdd from './components/energyLimitAdd'
-import codeFilter from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-const tableProps = [
-  {
-    prop: 'manual',
-    label: '抄表方式',
-		filter: codeFilter('manual'),
-  },
-  {
-    prop: 'objName',
-    label: '监控对象'
-  },
-  {
-    prop: 'objCode',
-    label: '对象编码',
-		minWidth: 140,
-		showOverflowtooltip: true,
-  },
-  // {
-  //   prop: 'objectType',
-  //   label: '对象备注',
-  //   filter: publicFormatter('object_type')
-  // },
-  {
-    prop: 'meter',
-    label: '能源表名',
-		filter: publicFormatter('meter'),
-  },
-  {
-    prop: 'energyType',
-    label: '能源类型'
-  },
-  {
-    prop: 'type',
-    label: '监控模式',
-    filter: (val) => (val != null ? ['合并', '详细'][val-1] : '-'),
-  },
-  {
-    prop: 'plcParamName',
-    label: '监控参数'
-  },
-  {
-    prop: 'limitType',
-    label: '指标类型',
-    filter: publicFormatter('monitor_index_type')
-  },
-  {
-    prop: 'limitValue',
-    label: '阈值'
-  }
-]
-export default {
-  name: "EnergyLimit",
-  components: { EnergyLimitAdd },
-	mixins: [tableHeightMixin],
-  data() {
-    return {
-      formConfig: [
-        {
-          type: 'select',
-          label: '能源类型',
-          selectOptions: [],
-          param: 'energyTypeId'
-        },
-        {
-          type: 'select',
-          label: '指标类型',
-          selectOptions: this.getDictDatas(this.DICT_TYPE.MONITOR_INDEX_TYPE),
-          labelField: 'label',
-          valueField: 'value',
-          param: 'limitType'
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: 'separate'
-        },
-        {
-          type: this.$auth.hasPermi('monitoring:energy-limit:create') ? 'button' : '',
-          btnName: '新增',
-          name: 'add',
-          color: 'success',
-          plain: true
-        }
-      ],
-      tableProps,
-      tableBtn: [
-        this.$auth.hasPermi('monitoring:energy-limit:update')
-          ? {
-              type: 'edit',
-              btnName: '编辑'
-            }
-          : undefined,
-        this.$auth.hasPermi('monitoring:energy-limit:delete')
-          ? {
-              type: 'delete',
-              btnName: '删除'
-            }
-          : undefined
-      ].filter((v) => v),
-      tableH: this.tableHeight(260),
-      // 总条数
-      total: 0,
-      // 班次基础信息列表
-      list: [],
-      // 弹出层标题
-      addOrEditTitle: "",
-      // 是否显示弹出层
-      centervisible: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20,
-        energyTypeId: null,
-        limitType: null
-      },
-      energyTypeList: [],
-      typeList: [
-        {label: '合并', value: '1'},
-        {label: '详细', value: '2'}
-      ],
-      objList: []
-    };
-  },
-  created() {
-    this.getList();
-    this.getTypeList()
-    // 获取对象树形结构
-    this.getObjTree()
-  },
-  methods: {
-    getTypeList() {
-      getEnergyTypeListAll().then((res) => {
-        this.formConfig[0].selectOptions = res.data || []
-        this.energyTypeList = res.data || []
-      })
-    },
-    buttonClick(val) {
-      switch (val.btnName) {
-        case 'search':
-          this.queryParams.pageNo = 1;
-          this.queryParams.energyTypeId = val.energyTypeId
-          this.queryParams.limitType = val.limitType
-          this.getList()
-          break
-        default:
-          this.addOrEditTitle = '新增'
-          this.centervisible = true
-          this.$nextTick(() => {
-            this.$refs.energyLimit.init()
-          })
-      }
-    },
-    /** 查询列表 */
-    getList() {
-      getEnergyLimitPage(this.queryParams).then(response => {
-        let arr = response.data.list || [];
-        arr&&arr.map(item => {
-          this.typeList.map(i => {
-            if (item.type === i.value) {
-              item.type = i.label
-            }
-          })
-						if (item.downValue && item.upValue) {
-							item.limitValue = item.downValue + '-' + item.upValue;
-						} else if (item.downValue) {
-							item.limitValue = '最小值' + item.downValue;
-						} else if (item.upValue) {
-							item.limitValue = '最大值' + item.upValue;
-						} else {
-							item.limitValue = '-';
-						}
-        })
-        this.list = arr
-        this.total = response.data.total;
-      });
-    },
-    handleClick(val) {
-      switch (val.type) {
-        case 'edit':
-          this.addOrEditTitle = '编辑'
-          this.$nextTick(() => {
-            this.$refs.energyLimit.init(val.data.id)
-          })
-          this.centervisible = true
-          break
-        default:
-        this.handleDelete(val.data)
-      }
-    },
-    handleCancel() {
-      this.$refs.energyLimit.formClear()
-      this.centervisible = false
-      this.addOrEditTitle = ''
-    },
-    handleConfirm() {
-      this.$refs.energyLimit.submitForm()
-    },
-    successSubmit() {
-      this.handleCancel()
-      this.getList()
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除第"' + row._pageInde + '"的数据项?').then(function() {
-          return deleteEnergyLimit(row.id);
-        }).then(() => {
-          this.queryParams.pageNo = 1;
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    getObjTree() {
-      getTree().then(res => {
-        this.objList = res.data || []
-      })
-    }
-  }
-};
-</script>
diff --git a/src/views/energy/monitoring/energyOverlimitLog/index.vue b/src/views/energy/monitoring/energyOverlimitLog/index.vue
deleted file mode 100644
index 6b389cce..00000000
--- a/src/views/energy/monitoring/energyOverlimitLog/index.vue
+++ /dev/null
@@ -1,268 +0,0 @@
-<template>
-	<div class="app-container energyOverlimitLog">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<el-tabs
-			v-model="activeName"
-			@tab-click="toggleTab">
-			<el-tab-pane
-				label="自动抄表"
-				name="auto"></el-tab-pane>
-			<el-tab-pane
-				label="手动抄表"
-				name="manual"></el-tab-pane>
-		</el-tabs>
-		<!-- 列表 -->
-		<div v-if="activeName === 'auto'">
-			<base-table
-				:page="queryParams.pageNo"
-				:limit="queryParams.pageSize"
-				:table-props="tableProps"
-				:table-data="list"
-				:max-height="tableH" />
-		</div>
-		<div v-if="activeName === 'manual'">
-			<base-table
-				:page="queryParams.pageNo"
-				:limit="queryParams.pageSize"
-				:table-props="tableProps2"
-				:table-data="list2"
-				:max-height="tableH" />
-		</div>
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-	</div>
-</template>
-
-<script>
-import { getEnergyOverlimitLogPage,getEnergyManualLogPage } from '@/api/monitoring/energyOverlimitLog';
-import { getEnergyTypeListAll } from '@/api/base/energyType';
-import { publicFormatter } from '@/utils/dict';
-import { parseTime } from '@/utils/ruoyi';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-const tableProps = [
-	{
-		prop: 'objName',
-		label: '监控对象',
-	},
-	{
-		prop: 'objCode',
-		label: '对象编码',
-	},
-	{
-		prop: 'energyType',
-		label: '能源类型',
-	},
-	{
-		prop: 'type',
-		label: '监控模式',
-	},
-	{
-		prop: 'paramName',
-		label: '监控参数',
-	},
-	{
-		prop: 'limitType',
-		label: '指标类型',
-		filter: publicFormatter('monitor_index_type'),
-	},
-	{
-		prop: 'realityValue',
-		label: '实际值',
-	},
-	{
-		prop: 'limitValue',
-		label: '阈值',
-	},
-	{
-		prop: 'overValue',
-		label: '超出值',
-	},
-	{
-		prop: 'time',
-		label: '提醒时间',
-		filter: parseTime,
-		minWidth: 160,
-	},
-];
-const tableProps2 = [
-	{
-		prop: 'energyType',
-		label: '能源类型',
-	},
-	{
-		prop: 'limitType',
-		label: '指标类型',
-		filter: publicFormatter('monitor_index_type'),
-	},
-	{
-		prop: 'realityValue',
-		label: '实际值',
-	},
-	{
-		prop: 'limitValue',
-		label: '阈值',
-	},
-	{
-		prop: 'overValue',
-		label: '超出值',
-	},
-	{
-		prop: 'time',
-		label: '提醒时间',
-		filter: parseTime,
-		minWidth: 160,
-	},
-];
-export default {
-	name: 'EnergyOverlimitLog',
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-			formConfig: [
-				{
-					type: 'select',
-					label: '能源类型',
-					labelField: 'labelName',
-					selectOptions: [],
-					param: 'energyTypeId',
-				},
-				{
-					type: 'select',
-					label: '指标类型',
-					selectOptions: this.getDictDatas(this.DICT_TYPE.MONITOR_INDEX_TYPE),
-					labelField: 'label',
-					valueField: 'value',
-					param: 'indexType',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-			activeName: 'auto',
-			tableProps,
-			tableProps2,
-			total: 0,
-			list: [],
-			list2: [],
-			heightNum: 300,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				energyTypeId: '',
-				indexType: '',
-				method: '1',
-			},
-			typeList: [
-				{ id: 1, name: '合并' },
-				{ id: 2, name: '详细' },
-			],
-		};
-	},
-	created() {
-		this.getList();
-		this.getTypeList();
-	},
-	methods: {
-		buttonClick(val) {
-			this.queryParams.pageNo = 1;
-			this.queryParams.energyTypeId = val.energyTypeId;
-			this.queryParams.indexType = val.indexType;
-			this.getList();
-		},
-		/** 查询列表 */
-		getList() {
-			(this.queryParams.method === '1'?getEnergyOverlimitLogPage:getEnergyManualLogPage)(this.queryParams).then((response) => {
-				let arr = response.data.list || [];
-				arr &&
-					arr.map((item) => {
-						this.typeList.map((i) => {
-							if (item.type === i.id) {
-								item.type = i.name;
-							}
-						});
-						if (item.downValue && item.upValue) {
-							item.limitValue = item.downValue + '-' + item.upValue;
-						} else if (item.downValue) {
-							item.limitValue = '最小值' + item.downValue;
-						} else if (item.upValue) {
-							item.limitValue = '最大值' + item.upValue;
-						} else {
-							item.limitValue = '';
-						}
-					});
-				if (this.queryParams.method === '1') {
-					this.list = arr;
-					this.list2 = [];
-				} else {
-					this.list2 = arr;
-					this.list1 = [];
-				}
-				this.total = response.data.total;
-			});
-		},
-		getTypeList() {
-			getEnergyTypeListAll().then((res) => {
-				console.log(res);
-				this.formConfig[0].selectOptions = res.data || [];
-			});
-		},
-		toggleTab() {
-			if (this.activeName === 'auto') {
-				this.queryParams.method = '1';
-			} else {
-				this.queryParams.method = '2';
-			}
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-	},
-};
-</script>
-<style lang='scss'>
-.energyOverlimitLog {
-	.el-tabs__nav::after {
-		content: '';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 2px;
-		background-color: #e4e7ed;
-	}
-
-	.el-tabs__nav-wrap::after {
-		width: 0;
-	}
-
-	.el-tabs__item {
-		padding: 0 10px;
-	}
-
-	.el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
-	}
-
-	.el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
-	}
-
-	.searchBarBox {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/src/views/energy/monitoring/energyReport/index.vue b/src/views/energy/monitoring/energyReport/index.vue
deleted file mode 100644
index c1e9b178..00000000
--- a/src/views/energy/monitoring/energyReport/index.vue
+++ /dev/null
@@ -1,184 +0,0 @@
-<template>
-  <div class="app-container" id='energyReportBox'>
-
-    <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      :isFold="isFold"
-      @headBtnClick="buttonClick"
-    />
-    <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-    />
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
-  </div>
-</template>
-
-<script>
-import { energyReportPageAuto, energyReportPageExportAuto } from "@/api/monitoring/energyReport"
-import { getEnergyTypeListAll } from "@/api/base/energyType";
-import { publicFormatter } from '@/utils/dict'
-import { parseTime } from '@/utils/ruoyi'
-const tableProps = [
-  {
-    prop: 'statisticType',
-    label: '统计类型',
-    filter: publicFormatter('statistic_type')
-  },
-  {
-    prop: 'startTime',
-    label: '开始时间',
-    filter: parseTime,
-    minWidth: 150
-  },
-  {
-    prop: 'endTime',
-    label: '结束时间',
-    filter: parseTime,
-    minWidth: 150
-  },
-  {
-    prop: 'statisticName',
-    label: '统计方案'
-  },
-  {
-    prop: 'energyType',
-    label: '能源类型'
-  },
-  {
-    prop: 'startNum',
-    label: '抄表数(起始)'
-  },
-  {
-    prop: 'endNum',
-    label: '抄表数(结束)'
-  },
-  {
-    prop: 'useNum',
-    label: '消耗量'
-  }
-]
-export default {
-  name: "EnergyLimit",
-  data() {
-    return {
-      isFold: false,
-      formConfig: [
-        {
-          type: 'select',
-          label: '能源类型',
-          selectOptions: [],
-          param: 'energyTypeId',
-          filterable: true
-        },
-        {
-          type: 'select',
-          label: '统计类型',
-          selectOptions: this.getDictDatas(this.DICT_TYPE.STATISTIC_TYPE),
-          labelField: 'label',
-          valueField: 'value',
-          param: 'statisticType'
-        },
-        {
-          type: 'datePicker',
-          label: '时间',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "timestamp",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultSelect: [],
-          width: 350
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: 'separate'
-        },
-        {
-          type: this.$auth.hasPermi('monitoring:energy-report:export') ? 'button' : '',
-          btnName: '导出',
-          name: 'add',
-					color: 'warning',
-        }
-      ],
-      tableProps,
-      tableH: this.tableHeight(260),
-      // 总条数
-      total: 0,
-      // 班次基础信息列表
-      list: [],
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20,
-        energyTypeId: null,
-        statisticType: null,
-        startTime: null,
-        endTime: null
-      }
-    };
-  },
-  created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-      this.isFold = this.searchBarWidth('energyReportBox', 1198)
-    })
-    this.getList()
-    this.getTypeList()
-  },
-  mounted() {
-    this.isFold = this.searchBarWidth('energyReportBox', 1198)
-  },
-  methods: {
-    getTypeList() {
-      getEnergyTypeListAll().then((res) => {
-        this.formConfig[0].selectOptions = res.data || []
-        // this.energyTypeList = res.data || []
-      })
-    },
-    buttonClick(val) {
-      switch (val.btnName) {
-        case 'search':
-          this.queryParams.pageNo = 1
-          this.queryParams.energyTypeId = val.energyTypeId
-          this.queryParams.statisticType = val.statisticType
-          this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
-          this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
-          this.getList()
-          break
-        default:
-          this.$modal.confirm('是否确认导出').then(() => {
-              return energyReportPageExportAuto({...this.queryParams});
-            }).then(response => {
-              this.$download.excel(response, '能源统计报表.xls');
-            }).catch(() => {})
-      }
-    },
-    /** 查询列表 */
-    getList() {
-      energyReportPageAuto(this.queryParams).then(response => {
-        this.list = response.data.list || [];
-        this.total = response.data.total;
-      });
-    }
-  }
-};
-</script>
diff --git a/src/views/energy/monitoring/energyReportSearch/index.vue b/src/views/energy/monitoring/energyReportSearch/index.vue
deleted file mode 100644
index 026bd469..00000000
--- a/src/views/energy/monitoring/energyReportSearch/index.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <div class="app-container" id='energyReportSearchBox'>
-
-    <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      :isFold="isFold"
-      @headBtnClick="buttonClick"
-    />
-    <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-    />
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
-  </div>
-</template>
-
-<script>
-import { energyReportPage, energyReportPageExport } from "@/api/monitoring/energyReport";
-import { getEnergyTypeListAll } from "@/api/base/energyType"
-const tableProps = [
-  {
-    prop: 'statisticName',
-    label: '统计方案'
-  },
-  {
-    prop: 'energyType',
-    label: '能源类型'
-  },
-  {
-    prop: 'startValue',
-    label: '抄表数(起始)'
-  },
-  {
-    prop: 'endValue',
-    label: '抄表数(结束)'
-  },
-  {
-    prop: 'diffValue',
-    label: '消耗量'
-  }
-]
-export default {
-  name: "EnergyReportSearch",
-  data() {
-    return {
-      isFold: false,
-      formConfig: [
-        {
-          type: 'input',
-          label: '统计方案',
-          param: 'statisticName'
-        },
-        {
-          type: 'select',
-          label: '能源类型',
-          selectOptions: [],
-          param: 'energyTypeId',
-          filterable: true
-        },
-        {
-          type: 'datePicker',
-          label: '时间(必填)',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "timestamp",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultSelect: [],
-          width: 350,
-          clearable: false
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: 'separate'
-        },
-        {
-          type: this.$auth.hasPermi('monitoring:energy-report-search:export') ? 'button' : '',
-          btnName: '导出',
-          name: 'add',
-					color: 'warning',
-        }
-      ],
-      tableProps,
-      tableH: this.tableHeight(260),
-      // 总条数
-      total: 0,
-      // 班次基础信息列表
-      list: [],
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20,
-        statisticName: null,
-        startTime: null,
-        endTime: null
-      },
-      energyTypeList: []
-    };
-  },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-      this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
-    })
-    if (this.$route.params.startTime && this.$route.params.endTime) {
-      this.formConfig[2].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime]
-    } else {
-      this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
-    }
-    this.queryParams.startTime = this.formConfig[2].defaultSelect[0]
-    this.queryParams.endTime = this.formConfig[2].defaultSelect[1]
-    this.getList()
-    this.getTypeList()
-    this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
-  },
-  watch: {
-    $route: 'initData'
-  },
-  methods: {
-    initData(to) {
-      if (to.name === 'EnergyReportSearch') {
-        if (this.$route.params.startTime && this.$route.params.endTime) {
-          this.formConfig[2].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime]
-        } else {
-          this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
-        }
-        this.queryParams.startTime = this.formConfig[2].defaultSelect[0]
-        this.queryParams.endTime = this.formConfig[2].defaultSelect[1]
-        this.getList()
-      }
-    },
-    getTypeList() {
-      getEnergyTypeListAll().then((res) => {
-        this.formConfig[1].selectOptions = res.data || []
-      })
-    },
-    buttonClick(val) {
-      switch (val.btnName) {
-        case 'search':
-          this.queryParams.pageNo = 1
-          this.queryParams.statisticName = val.statisticName
-          this.queryParams.energyTypeId = val.energyTypeId
-          this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
-          this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
-          this.getList()
-          break
-        default:
-          this.$modal.confirm('是否确认导出').then(() => {
-                return energyReportPageExport({...this.queryParams});
-              }).then(response => {
-                this.$download.excel(response, '能源统计查询报表.xls');
-              }).catch(() => {})
-      }
-    },
-    /** 查询列表 */
-    getList() {
-      energyReportPage({...this.queryParams}).then(response => {
-        this.list = response.data.list || [];
-        this.total = response.data.total;
-      });
-    }
-  }
-};
-</script>
diff --git a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue
deleted file mode 100644
index 0326ec95..00000000
--- a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="方案名称" prop="name">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="方案编码" prop="code">
-          <el-input v-model="form.code" disabled></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="统计类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择" style="width: 100%;">
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.STATISTIC_TYPE)"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="能源类型" prop="energyTypeId">
-          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;">
-            <el-option
-              v-for="item in energyListType"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-<script>
-import { getCode, createEnergyStatistics, updateEnergyStatistics, getEnergyStatistics } from "@/api/monitoring/energyStatistics";
-import { getEnergyTypeListAll } from '@/api/base/energyType'
-import { number } from 'echarts';
-export default {
-  name: 'EnergyStatisticsAdd',
-  data() {
-    return {
-      form: {
-        id: '',
-        name: '',
-        code: '',
-        type: '',
-        energyTypeId: ''
-      },
-      plcList: [],
-      objList: [],
-      isEdit: false, //是否是编辑
-      rules: {
-        name: [{ required: true, message: '方案名称不能为空', trigger: 'blur' }],
-        type: [{ required: true, message: '统计类型不能为空', trigger: 'change' }],
-        energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }]
-      },
-      energyListType: [],
-    }
-  },
-  methods: {
-    init(id) {
-      getEnergyTypeListAll().then((res) => {
-        this.energyListType = res.data || []
-      })
-      if (id) {
-        this.isEdit = true
-        this.form.id = id
-        getEnergyStatistics( id ).then((res) => {
-          if (res.code === 0) {
-            this.form = res.data
-            this.form.type = this.form.type + ''
-          }
-        })
-      } else {
-        getCode().then((res) => {
-          this.form.code = res.data
-        })
-        this.isEdit = false
-        this.form.id = ''
-      }
-    },
-    submitForm() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          if (this.isEdit) {
-            // 编辑
-            updateEnergyStatistics({...this.form}).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          } else {
-            createEnergyStatistics({...this.form}).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    formClear() {
-      this.$refs.form.resetFields()
-      this.isEdit = false
-    }
-  }
-}
-</script>
diff --git a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue
deleted file mode 100644
index 0ab66918..00000000
--- a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue
+++ /dev/null
@@ -1,227 +0,0 @@
-<template>
-  <div>
-    <el-drawer title="参数绑定" :visible.sync="visible" size="70%" @close='closeD'>
-      <div class="box">
-        <el-form :inline="true">
-          <el-form-item label="方案名称">
-            <el-input v-model="name" size='small' readonly></el-input>
-          </el-form-item>
-          <el-form-item label="能源类型">
-            <el-input v-model="energyType" size='small' readonly></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="success" size='small' v-if="showBtn" plain @click="addNew">新增</el-button>
-            <el-button type="danger" size='small' v-if="showBtn" plain @click="deleteAll">批量删除</el-button>
-          </el-form-item>
-        </el-form>
-        <base-table
-          :page="queryParams.pageNo"
-          :limit="queryParams.pageSize"
-          :table-props="tableProps"
-          :table-data="tableData"
-          :max-height="tableH"
-          :selectWidth="55"
-          @selection-change="selectChange"
-        >
-          <method-btn
-            v-if="tableBtn.length"
-            slot="handleBtn"
-            :width="80"
-            label="操作"
-            :method-list="tableBtn"
-            @clickBtn="handleClick"
-          />
-        </base-table>
-        <pagination
-          :page.sync="queryParams.pageNo"
-          :limit.sync="queryParams.pageSize"
-          :total="total"
-          @pagination="getList"
-        />
-      </div>
-    </el-drawer>
-    <!-- 新增 -->
-    <energy-statistics-det-add ref="energyStatistics" @closeDet="closeDet" />
-  </div>
-</template>
-<script>
-import { getEnergyStatisticsDetPage, deleteEnergyStatisticsDet, deleteMany } from '@/api/monitoring/energyStatisticsDet'
-import EnergyStatisticsDetAdd from './energyStatisticsDetAdd'
-import { publicFormatter } from '@/utils/dict'
-const tableProps = [
-  {
-    prop: 'objName',
-    label: '所属对象'
-  },
-  {
-    prop: 'objRemark',
-    label: '对象备注'
-  },
-  {
-    prop: 'paramName',
-    label: '参数名称'
-  },
-  {
-    prop: 'unit',
-    label: '单位',
-    filter: publicFormatter('energy_unit')
-  },
-  {
-    prop: 'desc',
-    label: '描述'
-  }
-]
-export default {
-  name: 'EnergyStatisticsDet',
-  props: {
-    energyTypeList: {
-      type: Array,
-      required: true,
-      default: () => {
-        return []
-      }
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      tableProps,
-      tableData: [],
-      tableBtn: [],
-      tableH: this.tableHeight(115),
-      total: 0,
-      queryParams: {
-        pageNo: 1,
-        pageSize: 30,
-        statisticsId: null
-      },
-      name: '',
-      energyType: '',
-      energyTypeId: '',
-      // 弹出层标题
-      addOrEditTitle: "",
-      // 是否显示弹出层
-      centervisible: false,
-      collectionList: [
-        {value: 0,label: '否'},
-        {value: 1,label: '是'}
-      ],
-      showBtn: true,
-      selectedList: []
-    }
-  },
-  components: { EnergyStatisticsDetAdd },
-  created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(115)
-    })
-  },
-  methods: {
-    init(data,title) {
-      this.visible = true
-      this.queryParams.statisticsId = data.id
-      this.name = data.name
-      this.energyType = data.energyType
-      this.energyTypeId = data.energyTypeId
-      this.getList()
-      if (title === 'detail') {
-        this.showBtn = false
-        this.tableBtn = []
-      } else {
-        this.showBtn = true
-        this.tableBtn = [
-          {
-            type: 'delete',
-            btnName: '删除'
-          }
-        ]
-      }
-    },
-    getList() {
-      console.log(this.queryParams)
-      getEnergyStatisticsDetPage({...this.queryParams}).then((res) => {
-        let arr = res.data.list || []
-        arr&&arr.map(item => {
-          this.collectionList.map(i => {
-            if (item.collection === i.value) {
-              item.collection = i.label
-            }
-          })
-          this.energyTypeList.map(j => {
-            if (item.typeId === j.id) {
-              item.typeId = j.name
-            }
-          })
-        })
-        this.tableData = arr
-        this.total = res.data.total;
-      })
-    },
-    // 新增
-    addNew() {
-      this.$nextTick(() => {
-        this.$refs.energyStatistics.init({'statisticsId': this.queryParams.statisticsId, energyTypeId:this.energyTypeId})
-      })
-    },
-    selectChange(val) {
-      console.log(val)
-      this.selectedList = val
-    },
-    // 批量删除
-    deleteAll() {
-      let arr = []
-      if (this.selectedList.length === 0) {
-        this.$modal.msgWarning("请选勾选数据")
-        return false
-      } else {
-        this.selectedList.map((item) => {
-          arr.push(item.id)
-        })
-      }
-      this.$modal.confirm('是否确认删除所有勾选的数据项?').then(function() {
-          return deleteMany(arr);
-        }).then(() => {
-          this.queryParams.pageNo = 1
-          this.getList()
-          this.$modal.msgSuccess("删除成功")
-        }).catch(() => {})
-    },
-    handleCancel() {
-      this.$refs.energyStatistics.formClear()
-      this.centervisible = false
-      this.addOrEditTitle = ''
-    },
-    handleConfirm() {
-      this.$refs.energyStatistics.submitForm()
-    },
-    successSubmit() {
-      this.handleCancel()
-      this.getList()
-    },
-    handleClick(val) {
-      this.handleDelete(val.data)
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除参数列名为"' + row.paramName + '"的数据项?').then(function() {
-          return deleteEnergyStatisticsDet(row.id);
-        }).then(() => {
-          this.queryParams.pageNo = 1
-          this.getList()
-          this.$modal.msgSuccess("删除成功")
-        }).catch(() => {})
-    },
-    closeD() {
-      this.$emit('closeDrawer')
-    },
-    closeDet() {  // 关闭新增框
-      this.getList()
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.box {
-  padding: 0 32px;
-}
-</style>
diff --git a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue
deleted file mode 100644
index e31166b6..00000000
--- a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-<template>
-  <el-drawer
-    title="新增"
-    :visible.sync="centervisible"
-    size="60%"
-    @close='closeA'>
-    <div class="box">
-      <!-- 搜索工作栏 -->
-      <search-bar
-        :formConfigs="formConfig"
-        ref="searchBarForm"
-        :removeBlue='true'
-        @headBtnClick="buttonClick"
-      />
-      <!-- 列表 -->
-      <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
-        :table-props="tableProps"
-        :table-data="list"
-        :max-height="tableH"
-        :selectWidth="55"
-        @selection-change="selectChange"
-      >
-      </base-table>
-      <pagination
-        :page.sync="queryParams.pageNo"
-        :limit.sync="queryParams.pageSize"
-        :total="total"
-        @pagination="getList"
-      />
-    </div>
-  </el-drawer>
-</template>
-<script>
-import { addParamPage, createEnergyStatisticsDet } from '@/api/monitoring/energyStatisticsDet'
-import { publicFormatter } from '@/utils/dict'
-const tableProps = [
-  {
-    prop: 'objName',
-    label: '所属对象'
-  },
-  {
-    prop: 'objRemark',
-    label: '对象备注'
-  },
-  {
-    prop: 'paramName',
-    label: '参数名称'
-  },
-  {
-    prop: 'unit',
-    label: '单位',
-    filter: publicFormatter('energy_unit')
-  },
-  {
-    prop: 'desc',
-    label: '描述'
-  }
-]
-export default {
-  name: 'EnergyStatisticsDetAdd',
-  data() {
-    return {
-      centervisible: false,
-      formConfig: [
-        {
-          type: 'select',
-          label: '对象类型',
-          selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE),
-          labelField: 'label',
-          valueField: 'value',
-          param: 'objType'
-        },
-        {
-          type: 'input',
-          label: '参数名称',
-          placeholder: '参数名称',
-          param: 'paramName'
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: 'separate'
-        },
-        {
-          type: 'button',
-          btnName: '关联',
-          name: 'add',
-          color: 'primary',
-          plain: true
-        }
-      ],
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20,
-        energyTypeId: null,
-        statisticId: null,
-        paramName: '',
-        objType: ''
-      },
-      tableProps,
-      list: [],
-      total: 0,
-      tableH: this.tableHeight(260),
-      selectedList: []
-    }
-  },
-  methods: {
-    init(param) {
-      this.queryParams.statisticId = param.statisticsId
-      this.queryParams.energyTypeId = param.energyTypeId
-      window.addEventListener('resize', () => {
-        this.tableH = this.tableHeight(260)
-      })
-      this.centervisible = true
-      this.getList()
-    },
-    getList() {
-      addParamPage({...this.queryParams}).then((res) => {
-        this.list = res.data.list || []
-        this.total = res.data.total
-      })
-    },
-    buttonClick(val) {
-      switch (val.btnName) {
-        case 'search':
-          this.queryParams.pageNo = 1;
-          this.queryParams.objType = val.objType
-          this.queryParams.paramName = val.paramName
-          this.getList()
-          break
-        default:
-          // 关联
-          this.connectParam()
-      }
-    },
-    // 选中数据
-    selectChange(val) {
-      this.selectedList = val
-    },
-    // 关联
-    connectParam() {
-      let param = {
-        statisticsId: this.queryParams.statisticId,
-        plcParamIds: []
-      }
-      if (this.selectedList.length === 0) {
-        this.$modal.msgWarning("请选勾选数据")
-        return false
-      } else {
-        this.selectedList.map((item) => {
-          param.plcParamIds.push(item.id)
-        })
-      }
-      createEnergyStatisticsDet({...param}).then((res) => {
-        if (res.code === 0) {
-          this.$modal.msgSuccess("操作成功");
-          this.queryParams.pageNo = 1;
-          this.getList()
-        }
-      })
-    },
-    closeA() {
-      this.$emit('closeDet')
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.box {
-  padding: 0 32px;
-}
-</style>
diff --git a/src/views/energy/monitoring/energyStatistics/index.vue b/src/views/energy/monitoring/energyStatistics/index.vue
deleted file mode 100644
index 87f6aa54..00000000
--- a/src/views/energy/monitoring/energyStatistics/index.vue
+++ /dev/null
@@ -1,245 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
-    <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="160"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
-    <!-- 新增 -->
-    <base-dialog
-      :dialogTitle="addOrEditTitle"
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-    >
-      <energy-statistics-add ref="energyStatistics" @successSubmit="successSubmit" />
-    </base-dialog>
-    <!-- 参数绑定/查看 -->
-    <energy-statistics-det ref="plcParam" @closeDrawer="closeDrawer" :energyTypeList="energyTypeList"></energy-statistics-det>
-  </div>
-</template>
-
-<script>
-import { getEnergyStatisticsPage, deleteEnergyStatistics } from "@/api/monitoring/energyStatistics";
-import { publicFormatter } from '@/utils/dict'
-import { getEnergyTypeListAll } from '@/api/base/energyType'
-import EnergyStatisticsAdd from './components/energyStatisticsAdd'
-import EnergyStatisticsDet from './components/energyStatisticsDet'
-const tableProps = [
-  {
-    prop: 'name',
-    label: '方案名称'
-  },
-  {
-    prop: 'code',
-    label: '方案编码',
-    minWidth: 120,
-    showOverflowtooltip: true
-  },
-  {
-    prop: 'type', 
-    label: '统计类型',
-    filter: publicFormatter('statistic_type')
-  },
-  {
-    prop: 'energyType',
-    label: '能源类型'
-  },
-  {
-    prop: 'paramNum',
-    label: '统计参数数量'
-  },
-  {
-    prop: 'remark',
-    label: '备注'
-  }
-]
-export default {
-  name: "energyStatistics",
-  components: { EnergyStatisticsAdd, EnergyStatisticsDet },
-  data() {
-    return {
-      formConfig: [
-        {
-          type: 'input',
-          label: '方案名称',
-          placeholder: '方案名称',
-          param: 'name'
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: 'separate'
-        },
-        {
-          type: this.$auth.hasPermi('monitoring:energy-statistics:create') ? 'button' : '',
-          btnName: '新增',
-          name: 'add',
-          color: 'success',
-          plain: true
-        }
-      ],
-      tableProps,
-      tableBtn: [
-        this.$auth.hasPermi('monitoring:energy-statistics:bind')
-        ? {
-            type: 'connect',
-            btnName: '绑定'
-          }
-        : undefined,
-        {
-          type: 'detail',
-          btnName: '详情'
-        },
-        this.$auth.hasPermi('monitoring:energy-statistics:update')
-          ? {
-              type: 'edit',
-              btnName: '编辑'
-            }
-          : undefined,
-        this.$auth.hasPermi('monitoring:energy-statistics:delete')
-          ? {
-              type: 'delete',
-              btnName: '删除'
-            }
-          : undefined
-      ].filter((v) => v),
-      tableH: this.tableHeight(260),
-      // 总条数
-      total: 0,
-      // 班次基础信息列表
-      list: [],
-      // 弹出层标题
-      addOrEditTitle: "",
-      // 是否显示弹出层
-      centervisible: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20,
-        name: null
-      },
-      energyTypeList: []
-    };
-  },
-  created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
-    this.getList();
-  },
-  mounted() {
-    // 获取能源列表
-    this.getEnergyTypeList()
-  },
-  methods: {
-    buttonClick(val) {
-      switch (val.btnName) {
-        case 'search':
-          this.queryParams.pageNo = 1;
-          this.queryParams.name = val.name
-          this.getList()
-          break
-        default:
-          this.addOrEditTitle = '新增'
-          this.centervisible = true
-          this.$nextTick(() => {
-            this.$refs.energyStatistics.init()
-          })
-      }
-    },
-    /** 查询列表 */
-    getList() {
-      getEnergyStatisticsPage(this.queryParams).then(response => {
-        let arr = response.data.list || [];
-        this.list = arr
-        this.total = response.data.total;
-      });
-    },
-    handleClick(val) {
-      console.log(val)
-      switch (val.type) {
-        case 'edit':
-          this.addOrEditTitle = '编辑'
-          this.$nextTick(() => {
-            this.$refs.energyStatistics.init(val.data.id)
-          })
-          this.centervisible = true
-          break
-        case 'delete':
-          this.handleDelete(val.data)
-          break
-        case 'detail':
-          this.$nextTick(() => {
-            this.$refs.plcParam.init(val.data, 'detail')
-          })
-          break
-        default:
-          this.$nextTick(() => {
-            this.$refs.plcParam.init(val.data, 'connect')
-          })
-      }
-    },
-    handleCancel() {
-      this.$refs.energyStatistics.formClear()
-      this.centervisible = false
-      this.addOrEditTitle = ''
-    },
-    handleConfirm() {
-      this.$refs.energyStatistics.submitForm()
-    },
-    successSubmit() {
-      this.handleCancel()
-      this.getList()
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除方案名称为"' + row.name + '"的数据项?').then(function() {
-          return deleteEnergyStatistics(row.id);
-        }).then(() => {
-          this.queryParams.pageNo = 1;
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    closeDrawer() {
-      this.getList()
-    },
-    getEnergyTypeList() {
-      getEnergyTypeListAll().then((res) => {
-        this.energyTypeList = res.data || []
-      })
-    }
-  }
-};
-</script>
diff --git a/src/views/equipment/analysis/efficiency/components/pieChart.vue b/src/views/equipment/analysis/efficiency/components/pieChart.vue
deleted file mode 100644
index 87d138ef..00000000
--- a/src/views/equipment/analysis/efficiency/components/pieChart.vue
+++ /dev/null
@@ -1,288 +0,0 @@
-<!--
-    filename: pieChart.vue
-    author: liubin
-    date: 2023-09-06 15:02:49
-    description: 饼图
--->
-
-<template>
-	<div class="chart-grid-item" style="overflow: inherit">
-		<div
-			class="pie-chart"
-			ref="pieChart"
-			style="overflow: inherit"
-			:data-eqname="value.equipmentName || 'Default'"></div>
-		<div class="data-view">
-			<div class="data-view__item">
-				<!-- <div class="data-view__item__value">111</div> -->
-				<div class="data-view__item__value">{{ textData.workTime }}</div>
-				<div class="data-view__item__title blue">工作时长</div>
-			</div>
-			<div class="data-view__item">
-				<!-- <div class="data-view__item__value">22</div> -->
-				<div class="data-view__item__value">{{ textData.stopTime }}</div>
-				<div class="data-view__item__title green">停机时长</div>
-			</div>
-			<div class="data-view__item">
-				<!-- <div class="data-view__item__value">10</div> -->
-				<div class="data-view__item__value">{{ textData.downTime }}</div>
-				<div class="data-view__item__title purple">故障时长</div>
-			</div>
-			<div class="data-view__item">
-				<!-- <div class="data-view__item__value">100%</div> -->
-				<div class="data-view__item__value">{{ textData.peEfficiency }}</div>
-				<div class="data-view__item__title yellow">速度开动率</div>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-import * as echarts from 'echarts';
-
-export default {
-	name: 'pieChart',
-	components: {},
-	props: ['value'],
-	data() {
-		return {
-			chart: null,
-			textData: {
-				workTime: '',
-				downTime: '',
-				stopTime: '',
-				peEfficiency: '',
-			},
-			config: {
-				title: {
-					text: '产线1', //<=========
-					top: '35%',
-					left: '49%',
-					textAlign: 'center',
-					textStyle: {
-						fontSize: 18,
-					},
-					subtext: '设备', //<=========
-					subtextStyle: {
-						fontSize: 13,
-					},
-				},
-				color: ['#3da8fd', '#8ef0ab', '#6b5cfd', '#FFC72A', 'transparent'],
-				grid: {
-					top: 0,
-					left: 0,
-					right: 0,
-					bottom: 0,
-				},
-				tooltip: {
-					trigger: 'item',
-				},
-				legend: {
-					show: false,
-					top: '0%',
-					left: 'center',
-					textStyle: {
-						fontSize: 10,
-					},
-					itemWidth: 10,
-					itemHeight: 10,
-				},
-				series: [
-					// 嵌套环形图
-					{
-						// 外环
-						name: '',
-						type: 'pie',
-						radius: ['75%', '90%'],
-						center: ['50%', '48%'],
-						label: {
-							show: false,
-						},
-						data: [
-							//<=========
-							{ name: '工作时长', value: 1048 },
-							{ name: '停机时长', value: 735 },
-							{ name: '故障时长', value: 580 },
-						],
-					},
-					{
-						// 内环
-						name: '',
-						type: 'pie',
-						center: ['50%', '48%'],
-						radius: ['60%', '75%'],
-						itemStyle: {
-							borderRadius: 10,
-						},
-						label: {
-							show: false,
-						},
-						data: [
-							//<=========
-							{ name: '总', value: 3000 },
-							{ name: '', value: 1400 },
-						],
-					},
-					// {
-					// 	name: this.value.equipmentName || 'Default',
-					// 	type: 'pie',
-					// 	radius: ['40%', '75%'],
-					// 	avoidLabelOverlap: false,
-					// 	label: {
-					// 		show: false,
-					// 		position: 'center',
-					// 	},
-					// 	data: ['workTime', 'stopTime', 'downTime'].map((v, index) => ({
-					// 		name: ['工作时长', '停机时长', '故障时长'][index],
-					// 		value: this.value[v],
-					// 	})),
-					// 	// data: [
-					// 	// 	{ value: 1048, name: 'Search Engine' },
-					// 	// 	{ value: 735, name: 'Direct' },
-					// 	// 	{ value: 580, name: 'Email' },
-					// 	// 	{ value: 484, name: 'Union Ads' },
-					// 	// 	{ value: 300, name: 'Video Ads' },
-					// 	// ],
-					// },
-				],
-			},
-		};
-	},
-	mounted() {
-		console.log('value', this.value);
-		if (!this.chart) {
-			this.chart = echarts.init(this.$refs.pieChart);
-			this.$nextTick(() => {
-				this.chart.setOption(this.config);
-			});
-		}
-	},
-	beforeDestroy() {
-		if (this.chart) this.chart.dispose();
-	},
-	watch: {
-		value: {
-			handler(val) {
-				this.updateConfig(val);
-				if (this.chart) this.chart.setOption(this.config);
-			},
-			deep: true,
-			immediate: true,
-		},
-	},
-	methods: {
-		updateConfig(item) {
-			const {
-				lineName, // 产线
-				equipmentName, // 设备
-				downTime, // 故障时长(h)
-				stopTime, // 停机时长(h)
-				workTime, // 工作时长(h)
-				peEfficiency, // 速度开动率
-				timeEfficiency, // 时间开动率
-				//===============//
-				sectionName,
-				workRate,
-				stopRate,
-				downRate,
-				realProcSpeed,
-				designProcSpeed,
-				oee,
-				teep,
-				downCount,
-				mtbf,
-				mttr,
-			} = item;
-			this.config.title.text = lineName;
-			// 找到第一个 '-' 的位置
-			let firstDashIndex = equipmentName.indexOf('-');
-			// 找到第二个 '-' 的位置
-			let secondDashIndex = equipmentName.indexOf('-', firstDashIndex + 1);
-			// 截取第二个 '-' 后面的字符串
-			let result = equipmentName.substring(secondDashIndex + 1);
-			this.config.title.subtext = result ? result : '-';
-
-			this.config.series[0].data = [
-				{ name: '工作时长', value: workTime ? workTime.toFixed(2) : '0.00' },
-				{ name: '停机时长', value: stopTime ? stopTime.toFixed(2) : '0.00' },
-				{ name: '故障时长', value: downTime ? downTime.toFixed(2) : '0.00' },
-			];
-			this.config.series[1].data = [
-				{
-					name: '速度开动率',
-					value: peEfficiency ? peEfficiency.toFixed(2) : '0.00',
-				},
-				{ name: '', value: Math.ceil(peEfficiency) - peEfficiency },
-			];
-			this.textData = {
-				workTime: workTime ? workTime.toFixed(2) : '0.00',
-				stopTime: stopTime ? stopTime.toFixed(2) : '0.00',
-				downTime: downTime ? downTime.toFixed(2) : '0.00',
-				peEfficiency: peEfficiency ? peEfficiency.toFixed(2) : '0.00',
-			};
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.chart-grid-item {
-	padding: 12px;
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-}
-
-.pie-chart {
-	height: 1px;
-	width: 100%;
-	flex: 1;
-	padding: 12px;
-	position: relative;
-}
-
-.data-view {
-	display: flex;
-	justify-content: center;
-}
-
-.data-view__item {
-	display: flex;
-	flex-direction: column;
-	text-align: center;
-	align-items: center;
-	user-select: none;
-	padding: 0 6px;
-}
-
-.data-view__item:not(:last-child) {
-	border-right: 1px solid #f1f1f1;
-}
-
-.data-view__item__value {
-	font-size: 16px;
-	line-height: 24px;
-}
-
-.data-view__item__title {
-	font-size: 8px;
-	line-height: 14px;
-}
-
-.blue {
-	color: #3da8fd;
-}
-
-.green {
-	color: #8ef0ab;
-}
-
-.purple {
-	color: #6b5cfd;
-}
-
-.yellow {
-	color: #ffc72a;
-}
-</style>
diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue
deleted file mode 100644
index 4447ec70..00000000
--- a/src/views/equipment/analysis/efficiency/index.vue
+++ /dev/null
@@ -1,629 +0,0 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-09-04 09:34:52
-    description: 设备效率分析
--->
-
-<template>
-	<div class="app-container allow-overflow">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<el-row>
-			<el-col class="custom-tabs">
-				<el-tabs
-					v-model="activeName"
-					:stretch="true"
-					@tab-click="handleTabClick">
-					<el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
-						<!-- 列表 -->
-						<base-table
-							class="base-table__margin"
-							:table-props="tableProps"
-							:page="1"
-							:limit="999"
-							:table-data="list"
-							:max-height="tableH"
-							@emitFun="handleEmitFun"></base-table>
-					</el-tab-pane>
-					<el-tab-pane
-						:label="'\u3000可视化\u3000'"
-						name="graph"
-						style="overflow: inherit">
-						<div
-							v-if="activeName == 'graph'"
-							class="graph"
-							style="
-								overflow: inherit;
-								display: flex;
-								flex-direction: column;
-								position: relative;
-							">
-							<div class="blue-title">各设备加工数量</div>
-							<div class="legend">
-								<div class="legend-item">
-									<span class="icon blue"></span>
-									<span class="text">工作时长</span>
-								</div>
-								<div class="legend-item">
-									<span class="icon green"></span>
-									<span class="text">停机时长</span>
-								</div>
-								<div class="legend-item">
-									<span class="icon purple"></span>
-									<span class="text">故障时长</span>
-								</div>
-								<div class="legend-item">
-									<span class="icon yellow"></span>
-									<span class="text">速度开动率</span>
-								</div>
-							</div>
-							<div class="graph-grid">
-								<div class="bg-grid grid-line">
-									<div
-										class="grid-item"
-										v-for="item in list.length"
-										:key="item"></div>
-								</div>
-
-								<div class="bg-grid grid-charts">
-									<pie-chart
-										v-for="item in list"
-										:key="item.id"
-										:value="item" />
-									<!-- <pie-chart v-for="item in 5" :key="item" :value="item" /> -->
-								</div>
-							</div>
-						</div>
-					</el-tab-pane>
-				</el-tabs>
-			</el-col>
-		</el-row>
-	</div>
-</template>
-
-<script>
-// import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import PieChart from './components/pieChart.vue';
-import { parseTime } from '@/filter/code-filter';
-
-export default {
-	name: 'EfficiencyAnalysis',
-	mixins: [basicPageMixin, tableHeightMixin],
-	components: { PieChart },
-	props: {},
-	data() {
-		return {
-			activeName: 'table',
-			open: false,
-			visualizationOpen: false,
-			trendOpen: false,
-			// tableBtn: [
-			// 	this.$auth.hasPermi('base:equipment-group:update')
-			// 		? {
-			// 				type: 'edit',
-			// 				btnName: '修改',
-			// 		  }
-			// 		: undefined,
-			// 	this.$auth.hasPermi('base:equipment-group:delete')
-			// 		? {
-			// 				type: 'delete',
-			// 				btnName: '删除',
-			// 		  }
-			// 		: undefined,
-			// ].filter((v) => v),
-			tableProps: [
-				{ prop: 'factoryName', label: '工厂' },
-				{ prop: 'lineName', label: '产线' },
-				{
-					prop: 'sectionName',
-					width: 120,
-					showOverflowtooltip: true,
-					label: '工段',
-				},
-				{
-					prop: 'equipmentName',
-					width: 150,
-					showOverflowtooltip: true,
-					label: '设备',
-				},
-				{
-					label: '有效时间',
-					children: [
-						{
-							width: 128,
-							prop: 'workTime',
-							label: '工作时长[h]',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'),
-						},
-						{
-							width: 128,
-							prop: 'workRate',
-							label: '百分比[%]',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'),
-						},
-					],
-				},
-				{
-					label: '关机时间',
-					children: [
-						{
-							width: 128,
-							prop: 'stopTime',
-							label: '停机时长[h]',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'),
-						},
-						{
-							width: 128,
-							prop: 'stopRate',
-							label: '百分比[%]',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'),
-						},
-					],
-				},
-				{
-					label: '中断损失',
-					children: [
-						{
-							width: 128,
-							prop: 'downTime',
-							label: '故障时长[h]',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'),
-						},
-						{
-							width: 128,
-							prop: 'downRate',
-							label: '百分比[%]',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'),
-						},
-						{
-							width: 128,
-							prop: 'timeEfficiency',
-							label: '时间开动率',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'),
-						},
-					],
-				},
-				{
-					label: '速度损失',
-					children: [
-						{
-							width: 128,
-							prop: 'realProcSpeed',
-							label: '实际加工速度',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'),
-						},
-						{
-							width: 128,
-							prop: 'designProcSpeed',
-							label: '理论加工速度',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'),
-						},
-						{
-							width: 128,
-							prop: 'peEfficiency',
-							label: '速度开动率',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'),
-						},
-					],
-				},
-				// {
-				// 	prop: 'oee',
-				// 	label: 'OEE',
-				// 	filter: (val) => (val != null ? val.toFixed(2) : '-'),
-				// },
-				{
-					prop: 'teep',
-					label: '设备生产能效比例',
-					filter: (val) => (val != null ? val.toFixed(2) : '-'),
-				},
-				// {
-				// 	_action: 'view-trend',
-				// 	label: '趋势',
-				// 	,
-				// 	subcomponent: {
-				// 		props: ['injectData'],
-				// 		render: function (h) {
-				// 			const _this = this;
-				// 			return h(
-				// 				'el-button',
-				// 				{
-				// 					props: { type: 'text' },
-				// 					on: {
-				// 						click: function () {
-				// 							console.log('inejctdata', _this.injectData);
-				// 							_this.$emit('emitData', {
-				// 								action: _this.injectData._action,
-				// 								// value: _this.injectData.id,
-				// 								value: _this.injectData,
-				// 							});
-				// 						},
-				// 					},
-				// 				},
-				// 				'查看趋势'
-				// 			);
-				// 		},
-				// 	},
-				// },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					placeholder: '请选择工厂',
-					param: 'factoryId',
-					selectOptions: [],
-				},
-				{
-					type: 'select',
-					label: '产线',
-					placeholder: '请选择产线',
-					param: 'lineId',
-					selectOptions: [],
-				},
-				// 选项切换
-				{
-					type: 'select',
-					label: '时间类型',
-					param: 'dateFilterType',
-					defaultSelect: 0,
-					selectOptions: [
-						{ id: 0, name: '按时间段' },
-						{ id: 1, name: '按日期' },
-					],
-					index: 2,
-					extraOptions: [
-						{
-							parent: 'dateFilterType',
-							// 时间段选择
-							type: 'datePicker',
-							// label: '时间段',
-							dateType: 'daterange',
-							format: 'yyyy-MM-dd',
-							valueFormat: 'yyyy-MM-dd HH:mm:ss',
-							defaultTime: ['00:00:00', '00:00:00'],
-							rangeSeparator: '-',
-							startPlaceholder: '开始时间',
-							endPlaceholder: '结束时间',
-							param: 'timerange',
-						},
-						{
-							parent: 'dateFilterType',
-							// 日期选择
-							type: 'datePicker',
-							// label: '日期',
-							dateType: 'date',
-							placeholder: '选择日期',
-							format: 'yyyy-MM-dd',
-							valueFormat: 'yyyy-MM-dd',
-							param: 'timeday',
-						},
-					],
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '设备可视化',
-				// 	name: 'visualization',
-				// 	plain: true,
-				// 	color: 'success',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: 'OEE',
-				// 	name: 'add',
-				// 	plain: true,
-				// 	color: 'success',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: 'TEEP',
-				// 	name: 'add',
-				// 	plain: true,
-				// 	color: 'warning',
-				// },
-			],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				lineId: null,
-				factoryId: null,
-				recordTime: [],
-			},
-			// 表单参数
-			form: {},
-			list: [],
-		};
-	},
-	created() {
-		const end = new Date();
-		const start = new Date();
-		start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
-		this.queryParams.recordTime[0] =
-			parseTime(start).substr(0, 10) + ' 00:00:00';
-		this.queryParams.recordTime[1] = parseTime(end).substr(0, 10) + ' 00:00:00';
-		this.$nextTick(() => {
-			this.searchBarFormConfig[2].extraOptions[0].startPlaceholder = parseTime(
-				start
-			).substr(0, 10);
-			this.searchBarFormConfig[2].extraOptions[0].endPlaceholder = parseTime(
-				end
-			).substr(0, 10);
-		});
-		this.getFactory();
-		this.getLine();
-		this.getList();
-	},
-	methods: {
-		/** 准备工厂数据 */
-		async getFactory() {
-			const { code, data } = await this.$axios({
-				url: '/base/factory/listAll',
-				method: 'get',
-			});
-			if (code == 0) {
-				this.searchBarFormConfig[0].selectOptions = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-
-		/** 准备产线数据 */
-		async getLine() {
-			const { code, data } = await this.$axios({
-				url: '/base/production-line/listAll',
-				method: 'get',
-			});
-			if (code == 0) {
-				this.searchBarFormConfig[1].selectOptions = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-
-		/** 覆盖 handleEmitFun 的默认实现 */
-		handleEmitFun({ action, value }) {
-			switch (action) {
-				case 'view-trend':
-					const { id } = value;
-					this.open = true;
-					this.trendOpen = true;
-					break;
-			}
-		},
-		/** 查询列表 */
-		async getList() {
-			this.loading = true;
-			this.list = [];
-			const { code, data } = await this.$axios({
-				url: '/analysis/equipment-analysis/efficiency',
-				method: 'get',
-				params: this.queryParams,
-			});
-			if (code == 0) {
-				this.list = data;
-			}
-		},
-
-		handleSearchBarBtnClick({ btnName, ...payload }) {
-			if (btnName == 'visualization') {
-				// 可视化
-				this.visualizationOpen = true;
-				this.open = true;
-			}
-			if (btnName == 'search') {
-				this.queryParams.factoryId = payload.factoryId || null;
-				this.queryParams.lineId = payload.lineId || null;
-				if (0 == payload.dateFilterType) {
-					if (payload.timerange) {
-						this.searchBarFormConfig[2].extraOptions[0].startPlaceholder =
-							'开始时间';
-						this.searchBarFormConfig[2].extraOptions[0].endPlaceholder =
-							'结束时间';
-						this.queryParams.recordTime = payload.timerange;
-					}
-				} else if (1 == payload.dateFilterType) {
-					this.searchBarFormConfig[2].extraOptions[0].startPlaceholder =
-						'开始时间';
-					this.searchBarFormConfig[2].extraOptions[0].endPlaceholder =
-						'结束时间';
-					if (payload.timeday) {
-						this.queryParams.recordTime = [
-							`${payload.timeday} 00:00:00`,
-							`${payload.timeday} 23:59:59`,
-						];
-					} else {
-						this.queryParams.recordTime = null;
-					}
-				}
-			} else {
-				this.queryParams.recordTime = null;
-			}
-			this.getList();
-		},
-
-		cancel() {
-			this.open = false;
-		},
-
-		closed() {
-			this.visualizationOpen = false;
-			this.trendOpen = false;
-		},
-
-		submitForm() {},
-
-		handleTabClick() {},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.visualization {
-	display: grid;
-	grid-template-columns: repeat(3, minmax(240px, 1fr));
-}
-
-:deep(.custom-tabs) {
-	.el-tabs__header {
-		margin-bottom: 8px;
-		display: inline-block;
-		transform: translateY(-12px);
-	}
-
-	.el-tabs__content {
-		overflow: visible;
-	}
-
-	.el-tabs__item {
-		padding-left: 0 !important;
-		padding-right: 0 !important;
-		line-height: 36px !important;
-		height: 36px;
-	}
-}
-
-.blue-title {
-	position: relative;
-	padding: 4px 0;
-	padding-left: 12px;
-	font-size: 14px;
-
-	&::before {
-		content: '';
-		position: absolute;
-		left: 0;
-		top: 6px;
-		height: 16px;
-		width: 4px;
-		border-radius: 1px;
-		background: #0b58ff;
-	}
-}
-
-.graph-grid {
-	margin-top: 8px;
-	padding: 12px;
-	position: relative;
-	border-radius: 12px;
-	border: 1px solid #ccc;
-	// background: #0003;
-	overflow: inherit;
-}
-.bg-grid {
-	display: grid;
-	place-content: center;
-	grid-template-columns: repeat(4, minmax(280px, 1fr));
-	grid-auto-columns: 280px;
-	grid-auto-rows: 290px;
-	overflow: inherit;
-	position: relative;
-}
-
-.grid-line::after {
-	content: '';
-	position: absolute;
-	top: -1px;
-	left: -1px;
-	width: calc(100% + 2px);
-	height: calc(100% + 2px);
-	display: inline-block;
-	border: 8px solid #fff;
-}
-
-.grid-charts {
-	position: absolute;
-	width: calc(100% - 24px);
-	top: 12px;
-	left: 12px;
-}
-
-.grid-item {
-	border: 1px solid #ccc;
-}
-
-.grid-item:not(:first-child) {
-	border-left: 0;
-	border-top: 0;
-}
-
-.legend {
-	position: absolute;
-	top: 8px;
-	right: 12px;
-	display: flex;
-}
-
-.legend .legend-item {
-	display: flex;
-	align-items: center;
-	margin-left: 12px;
-}
-
-.legend .legend-item .icon {
-	width: 10px;
-	height: 10px;
-	border-radius: 1px;
-	margin-right: 4px;
-	margin-top: 1px;
-}
-
-.legend .legend-item .text {
-	color: #8c8c8c;
-}
-
-.blue {
-	background-color: #3da8fd;
-}
-
-.green {
-	background-color: #8ef0ab;
-}
-
-.purple {
-	background-color: #6b5cfd;
-}
-
-.yellow {
-	background-color: #ffc72a;
-}
-
-@media screen and (max-width: 1390px) {
-	.bg-grid {
-		grid-template-columns: repeat(3, minmax(280px, 1fr));
-	}
-}
-
-@media screen and (max-width: 1190px) {
-	.bg-grid {
-		grid-template-columns: repeat(2, minmax(280px, 1fr));
-	}
-}
-
-@media screen and (max-width: 640px) {
-	.bg-grid {
-		grid-template-columns: repeat(1, minmax(280px, 1fr));
-	}
-}
-</style>
diff --git a/src/views/equipment/analysis/exception/index.vue b/src/views/equipment/analysis/exception/index.vue
deleted file mode 100644
index fe036697..00000000
--- a/src/views/equipment/analysis/exception/index.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-09-04 09:34:52
-    description: 设备异常分析
--->
-
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			:max-height="tableH"
-			@emitFun="handleEmitFun">
-			<!-- <method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" /> -->
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-	</div>
-</template>
-
-<script>
-import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-
-export default {
-	name: 'ExceptionAnalysis',
-	mixins: [basicPageMixin, tableHeightMixin],
-	components: {},
-	props: {},
-	data() {
-		return {
-			searchBarKeys: ['name', 'code'],
-			// tableBtn: [
-			// 	this.$auth.hasPermi('base:equipment-group:update')
-			// 		? {
-			// 				type: 'edit',
-			// 				btnName: '修改',
-			// 		  }
-			// 		: undefined,
-			// 	this.$auth.hasPermi('base:equipment-group:delete')
-			// 		? {
-			// 				type: 'delete',
-			// 				btnName: '删除',
-			// 		  }
-			// 		: undefined,
-			// ].filter((v) => v),
-			tableBtn: [
-				{
-					type: 'edit',
-					btnName: '修改',
-				},
-				{
-					type: 'delete',
-					btnName: '删除',
-				},
-			],
-			tableProps: [
-				{ prop: 'lineName', label: '产线' },
-				{ prop: 'sectionName', label: '工段' },
-				{ prop: 'equipmentName', label: '设备' },
-				{
-					width: 240,
-					prop: 'mtbf',
-					label: '平均故障间隔时间[MTBF](h)',
-          filter: (val) => (val != null ? val.toFixed(2) : '-'),
-				},
-				{
-					width: 240,
-					prop: 'mttr',
-					label: '平均维修时间[MTTR](h)',
-          filter: (val) => (val != null ? val.toFixed(2) : '-'),
-				},
-				{ width: 128, prop: 'workTime', label: '工作时长(h)',
-        filter: (val) => (val != null ? val.toFixed(2) : '-'), },
-				{ width: 128, prop: 'downTime', label: '故障时长(h)',
-        filter: (val) => (val != null ? val.toFixed(2) : '-'), },
-				{ prop: 'downCount', label: '故障次数' },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '请选择月份',
-					placeholder: '请选择月份',
-					param: 'month',
-					selectOptions: Array(12)
-						.fill(0)
-						.map((v, i) => ({
-							id: i + 1,
-							name: `${i + 1}月`,
-						})),
-				},
-				{
-					__index: 'line',
-					type: 'select',
-					label: '产线',
-					placeholder: '请选择产线',
-					param: 'lineId',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				lineId: null,
-				factoryId: null,
-				recordTime: null,
-			},
-		};
-	},
-	computed: {},
-	created() {
-		this.fillLineOptions();
-	},
-	methods: {
-		async fillLineOptions() {
-			const { data } = await this.$axios({
-				url: '/base/production-line/listAll',
-				method: 'get',
-			});
-			const cfg = this.searchBarFormConfig.find(
-				(item) => item.__index == 'line'
-			);
-			this.$set(
-				cfg,
-				'selectOptions',
-				data.map((item) => ({
-					id: item.id,
-					name: item.name,
-				}))
-			);
-		},
-
-		async getList() {
-			this.loading = true;
-			// 执行查询
-			const { code, data } = await this.$axios({
-				url: '/analysis/equipment-analysis/efficiency',
-				method: 'get',
-				params: {
-					lineId: this.queryParams.lineId || null,
-					recordTime: this.queryParams.recordTime || null,
-				},
-			});
-			if (code === 0) {
-				this.list = data;
-			} else {
-				this.list.splice(0);
-			}
-		},
-
-		handleSearchBarBtnClick(btn) {
-			switch (btn.btnName) {
-				case 'search':
-					if (btn.month) {
-						this.queryParams.recordTime = [
-							moment()
-								.month(btn.month - 1)
-								.format('YYYY-MM') + '-01 00:00:00',
-							moment().month(btn.month).format('YYYY-MM') + '-01 00:00:00',
-						];
-					} else {
-						this.queryParams.recordTime = null;
-					}
-					this.queryParams.lineId = btn.lineId || null;
-					this.handleQuery();
-					break;
-			}
-		},
-
-		/** 搜索按钮操作 */
-		handleQuery() {
-			// this.queryParams.pageNo = 1;
-			this.getList();
-		},
-
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss"></style>
diff --git a/src/views/equipment/analysis/quality/components/data.js b/src/views/equipment/analysis/quality/components/data.js
deleted file mode 100644
index db60d5f1..00000000
--- a/src/views/equipment/analysis/quality/components/data.js
+++ /dev/null
@@ -1,2323 +0,0 @@
-const edata = [
-      {
-          "equipmentId": 1,
-          "equipmentName": "1-穿梭机",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 1,
-          "sectionName": "1-穿梭机",
-          "inQuantity": 0,
-          "outQuantity": 1653,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 1653,
-          "passRate": 0.0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 2,
-          "equipmentName": "1-上片机械手1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 2,
-          "sectionName": "1-上片",
-          "inQuantity": 4658,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 3,
-          "equipmentName": "1-上片机械手2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 2,
-          "sectionName": "1-上片",
-          "inQuantity": -61292,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 4,
-          "equipmentName": "1-上片机械手3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 2,
-          "sectionName": "1-上片",
-          "inQuantity": 4224,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 5,
-          "equipmentName": "1-磨边机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 3,
-          "sectionName": "1-磨边",
-          "inQuantity": 5029,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 6,
-          "equipmentName": "1-磨边机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 3,
-          "sectionName": "1-磨边",
-          "inQuantity": 4777,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 7,
-          "equipmentName": "1-磨边机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 3,
-          "sectionName": "1-磨边",
-          "inQuantity": 4994,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 8,
-          "equipmentName": "1-磨边清洗机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 4,
-          "sectionName": "1-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 9,
-          "equipmentName": "1-磨边清洗机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 4,
-          "sectionName": "1-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 10,
-          "equipmentName": "1-磨边清洗机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 4,
-          "sectionName": "1-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 11,
-          "equipmentName": "1-打孔机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 5,
-          "sectionName": "1-打孔",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 12,
-          "equipmentName": "1-打孔机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 5,
-          "sectionName": "1-打孔",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 13,
-          "equipmentName": "1-打孔机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 5,
-          "sectionName": "1-打孔",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 14,
-          "equipmentName": "1-打孔清洗机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 6,
-          "sectionName": "1-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 15,
-          "equipmentName": "1-打孔清洗机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 6,
-          "sectionName": "1-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 16,
-          "equipmentName": "1-打孔清洗机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 6,
-          "sectionName": "1-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 17,
-          "equipmentName": "1-丝印机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 7,
-          "sectionName": "1-丝印",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 18,
-          "equipmentName": "1-丝印机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 7,
-          "sectionName": "1-丝印",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 19,
-          "equipmentName": "1-丝印机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 7,
-          "sectionName": "1-丝印",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 20,
-          "equipmentName": "1-一次固化机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 8,
-          "sectionName": "1-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 14785,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 14785,
-          "passRate": 0.0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 21,
-          "equipmentName": "1-一次固化机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 8,
-          "sectionName": "1-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 22,
-          "equipmentName": "1-一次固化机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 8,
-          "sectionName": "1-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 23,
-          "equipmentName": "1-钢化炉",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 9,
-          "sectionName": "1-钢化",
-          "inQuantity": 0,
-          "outQuantity": 14786,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 14786,
-          "passRate": 0.0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 24,
-          "equipmentName": "1-包装清洗机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 10,
-          "sectionName": "1-包装清洗",
-          "inQuantity": 10274,
-          "outQuantity": 10271,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 10271,
-          "passRate": 1.0002921,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 25,
-          "equipmentName": "1-包装清洗机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 10,
-          "sectionName": "1-包装清洗",
-          "inQuantity": 4508,
-          "outQuantity": 4508,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 4508,
-          "passRate": 1.0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 26,
-          "equipmentName": "1-铺纸机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 27,
-          "equipmentName": "1-铺纸机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 28,
-          "equipmentName": "1-下片机械手1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 0,
-          "outQuantity": 2903,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 2903,
-          "passRate": 0.0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 29,
-          "equipmentName": "1-下片机械手2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 0,
-          "outQuantity": 5688,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5688,
-          "passRate": 0.0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 30,
-          "equipmentName": "1-下片机械手3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 0,
-          "outQuantity": 6168,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6168,
-          "passRate": 0.0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 31,
-          "equipmentName": "1-质检仪1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 3,
-          "sectionName": "1-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 507,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 32,
-          "equipmentName": "1-桥检1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 58,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 33,
-          "equipmentName": "1-桥检2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 12,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 286,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 34,
-          "equipmentName": "2-穿梭机",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 13,
-          "sectionName": "2-穿梭机",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 35,
-          "equipmentName": "2-上片机械手1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 14,
-          "sectionName": "2-上片",
-          "inQuantity": -60113,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 36,
-          "equipmentName": "2-上片机械手2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 14,
-          "sectionName": "2-上片",
-          "inQuantity": -60752,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 37,
-          "equipmentName": "2-上片机械手3",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 14,
-          "sectionName": "2-上片",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 38,
-          "equipmentName": "2-磨边机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 15,
-          "sectionName": "2-磨边",
-          "inQuantity": 5186,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 39,
-          "equipmentName": "2-磨边机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 15,
-          "sectionName": "2-磨边",
-          "inQuantity": 5017,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 40,
-          "equipmentName": "2-磨边清洗机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 16,
-          "sectionName": "2-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 5160,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5160,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 41,
-          "equipmentName": "2-磨边清洗机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 16,
-          "sectionName": "2-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 4990,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 4990,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 42,
-          "equipmentName": "2-打孔机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 17,
-          "sectionName": "2-打孔",
-          "inQuantity": 0,
-          "outQuantity": 5146,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5146,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 43,
-          "equipmentName": "2-打孔机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 17,
-          "sectionName": "2-打孔",
-          "inQuantity": 4952,
-          "outQuantity": 4952,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 4952,
-          "passRate": 1.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 44,
-          "equipmentName": "2-打孔清洗机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 18,
-          "sectionName": "2-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 5145,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5145,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 45,
-          "equipmentName": "2-打孔清洗机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 18,
-          "sectionName": "2-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 4950,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 4950,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 46,
-          "equipmentName": "2-丝印机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 19,
-          "sectionName": "2-丝印",
-          "inQuantity": 5144,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 47,
-          "equipmentName": "2-丝印机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 19,
-          "sectionName": "2-丝印",
-          "inQuantity": 4944,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 48,
-          "equipmentName": "2-二次固化机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 20,
-          "sectionName": "2-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 5145,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5145,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 49,
-          "equipmentName": "2-二次固化机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 20,
-          "sectionName": "2-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 4949,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 4949,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 50,
-          "equipmentName": "2-钢化炉",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 21,
-          "sectionName": "2-钢化",
-          "inQuantity": 10091,
-          "outQuantity": 10081,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 10081,
-          "passRate": 1.000992,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 51,
-          "equipmentName": "2-包装清洗机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 22,
-          "sectionName": "2-包装清洗",
-          "inQuantity": 10056,
-          "outQuantity": 10081,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 10081,
-          "passRate": 0.9975201,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 52,
-          "equipmentName": "2-铺纸机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 23,
-          "sectionName": "2-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 53,
-          "equipmentName": "2-铺纸机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 23,
-          "sectionName": "2-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 54,
-          "equipmentName": "2-下片机械手1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 23,
-          "sectionName": "2-包装",
-          "inQuantity": 0,
-          "outQuantity": 4880,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 4880,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 55,
-          "equipmentName": "2-下片机械手2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 23,
-          "sectionName": "2-包装",
-          "inQuantity": 0,
-          "outQuantity": 5155,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5155,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 56,
-          "equipmentName": "2-质检仪",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 15,
-          "sectionName": "2-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 10056,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 57,
-          "equipmentName": "2-桥检1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 23,
-          "sectionName": "2-包装",
-          "inQuantity": 110,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 461,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 58,
-          "equipmentName": "2-桥检2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 23,
-          "sectionName": "2-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 59,
-          "equipmentName": "3-穿梭机",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 25,
-          "sectionName": "3-穿梭机",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 60,
-          "equipmentName": "3-上片机械手1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 26,
-          "sectionName": "3-上片",
-          "inQuantity": 2026,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 61,
-          "equipmentName": "3-上片机械手2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 26,
-          "sectionName": "3-上片",
-          "inQuantity": 2673,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 62,
-          "equipmentName": "3-上片机械手3",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 26,
-          "sectionName": "3-上片",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 63,
-          "equipmentName": "3-磨边机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 27,
-          "sectionName": "3-磨边",
-          "inQuantity": 2306,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 64,
-          "equipmentName": "3-磨边机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 27,
-          "sectionName": "3-磨边",
-          "inQuantity": 2380,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 65,
-          "equipmentName": "3-磨边清洗机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 28,
-          "sectionName": "3-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 2381,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 2381,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 66,
-          "equipmentName": "3-磨边清洗机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 28,
-          "sectionName": "3-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 2300,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 2300,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 67,
-          "equipmentName": "3-打孔机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 29,
-          "sectionName": "3-打孔",
-          "inQuantity": 2375,
-          "outQuantity": 2373,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 2373,
-          "passRate": 1.0008428,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 68,
-          "equipmentName": "3-打孔机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 29,
-          "sectionName": "3-打孔",
-          "inQuantity": 0,
-          "outQuantity": 2283,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 2283,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 69,
-          "equipmentName": "3-打孔清洗机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 30,
-          "sectionName": "3-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 2371,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 2371,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 70,
-          "equipmentName": "3-打孔清洗机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 30,
-          "sectionName": "3-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 2281,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 2281,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 71,
-          "equipmentName": "3-丝印机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 31,
-          "sectionName": "3-丝印",
-          "inQuantity": 2377,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 72,
-          "equipmentName": "3-丝印机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 31,
-          "sectionName": "3-丝印",
-          "inQuantity": 2285,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 73,
-          "equipmentName": "3-二次固化机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 32,
-          "sectionName": "3-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 2376,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 2376,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 74,
-          "equipmentName": "3-二次固化机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 32,
-          "sectionName": "3-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 2284,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 2284,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 75,
-          "equipmentName": "3-钢化炉",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 33,
-          "sectionName": "3-钢化",
-          "inQuantity": 4664,
-          "outQuantity": 4663,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 4663,
-          "passRate": 1.0002145,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 76,
-          "equipmentName": "3-包装清洗机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 34,
-          "sectionName": "3-包装清洗",
-          "inQuantity": 4661,
-          "outQuantity": 4659,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 4659,
-          "passRate": 1.0004293,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 77,
-          "equipmentName": "3-铺纸机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 35,
-          "sectionName": "3-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 78,
-          "equipmentName": "3-铺纸机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 35,
-          "sectionName": "3-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 79,
-          "equipmentName": "3-下片机械手1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 35,
-          "sectionName": "3-包装",
-          "inQuantity": 0,
-          "outQuantity": 2272,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 2272,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 80,
-          "equipmentName": "3-下片机械手2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 35,
-          "sectionName": "3-包装",
-          "inQuantity": 0,
-          "outQuantity": 2385,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 2385,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 81,
-          "equipmentName": "3-质检仪",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 27,
-          "sectionName": "3-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 62,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 82,
-          "equipmentName": "3-桥检1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 35,
-          "sectionName": "3-包装",
-          "inQuantity": 43,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 173,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 83,
-          "equipmentName": "3-桥检2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 35,
-          "sectionName": "3-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 84,
-          "equipmentName": "4-穿梭机",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 37,
-          "sectionName": "4-穿梭机",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 85,
-          "equipmentName": "4-上片机械手1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 38,
-          "sectionName": "4-上片",
-          "inQuantity": 5830,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 86,
-          "equipmentName": "4-上片机械手2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 38,
-          "sectionName": "4-上片",
-          "inQuantity": 5324,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 87,
-          "equipmentName": "4-上片机械手3",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 38,
-          "sectionName": "4-上片",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 88,
-          "equipmentName": "4-磨边机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 39,
-          "sectionName": "4-磨边",
-          "inQuantity": 5522,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 89,
-          "equipmentName": "4-磨边机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 39,
-          "sectionName": "4-磨边",
-          "inQuantity": 5608,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 90,
-          "equipmentName": "4-磨边清洗机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 40,
-          "sectionName": "4-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 5521,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5521,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 91,
-          "equipmentName": "4-磨边清洗机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 40,
-          "sectionName": "4-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 5607,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5607,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 92,
-          "equipmentName": "4-一次镀膜机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 41,
-          "sectionName": "4-一次镀膜",
-          "inQuantity": 5504,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 93,
-          "equipmentName": "4-一次镀膜机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 41,
-          "sectionName": "4-一次镀膜",
-          "inQuantity": 5591,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 94,
-          "equipmentName": "4-一次固化机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 42,
-          "sectionName": "4-一次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 95,
-          "equipmentName": "4-一次固化机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 42,
-          "sectionName": "4-一次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 96,
-          "equipmentName": "4-二次镀膜机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 43,
-          "sectionName": "4-二次镀膜",
-          "inQuantity": 5504,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 97,
-          "equipmentName": "4-二次镀膜机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 43,
-          "sectionName": "4-二次镀膜",
-          "inQuantity": 5591,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 98,
-          "equipmentName": "4-二次固化机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 44,
-          "sectionName": "4-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 5504,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5504,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 99,
-          "equipmentName": "4-二次固化机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 44,
-          "sectionName": "4-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 5591,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5591,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 100,
-          "equipmentName": "4-钢化炉",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 45,
-          "sectionName": "4-钢化",
-          "inQuantity": 11121,
-          "outQuantity": 11118,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 11118,
-          "passRate": 1.0002699,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 101,
-          "equipmentName": "4-包装清洗机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 46,
-          "sectionName": "4-包装清洗",
-          "inQuantity": 11104,
-          "outQuantity": 11105,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 11105,
-          "passRate": 0.99990994,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 102,
-          "equipmentName": "4-铺纸机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 47,
-          "sectionName": "4-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 103,
-          "equipmentName": "4-铺纸机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 47,
-          "sectionName": "4-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 104,
-          "equipmentName": "4-下片机械手1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 47,
-          "sectionName": "4-包装",
-          "inQuantity": 0,
-          "outQuantity": 5407,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5407,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 105,
-          "equipmentName": "4-下片机械手2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 47,
-          "sectionName": "4-包装",
-          "inQuantity": 0,
-          "outQuantity": 5632,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5632,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 106,
-          "equipmentName": "4-质检仪",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 39,
-          "sectionName": "4-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 107,
-          "equipmentName": "4-桥检1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 47,
-          "sectionName": "4-包装",
-          "inQuantity": 67,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 193,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 108,
-          "equipmentName": "4-桥检2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 47,
-          "sectionName": "4-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 109,
-          "equipmentName": "5-穿梭机",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 49,
-          "sectionName": "5-穿梭机",
-          "inQuantity": 0,
-          "outQuantity": 13275,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 13275,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 110,
-          "equipmentName": "5-上片机械手1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 50,
-          "sectionName": "5-上片",
-          "inQuantity": 1329,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 111,
-          "equipmentName": "5-上片机械手2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 50,
-          "sectionName": "5-上片",
-          "inQuantity": 865,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 112,
-          "equipmentName": "5-上片机械手3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 50,
-          "sectionName": "5-上片",
-          "inQuantity": 528,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 113,
-          "equipmentName": "5-上片机械手4",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 50,
-          "sectionName": "5-上片",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 114,
-          "equipmentName": "5-磨边机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 51,
-          "sectionName": "5-磨边",
-          "inQuantity": 5502,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 115,
-          "equipmentName": "5-磨边机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 51,
-          "sectionName": "5-磨边",
-          "inQuantity": 5155,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 116,
-          "equipmentName": "5-磨边机3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 51,
-          "sectionName": "5-磨边",
-          "inQuantity": 5293,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 117,
-          "equipmentName": "5-磨边清洗机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 52,
-          "sectionName": "5-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 5501,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5501,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 118,
-          "equipmentName": "5-磨边清洗机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 52,
-          "sectionName": "5-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 5149,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5149,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 119,
-          "equipmentName": "5-磨边清洗机3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 52,
-          "sectionName": "5-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 5290,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5290,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 120,
-          "equipmentName": "5-一次镀膜机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 53,
-          "sectionName": "5-一次镀膜",
-          "inQuantity": 5479,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 121,
-          "equipmentName": "5-一次镀膜机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 53,
-          "sectionName": "5-一次镀膜",
-          "inQuantity": 5126,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 122,
-          "equipmentName": "5-一次镀膜机3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 53,
-          "sectionName": "5-一次镀膜",
-          "inQuantity": 5270,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 123,
-          "equipmentName": "5-一次固化机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 54,
-          "sectionName": "5-一次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 124,
-          "equipmentName": "5-一次固化机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 54,
-          "sectionName": "5-一次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 125,
-          "equipmentName": "5-一次固化机3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 54,
-          "sectionName": "5-一次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 126,
-          "equipmentName": "5-二次镀膜机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 55,
-          "sectionName": "5-二次镀膜",
-          "inQuantity": 5478,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 127,
-          "equipmentName": "5-二次镀膜机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 55,
-          "sectionName": "5-二次镀膜",
-          "inQuantity": 5131,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 128,
-          "equipmentName": "5-二次镀膜机3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 55,
-          "sectionName": "5-二次镀膜",
-          "inQuantity": 5267,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 129,
-          "equipmentName": "5-二次固化机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 56,
-          "sectionName": "5-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 5476,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5476,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 130,
-          "equipmentName": "5-二次固化机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 56,
-          "sectionName": "5-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 5131,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5131,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 131,
-          "equipmentName": "5-二次固化机3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 56,
-          "sectionName": "5-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 5267,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5267,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 132,
-          "equipmentName": "5-钢化炉",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 57,
-          "sectionName": "5-钢化",
-          "inQuantity": 15853,
-          "outQuantity": 15832,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 15832,
-          "passRate": 1.0013264,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 133,
-          "equipmentName": "5-包装清洗机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 58,
-          "sectionName": "5-包装清洗",
-          "inQuantity": 10450,
-          "outQuantity": 10450,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 10450,
-          "passRate": 1.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 134,
-          "equipmentName": "5-包装清洗机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 58,
-          "sectionName": "5-包装清洗",
-          "inQuantity": 5378,
-          "outQuantity": 5378,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5378,
-          "passRate": 1.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 135,
-          "equipmentName": "5-铺纸机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 136,
-          "equipmentName": "5-铺纸机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 137,
-          "equipmentName": "5-下片机械手1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 0,
-          "outQuantity": 3685,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 3685,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 138,
-          "equipmentName": "5-下片机械手2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 0,
-          "outQuantity": 5675,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5675,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 139,
-          "equipmentName": "5-下片机械手3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 0,
-          "outQuantity": 6432,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6432,
-          "passRate": 0.0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 140,
-          "equipmentName": "5-质检仪1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 51,
-          "sectionName": "5-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 275,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 141,
-          "equipmentName": "5-质检仪2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 51,
-          "sectionName": "5-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 96,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 142,
-          "equipmentName": "5-桥检1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 130,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 143,
-          "equipmentName": "5-桥检2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 49,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 144,
-          "equipmentName": "1-储片机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 1,
-          "sectionName": "1-穿梭机",
-          "inQuantity": 5029,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 145,
-          "equipmentName": "1-储片机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 1,
-          "sectionName": "1-穿梭机",
-          "inQuantity": 4770,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 146,
-          "equipmentName": "1-储片机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 1,
-          "sectionName": "1-穿梭机",
-          "inQuantity": 5015,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 147,
-          "equipmentName": "1-质检仪2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 3,
-          "sectionName": "1-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 248,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732118400000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 148,
-          "equipmentName": "2-镀膜机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 61,
-          "sectionName": "2-镀膜",
-          "inQuantity": 5144,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 149,
-          "equipmentName": "2-镀膜机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 61,
-          "sectionName": "2-镀膜",
-          "inQuantity": 4944,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 150,
-          "equipmentName": "2-储片机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 13,
-          "sectionName": "2-穿梭机",
-          "inQuantity": 5142,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      },
-      {
-          "equipmentId": 151,
-          "equipmentName": "2-储片机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 13,
-          "sectionName": "2-穿梭机",
-          "inQuantity": 4949,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": 0,
-          "recordTime": 1732118400000
-      }
-  ]
-  export default edata
diff --git a/src/views/equipment/analysis/quality/components/lineChart.vue b/src/views/equipment/analysis/quality/components/lineChart.vue
deleted file mode 100644
index e2c7f780..00000000
--- a/src/views/equipment/analysis/quality/components/lineChart.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-<!--
-    filename: lineChart.vue
-    author: liubin
-    date: 2023-09-04 13:45:00
-    description:
--->
-
-<template>
-	<div class="line-chart"></div>
-</template>
-
-<script>
-import * as echarts from 'echarts';
-import edata from './data';
-
-export default {
-	name: 'LineChart',
-	components: {},
-	props: ['config', 'list'],
-	data() {
-		return {
-			chart: null,
-		};
-	},
-	// watch: {
-	// 	list: {
-	// 		handler(listdata) {
-	// 			if (listdata && listdata.length) {
-	// 				console.log('[linechart] list changed', listdata);
-	// 				const option = this.handleList(listdata);
-	// 				this.setOption(option);
-	// 			}
-	// 		},
-	// 		immediate: true,
-	// 	},
-	// },
-	computed: {
-		option() {
-			const opt = [];
-			this.list.map((eq) => {
-				/** [设备名, ok数量, 不ok数量, 加工数量, 合格率] */
-				opt.push([
-					eq.equipmentName,
-					eq.okQuantity,
-					eq.nokQuantity,
-					eq.totalQuantity,
-					typeof eq.passRate === "number" ? eq.passRate.toFixed(4) : "0.0000"
-				]);
-			});
-			return {
-				color: ['#288AFF', '#8EF0AB'],
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'shadow',
-					},
-					formatter: (params) => {
-						const name = params[0].name;
-						const goodRate = opt.find((item) => item[0] == name)[4];
-						return `
-							<h1 style="font-size: 18px; letter-spacing: 1px;">${
-								params[0].axisValue
-							} <small>${goodRate}%</small></h1>
-							<ul style="margin: 0; padding: 0; min-width: 128px;">
-								${params
-									.map(
-										(item, index) => `
-											<li style="list-style: none; display: flex; justify-content: space-between; align-items: center;">
-												<div>
-													<span style="display: inline-block; width: 10px; height: 10px; border-radius: 2px; background-color: ${item.color}; margin-right: 5px;"></span>
-													${item.seriesName}
-												</div>
-												${item.value}
-											</li>
-								`
-									)
-									.join('')}
-							</ul>
-						`;
-					},
-				},
-				legend: {
-					itemWidth: 12,
-					itemHeight: 12,
-					right: 0,
-				},
-				grid: {
-					left: '1%',
-					right: '1%',
-					top: '8%',
-					bottom: '3%',
-					containLabel: true,
-				},
-				// xAxis: [
-				// 	{
-				// 		type: 'category',
-				// 		data: ['设备1', '设备2', '设备3', '设备4', '设备5'],
-				// 	},
-				// ],
-				// yAxis: [
-				// 	{
-				// 		type: 'value',
-				// 		splitLine: {
-				// 			lineStyle: {
-				// 				color: '#0001',
-				// 			},
-				// 		},
-				// 	},
-				// ],
-				xAxis: {
-					type: 'category',
-					axisTick: { show: false },
-					data: opt.map((item) => item[0]),
-				},
-				yAxis: {
-					type: 'value',
-					splitLine: {
-						lineStyle: {
-							color: '#0001',
-						},
-					},
-				},
-				series: [
-					{
-						animation: false,
-						name: '合格数量',
-						type: 'bar',
-						barWidth: 20,
-						stack: 's',
-						data: opt.map((item) => item[1]),
-					},
-					{
-						animation: false,
-						name: '不合格数量',
-						type: 'bar',
-						barWidth: 20,
-						stack: 's',
-						data: opt.map((item) => item[2]),
-					},
-					// {
-					// 	name: '加工数量',
-					// 	type: 'bar',
-					// 	barWidth: 20,
-					// 	data: opt.map((item) => item[3]),
-					// },
-					// {
-					// 	name: '合格率',
-					// 	type: 'line',
-					// 	data: opt.map((item) => item[4]),
-					// },
-				],
-			};
-		},
-	},
-	mounted() {
-		console.log('[linechart] mounted');
-		this.init();
-	},
-	beforeDestroy() {
-		if (this.chart) {
-			this.chart.dispose();
-		}
-		console.log('[linechart] destroyed');
-	},
-	methods: {
-		init() {
-			if (!this.chart) this.chart = echarts.init(this.$el);
-			console.log('[linechart] initialized', this.$el);
-			this.$nextTick(() => {
-				this.setOption();
-			});
-		},
-
-		setOption() {
-			if (this.chart) this.chart.setOption(this.option);
-			console.log('[linechart] option settled');
-		},
-
-		// handleList(list) {
-		// 	/** 清空数据 */
-		// 	this.option.series[0].data.splice(0);
-		// 	this.option.series[1].data.splice(0);
-		// 	this.option.xAxis.data.splice(0);
-
-		// 	list.map((eq) => {
-		// 		this.option.xAxis.data.push(eq.equipmentName);
-		// 		this.option.series[0].data.push(eq.nokQuantity);
-		// 		this.option.series[1].data.push(eq.okQuantity);
-		// 	});
-
-		// 	this.setOption();
-
-		// 	// const pureList = list.map((eq) => ({
-		// 	// 	name: eq.equipmentName,
-		// 	// 	ok: eq.okQuantity,
-		// 	// 	nok: eq.nokQuantity,
-		// 	// }));
-		// },
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.line-chart {
-	padding: 0 12px;
-	height: 1px;
-	flex: 1;
-}
-</style>
diff --git a/src/views/equipment/analysis/quality/index.vue b/src/views/equipment/analysis/quality/index.vue
deleted file mode 100644
index 174d54bc..00000000
--- a/src/views/equipment/analysis/quality/index.vue
+++ /dev/null
@@ -1,412 +0,0 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-09-04 09:34:52
-    description: 设备质量分析
--->
-
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<el-row>
-			<el-col class="custom-tabs">
-				<el-tabs
-					v-model="activeName"
-					:stretch="true"
-					@tab-click="handleTabClick">
-					<el-tab-pane :label="'数据列表'" name="table">
-						<!-- 列表 -->
-						<base-table
-							:table-props="tableProps"
-							:page="queryParams.pageNo"
-							:limit="queryParams.pageSize"
-							:table-data="list"
-							:max-height="tableH"
-							@emitFun="handleEmitFun"></base-table>
-					</el-tab-pane>
-					<el-tab-pane :label="'\u3000柱状图\u3000'" name="graph">
-						<div
-							v-if="activeName == 'graph'"
-							class="graph"
-							style="height: 40vh; display: flex; flex-direction: column">
-							<div class="blue-title">各设备加工数量</div>
-							<LineChart v-if="list && list.length" :list="list" />
-							<div v-else class="no-data-bg"></div>
-						</div>
-					</el-tab-pane>
-				</el-tabs>
-			</el-col>
-		</el-row>
-	</div>
-</template>
-
-<script>
-import moment from 'moment';
-import LineChart from './components/lineChart.vue';
-import { parseTime } from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-
-export default {
-	name: 'QualityAnalysis',
-	components: { LineChart },
-	mixins: [tableHeightMixin],
-	props: {},
-	data() {
-		const now = new Date();
-		const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
-		return {
-			dialogVisible: false,
-			urls: {
-				page: '/analysis/equipment-analysis/quality',
-			},
-			activeName: 'table', // defaults to 'table'
-			searchBarFormConfig: [
-				// 产品
-				{
-					__index: 'product',
-					type: 'select',
-					label: '产品',
-					placeholder: '请选择产品',
-					param: 'productId',
-				},
-				// 产线
-				{
-					__index: 'line',
-					type: 'select',
-					label: '产线',
-					placeholder: '请选择产线',
-					param: 'lineId',
-				},
-				// 时间段
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'daterange', // datetimerange
-					// format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd',
-					// valueFormat: 'timestamp',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始日期',
-					endPlaceholder: '结束日期',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'recordTime',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '列表数据',
-				// 	name: 'tableVersion',
-				// 	color: 'text btn-table',
-				// },
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '图形分析',
-				// 	name: 'graphVersion',
-				// 	color: 'text btn-graph',
-				// },
-			],
-			// 动态的 props
-			tableProps: [
-				{
-					// width: 160,
-					prop: 'sectionName',
-					label: '工段',
-				},
-				{
-					// width: 160,
-					prop: 'equipmentName',
-					label: '设备名称',
-				},
-				{
-					// width: 160,
-					prop: 'products',
-					label: '产品名称',
-				},
-				{
-					// width: 160,
-					prop: 'inQuantity',
-					label: '进片数量[片]',
-				},
-				{
-					// width: 160,
-					prop: 'outQuantity',
-					label: '出片数量[片]',
-				},
-				{
-					// width: 160,
-					prop: 'nokQuantity',
-					label: '破损/不合格数[片]',
-				},
-				{
-					// width: 160,
-					prop: 'passRate',
-					label: '合格率',
-					filter: (val) => (val != null ? val.toFixed(2) : '-'),
-				},
-			],
-			lineChartConfig: {
-				grid: {
-					top: 88,
-					left: 56,
-					right: 56,
-					bottom: 56,
-				},
-				legend: {
-					top: 0,
-					left: 0,
-					padding: 5,
-					icon: 'roundRect',
-					itemWidth: 12,
-					itemHeight: 12,
-					itemGap: 20,
-					textStyle: {
-						fontSize: 14,
-						lineHeight: 14,
-					},
-				},
-				xAxis: {
-					type: 'category',
-					data: ['设备1', '设备2', '设备3', '设备4', '设备5'],
-				},
-				yAxis: {
-					type: 'value',
-					name: '合格率',
-					nameLocation: 'end',
-					nameTextStyle: {
-						fontSize: 14,
-						align: 'right',
-					},
-					nameGap: 26,
-				},
-				series: [
-					{
-						name: '产线1',
-						data: [150, 230, 224, 218, 135],
-						type: 'line',
-						smooth: true,
-					},
-					{
-						name: '产线2',
-						data: [111, 224, 42, 11, 24],
-						type: 'line',
-						smooth: true,
-					},
-					{
-						name: '产线3',
-						data: [218, 112, 331, 44, 99],
-						type: 'line',
-						smooth: true,
-					},
-					{
-						name: '产线4',
-						data: [3, 221, 42, 553, 311],
-						type: 'line',
-						smooth: true,
-					},
-				],
-			},
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				lineId: null,
-				productId: null,
-				recordTime: [],
-			},
-			list: [],
-		};
-	},
-	computed: {},
-	created() {
-		const end = new Date();
-		const start = new Date();
-		this.queryParams.recordTime = [
-			parseTime(start).substr(0, 10) + ' 00:00:00',
-			parseTime(end).substr(0, 10) + ' 23:59:59',
-		];
-		this.searchBarFormConfig[2].startPlaceholder = parseTime(start).substr(
-			0,
-			10
-		);
-		this.searchBarFormConfig[2].endPlaceholder = parseTime(end).substr(0, 10);
-		this.fillLineOptions();
-		this.fillProductOptions();
-		this.getList();
-	},
-	mounted() {
-		//this.$refs['search-bar'].headBtnClick('search');
-	},
-	methods: {
-		handleTabClick(tab, event) {
-			// console.log('tab event', tab, event);
-			// tab is el-tab vue component.
-		},
-
-		async fillLineOptions() {
-			const { data } = await this.$axios({
-				url: '/base/production-line/listAll',
-				method: 'get',
-			});
-			const cfg = this.searchBarFormConfig.find(
-				(item) => item.__index == 'line'
-			);
-			this.$set(
-				cfg,
-				'selectOptions',
-				data.map((item) => ({
-					id: item.id,
-					name: item.name,
-				}))
-			);
-		},
-
-		async fillProductOptions() {
-			const { data } = await this.$axios({
-				url: '/base/product/listAll',
-				method: 'get',
-			});
-			const cfg = this.searchBarFormConfig.find(
-				(item) => item.__index == 'product'
-			);
-			this.$set(
-				cfg,
-				'selectOptions',
-				data.map((item) => ({
-					id: item.id,
-					name: item.name,
-				}))
-			);
-		},
-
-		async getList() {
-			const { data } = await this.$axios({
-				url: '/analysis/equipment-analysis/quality',
-				method: 'get',
-				params: {
-					lineId: this.queryParams.lineId || null,
-					productId: this.queryParams.productId || null,
-					recordTime: this.queryParams.recordTime || null,
-				},
-			});
-			this.list = data.map((item) => ({
-				...item,
-				products: item.products?.join(','),
-			}));
-		},
-
-		handleSearchBarBtnClick(btn) {
-			// debugger;
-			switch (btn.btnName) {
-				case 'search':
-					this.searchBarFormConfig[2].startPlaceholder = '开始时间';
-					this.searchBarFormConfig[2].endPlaceholder = '结束时间';
-					this.queryParams.lineId = btn.lineId;
-					this.queryParams.productId = btn.productId;
-					this.queryParams.recordTime = btn.recordTime
-						? btn.recordTime.map((time) =>
-								moment(new Date(time)).format('YYYY-MM-DD HH:mm:ss')
-						  )
-						: null;
-					this.$nextTick(() => {
-						this.getList();
-					});
-					break;
-				case 'tableVersion':
-					this.dialogClose();
-					break;
-				case 'graphVersion':
-					this.dialogShow();
-					break;
-			}
-		},
-
-		handleEmitFun({ action, payload }) {},
-
-		dialogShow() {
-			this.dialogVisible = true;
-		},
-
-		dialogClose() {
-			this.dialogVisible = false;
-		},
-	},
-};
-</script>
-<style scoped lang="scss">
-:deep(.searchBar) {
-	.el-button.btn-table {
-		color: rgb(0, 130, 130);
-		border: 1px solid rgb(0, 130, 130);
-		padding: 8px 10px;
-		border: 1px solid rgb(0, 130, 130);
-		padding: 8px 10px;
-
-		&:hover {
-			border-color: #fff;
-			color: #fff;
-			background: rgb(0, 130, 130);
-		}
-	}
-	.el-button.btn-graph {
-		color: rgb(130, 0, 130);
-		border: 1px solid rgb(130, 0, 130);
-		padding: 8px 10px;
-
-		&:hover {
-			border-color: #fff;
-			color: #fff;
-			background: rgb(130, 0, 130);
-		}
-	}
-}
-
-:deep(.custom-tabs) {
-	.el-tabs__header {
-		margin-bottom: 8px;
-		display: inline-block;
-		transform: translateY(-12px);
-	}
-
-	.el-tabs__item {
-		padding-left: 0 !important;
-		padding-right: 0 !important;
-		line-height: 36px !important;
-		height: 36px;
-	}
-}
-
-.blue-title {
-	position: relative;
-	padding: 4px 0;
-	padding-left: 12px;
-	font-size: 14px;
-
-	&::before {
-		content: '';
-		position: absolute;
-		left: 0;
-		top: 6px;
-		height: 16px;
-		width: 4px;
-		border-radius: 1px;
-		background: #0b58ff;
-	}
-}
-</style>
diff --git a/src/views/equipment/timing-diagram/components/gantt.js b/src/views/equipment/timing-diagram/components/gantt.js
deleted file mode 100644
index aac530f4..00000000
--- a/src/views/equipment/timing-diagram/components/gantt.js
+++ /dev/null
@@ -1,191 +0,0 @@
-
-// filename: gantt.vue
-// author: liubin
-// date: 2023 -09 - 25 14: 28: 12
-// description: 甘特图
-
-
-import * as echarts from 'echarts';
-
-/**
- * 
- * @param {*} params 
- * @param {*} api 
- * 
- * https://echarts.apache.org/zh/option.html#series-custom.renderItem.arguments.params
- */
-// function renderItem(params, api) { }
-
-export default class Gantt {
-    constructor(el) {
-        this.chart = echarts.init(el);
-        let options = {
-            series: [
-                {
-                    type: 'custom',
-                    coordinateSystem: 'cartesian2d',
-                    renderItem: renderItem,
-                }
-            ]
-        }
-        this.chart.setOption(options);
-    }
-
-    update(options) {
-        this.chart.setOption(options);
-    }
-
-    resize() {
-        // todo
-    }
-
-    destroy() {
-        this.chart.dispose();
-    }
-}
-
-
-
-var data = [];
-var categories = ['设备1', '设备2', '设备3'];
-var types = [
-    { name: '运行', color: '#7b9ce1' },
-    { name: '故障', color: '#bd6d6c' },
-    { name: '停机', color: '#75d874' },
-];
-//   return new Date(new Date(timestamp).toLocaleDateString()).getTime()
-// })(1691568181000))
-function getStartTime(timestamp) {
-    return new Date(new Date(timestamp).toLocaleDateString()).getTime()
-}
-
-
-data.push({
-    name: 'running',
-    value: [0, 1691568181000, 1691568181000 + 60 * 60 * 1000, 60],
-    itemStyle: {
-        normal: {
-            color: types[0].color
-        }
-    }
-})
-
-
-
-function renderItem(params, api) {
-    var categoryIndex = api.value(0);
-    var start = api.coord([api.value(1), categoryIndex]);
-    var end = api.coord([api.value(2), categoryIndex]);
-    var height = api.size([0, 1])[1] * 0.8;
-    var rectShape = echarts.graphic.clipRectByRect(
-        {
-            x: start[0],
-            y: start[1] - height / 2,
-            width: end[0] - start[0],
-            height: height
-        },
-        {
-            x: params.coordSys.x,
-            y: params.coordSys.y,
-            width: params.coordSys.width,
-            height: params.coordSys.height
-        }
-    );
-    return (
-        rectShape && {
-            type: 'rect',
-            transition: ['shape'],
-            shape: rectShape,
-            style: api.style()
-        }
-    );
-}
-
-option = {
-    tooltip: {
-        // show: false,
-        formatter: function (params) {
-            return params.marker + params.name + ': ' + new Date(params.value[1]).toLocaleTimeString() + ' - ' + new Date(params.value[2]).toLocaleTimeString();
-        }
-    },
-    // title: {
-    //   text: 'Profile',
-    //   left: 'center'
-    // },
-    // dataZoom: [
-    //   {
-    //     type: 'slider',
-    //     filterMode: 'weakFilter',
-    //     showDataShadow: false,
-    //     top: 400,
-    //     labelFormatter: ''
-    //   },
-    //   {
-    //     type: 'inside',
-    //     filterMode: 'weakFilter'
-    //   }
-    // ],
-    grid: {
-        height: 300
-    },
-    xAxis: {
-        type: 'time',
-        min: getStartTime(1691568181000),
-        max: getStartTime(1691568181000 + 3600 * 24 * 1000),
-        splitNumber: 10,
-        // interval: 60*3600*1000,
-        // scale: true,
-        axisLabel: {
-            // rotate: -15,
-            formatter: function (val) {
-                return new Date(val).toLocaleTimeString()
-            }
-        },
-        axisTick: {
-            show: true
-        },
-        splitLine: {
-            show: false,
-        }
-    },
-    yAxis: [{
-        axisLine: {
-            // show: false,
-            lineStyle: {
-                color: ''
-            }
-        },
-        axisLabel: {
-            fontSize: 14,
-        },
-        axisTick: {
-            show: false,
-        },
-        splitLine: {
-            show: true
-        },
-        data: categories
-    }, {
-        axisLine: {
-            // show: false,
-            lineStyle: {
-                color: ''
-            }
-        },
-        data: []
-    }],
-    series: [
-        {
-            type: 'custom',
-            renderItem: renderItem,
-            itemStyle: {
-                opacity: 0.8
-            },
-            encode: {
-                x: [1, 2],
-                y: 0
-            },
-            data: data
-        }
-    ]
-};
\ No newline at end of file
diff --git a/src/views/equipment/timing-diagram/output/components/lineChart.vue b/src/views/equipment/timing-diagram/output/components/lineChart.vue
deleted file mode 100644
index 1c099666..00000000
--- a/src/views/equipment/timing-diagram/output/components/lineChart.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-10-29 09:47:40
- * @LastEditors: zwq
- * @LastEditTime: 2024-11-26 14:41:52
- * @Description:
--->
-<!--
-    filename: lineChart.vue
-    author: liubin
-    date: 2023-09-04 13:45:00
-    description:
--->
-
-<template>
-	<div class="line-chart"></div>
-</template>
-
-<script>
-import * as echarts from 'echarts';
-
-export default {
-	name: 'LineChart',
-	components: {},
-	props: ['config'],
-	data() {
-		return {
-			chart: null,
-		};
-	},
-	watch: {
-		config: {
-			handler(value) {
-				if (value != null) this.setOption(value);
-			},
-			deep: true,
-		},
-	},
-	mounted() {
-		this.init();
-	},
-  activated() {
-    // 由于给echart添加了resize事件, 在组件激活时需要重新resize绘画一次, 否则出现空白bug
-    if (this.chart) {
-      this.echart.resize();
-    }
-  },
-	beforeDestroy() {
-		if (this.chart) {
-			this.chart.dispose();
-		}
-	},
-	methods: {
-		init() {
-			if (!this.chart) this.chart = echarts.init(this.$el);
-			this.setOption(this.config);
-		},
-		setOption(option) {
-			if (this.chart) this.chart.setOption(option,true);
-      window.addEventListener("resize", () => {
-        this.chart.resize();
-      });
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.line-chart {
-	padding: 0 12px;
-	// background: #e1e1e1;
-	min-height: 320px;
-}
-</style>
diff --git a/src/views/equipment/timing-diagram/output/index.vue b/src/views/equipment/timing-diagram/output/index.vue
deleted file mode 100644
index ba64c0e6..00000000
--- a/src/views/equipment/timing-diagram/output/index.vue
+++ /dev/null
@@ -1,518 +0,0 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-09-04 09:34:52
-    description: 设备产量时序图
--->
-
-<template>
-	<div
-		class="production-timegraph-container"
-		style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
-		<el-row
-			class=""
-			style="
-				margin-bottom: 12px;
-				background: #fff;
-				padding: 16px 16px 0;
-				border-radius: 8px;
-			">
-			<div class="blue-title">生产节拍时序图</div>
-			<!-- <h1>设备状态时序图</h1> -->
-			<!-- 搜索工作栏 -->
-			<SearchBar
-				:formConfigs="searchBarFormConfig"
-				ref="search-bar"
-				:remove-blue="true"
-				@select-changed="handleSearchBarChanged"
-				@headBtnClick="handleSearchBarBtnClick" />
-		</el-row>
-
-		<el-row
-			class=""
-			style="
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				margin-bottom: 12px;
-				background: #fff;
-				padding: 16px 16px 24px;
-				border-radius: 8px;
-			">
-			<div class="blue-title">设备产量时序图</div>
-
-			<div class="main-area" style="flex: 1">
-				<div class="graphs" v-if="graphList.length">
-					<LineChart :config="templateConfig" />
-				</div>
-				<div class="no-data-bg" v-else></div>
-			</div>
-		</el-row>
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			dialogTitle="添加设备"
-			:dialogVisible="open"
-			width="500px"
-			@close="open = false"
-			@cancel="open = false"
-			@confirm="submitForm">
-			<el-select
-				v-if="open"
-				style="width: 100%"
-				v-model="queryParams.equipmentId"
-				placeholder="请选择一个设备">
-				<el-option
-					v-for="eq in eqList"
-					:key="eq.id"
-					:value="eq.id"
-					:label="eq.name"></el-option>
-			</el-select>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import LineChart from './components/lineChart.vue';
-// import response from './response.json';
-
-export default {
-	name: 'SGProduction',
-	components: { LineChart },
-	props: {},
-	data() {
-		return {
-			startTime: null, // new Date(2023, 8, 26, 0, 0, 0, 0).getTime(),
-			accumulators: new Map(),
-			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					placeholder: '请选择产线',
-					selectOptions: [],
-					param: 'lineId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '工段',
-					placeholder: '请选择工段',
-					selectOptions: [],
-					param: 'sectionId',
-				},
-				// 时间段
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'date', // datetimerange
-					// format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					// valueFormat: 'timestamp',
-					// rangeSeparator: '-',
-					// startPlaceholder: '开始日期',
-					// endPlaceholder: '结束日期',
-					// defaultTime: ['00:00:00', '23:59:59'],
-					placeholder: '选择日期',
-					param: 'recordTime',
-					required: true,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '添加对比',
-					name: 'compare',
-					color: 'primary',
-					plain: true,
-				},
-			],
-			queryParams: {
-				lineId: null,
-				sectionId: null,
-				equipmentId: null,
-				recordTime: [],
-			},
-			open: false,
-			eqList: [],
-			graphList: [],
-			templateConfig: {
-				grid: {
-					top: 48,
-					left: 48,
-					right: 90,
-					bottom: 24,
-				},
-				legend: {
-					type: 'scroll',
-					orient: 'vertical',
-					right: 10,
-					top: 20,
-					bottom: 20,
-					itemWidth: 16,
-					itemHeight: 8,
-					itemGap: 20,
-					textStyle: {
-						fontSize: 12,
-						lineHeight: 12,
-						color: '#0007',
-					},
-				},
-				tooltip: {
-					show: true,
-					trigger: 'axis',
-					formatter: function (params) {
-						return `
-							<div style="margin-bottom: 8px;">${new Date(
-								+params[0].name
-							).toLocaleTimeString()}</div>
-							${params
-								.map(({ seriesName, color, data }) =>
-									data != null
-										? `
-								<div style="min-width: 160px; display: flex; justify-content: space-between; align-items: center;">
-									<span style="display: flex; align-items: center;">
-										<span style="display: inline-block; margin-right: 8px; width: 12px; height: 12px; background: ${color}"></span>
-										<span style="">${seriesName}</span>
-									</span>
-									<span style="color: #c7c7c7; text-align: right;">${data}</span>
-								</div>
-							`
-										: ''
-								)
-								.join('')}
-						`;
-					},
-				},
-				xAxis: null,
-				yAxis: {
-					type: 'value',
-					name: '产量',
-					nameLocation: 'end',
-					nameTextStyle: {
-						fontSize: 14,
-						align: 'center',
-					},
-					axisLine: {
-						show: true,
-					},
-					max: function (value) {
-						return value.max + Math.ceil(value.max / 4);
-						// return value.max + 50
-					},
-				},
-				series: [
-					// {
-					// 	name: '产线1',
-					// 	data: Array(24)
-					// 		.fill(1)
-					// 		.map(() => Math.random() * 100),
-					// 	type: 'line',
-					// 	symbol: 'circle',
-					// 	// smooth: true,
-					// },
-					// {
-					// 	name: '产线2',
-					// 	data: Array(24)
-					// 		.fill(1)
-					// 		.map(() => Math.random() * 100),
-					// 	type: 'line',
-					// 	symbol: 'circle',
-					// 	// smooth: true,
-					// },
-					// {
-					// 	name: '产线3',
-					// 	data: Array(24)
-					// 		.fill(1)
-					// 		.map(() => Math.random() * 100),
-					// 	type: 'line',
-					// 	symbol: 'circle',
-					// 	// smooth: true,
-					// },
-				],
-			},
-		};
-	},
-	computed: {
-		timeArr() {
-			return Array(24)
-				.fill(this.startTime)
-				.map((time, index) => time + index * 3600000);
-		},
-	},
-	created() {
-		this.initProductline();
-		this.initWorksection();
-		this.initEquipment();
-		// this.getList();
-	},
-	methods: {
-		handleSearchBarBtnClick({ btnName, ...payload }) {
-			switch (btnName) {
-				case 'search':
-					if (!payload.recordTime || payload.recordTime.length <= 0) {
-						this.$message.warning('请选择时间段');
-						return;
-					}
-					this.startTime = new Date(payload.recordTime).getTime();
-
-					this.queryParams.lineId = payload.lineId || null;
-					this.queryParams.sectionId = payload.sectionId || null;
-					this.queryParams.equipmentId = payload.equipmentId || null;
-					this.queryParams.recordTime = payload.recordTime
-						? [
-								payload.recordTime,
-								payload.recordTime.replace('00:00:00', '23:59:59'),
-						  ]
-						: null;
-					this.getList();
-					break;
-				case 'compare':
-					this.open = true;
-					break;
-			}
-		},
-
-		handleSearchBarChanged({ param, value }) {
-			if (!value) {
-				this.searchBarFormConfig[1].selectOptions = [];
-				return;
-			}
-			switch (param) {
-				case 'lineId':
-					this.getWorksectionById(value);
-					break;
-			}
-		},
-
-		/** 重置查询条件 */
-		initQuery() {
-			this.queryParams.lineId = null;
-			this.queryParams.sectionId = null;
-			this.queryParams.equipmentId = null;
-			this.queryParams.recordTime = [];
-		},
-
-		/** 对象到数组的转换 */
-		objectToArray(obj) {
-			return Object.keys(obj).map((key) => {
-				obj[key].sort((a, b) => a.startTime - b.startTime);
-				obj[key].key = key;
-				return obj[key];
-			});
-		},
-
-		initState() {
-			this.accumulators = new Map();
-			this.templateConfig.series = [];
-		},
-
-		async getList() {
-			this.initState();
-
-			const { code, data } = await this.$axios({
-				url: '/analysis/equipment-analysis/quantity',
-				method: 'get',
-				params: this.queryParams,
-			});
-
-			// const { code, data } = response;
-			if (code == 0) {
-				this.graphList = this.objectToArray(data);
-				this.setXaxis();
-				this.graphList.forEach(this.setSeries);
-			} else {
-				this.graphList = [];
-			}
-		},
-
-		setXaxis() {
-			const xaxis = {
-				type: 'category',
-				// interval: 12,
-				axisTick: {
-					alignWithLabel: true,
-					lineStyle: {
-						color: '#0003',
-					},
-				},
-				axisLabel: {
-					formatter: function (value, index) {
-						return new Date(+value)
-							.toLocaleTimeString()
-							.split(':')
-							.slice(0, 2)
-							.join(':');
-					},
-				},
-				data: this.timeArr,
-			};
-			this.templateConfig.xAxis = xaxis;
-		},
-
-		setYaxis() {},
-
-		setSeries(list) {
-			const data = Array(24).fill(null);
-			list.map((item, index) => {
-				const idx = this.timeArr.indexOf(item.startTime);
-				if (idx != -1) {
-					data[idx] = item.totalQuantity;
-				}
-			});
-			const seriesItem = {
-				name: list.key,
-				type: 'line',
-				symbol: 'circle',
-				data,
-			};
-			this.templateConfig.series.push(seriesItem);
-		},
-
-		setSeriesOld(eqArr) {
-			if (eqArr.length == 0) {
-				this.templateConfig.series = [];
-				return;
-			}
-
-			let isInit = false;
-			if (this.accumulators.has(eqArr.key) == false) {
-				this.accumulators.set(eqArr.key, 0);
-				isInit = true;
-			}
-
-			let accumulator = this.accumulators.get(eqArr.key);
-			if ((accumulator && !isInit) || (accumulator == 0 && isInit == false)) {
-				accumulator++;
-				this.accumulators.set(eqArr.key, accumulator);
-			}
-
-			this.templateConfig.series.push({
-				name: eqArr.key + (accumulator == 0 ? '' : '-' + accumulator),
-				// name: Math.random(),
-				type: 'line',
-				symbol: 'circle',
-				data: this.getEquipmentQuantity(eqArr),
-			});
-		},
-
-		/** 准备设备数据 */
-		async initEquipment() {
-			const { code, data } = await this.$axios({
-				url: '/base/equipment/listAll',
-				method: 'get',
-			});
-			if (code == 0) {
-				this.eqList = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-
-		/** 准备产线数据 */
-		async initProductline() {
-			const { code, data } = await this.$axios({
-				url: '/base/production-line/listAll',
-				method: 'get',
-			});
-			if (code == 0) {
-				this.searchBarFormConfig[0].selectOptions = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-
-		/** 准备工段数据 */
-		async initWorksection() {
-			const { code, data } = await this.$axios({
-				url: '/base/workshop-section/listAll',
-				method: 'get',
-			});
-			if (code == 0) {
-				this.searchBarFormConfig[1].selectOptions = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-
-		/** 根据产线获取工段 */
-		async getWorksectionById(lineId) {
-			const { code, data } = await this.$axios({
-				url: '/base/workshop-section/listByParentId',
-				method: 'get',
-				params: {
-					id: lineId,
-				},
-			});
-			if (code == 0) {
-				this.searchBarFormConfig[1].selectOptions = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-
-		async submitForm() {
-			const { code, data } = await this.$axios({
-				url: '/analysis/equipment-analysis/quantity',
-				method: 'get',
-				params: this.queryParams,
-			});
-
-			this.queryParams.equipmentId = null; // 清空一下
-			if (code == 0) {
-				const newEqlist = this.objectToArray(data);
-				if (!newEqlist || newEqlist.length == 0) {
-					this.$message.warning('该设备没有产量数据');
-					return;
-				}
-				this.graphList.push(...newEqlist);
-        this.templateConfig.series = [];
-				newEqlist.forEach(this.setSeries);
-			}
-			this.open = false;
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.blue-title {
-	position: relative;
-	padding: 4px 0;
-	padding-left: 12px;
-	font-size: 14px;
-	color: #606266;
-	font-weight: 700;
-	margin-bottom: 12px;
-
-	&::before {
-		content: '';
-		position: absolute;
-		left: 0;
-		top: 6px;
-		height: 16px;
-		width: 4px;
-		border-radius: 1px;
-		background: #0b58ff;
-	}
-}
-</style>
diff --git a/src/views/equipment/timing-diagram/output/response.json b/src/views/equipment/timing-diagram/output/response.json
deleted file mode 100644
index e2328ccd..00000000
--- a/src/views/equipment/timing-diagram/output/response.json
+++ /dev/null
@@ -1,333 +0,0 @@
-{
-	"code": 0,
-	"data": {
-		"上片机": [
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695657600000,
-				"startTime": 1695657600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 189,
-				"outQuantity": 200,
-				"okQuantity": 189,
-				"nokQuantity": 11,
-				"recordTime": 1695661200000,
-				"startTime": 1695661200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 198,
-				"outQuantity": 200,
-				"okQuantity": 198,
-				"nokQuantity": 2,
-				"recordTime": 1695664800000,
-				"startTime": 1695664800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 197,
-				"outQuantity": 200,
-				"okQuantity": 197,
-				"nokQuantity": 3,
-				"recordTime": 1695668400000,
-				"startTime": 1695668400000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695672000000,
-				"startTime": 1695672000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 170,
-				"outQuantity": 200,
-				"okQuantity": 170,
-				"nokQuantity": 30,
-				"recordTime": 1695675600000,
-				"startTime": 1695675600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695679200000,
-				"startTime": 1695679200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695682800000,
-				"startTime": 1695682800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 195,
-				"outQuantity": 200,
-				"okQuantity": 195,
-				"nokQuantity": 5,
-				"recordTime": 1695686400000,
-				"startTime": 1695686400000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 198,
-				"outQuantity": 200,
-				"okQuantity": 198,
-				"nokQuantity": 2,
-				"recordTime": 1695690000000,
-				"startTime": 1695690000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695693600000,
-				"startTime": 1695693600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 197,
-				"outQuantity": 200,
-				"okQuantity": 197,
-				"nokQuantity": 3,
-				"recordTime": 1695697200000,
-				"startTime": 1695697200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 197,
-				"outQuantity": 200,
-				"okQuantity": 197,
-				"nokQuantity": 3,
-				"recordTime": 1695700800000,
-				"startTime": 1695700800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 196,
-				"outQuantity": 200,
-				"okQuantity": 196,
-				"nokQuantity": 4,
-				"recordTime": 1695704400000,
-				"startTime": 1695704400000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 193,
-				"outQuantity": 200,
-				"okQuantity": 193,
-				"nokQuantity": 7,
-				"recordTime": 1695708000000,
-				"startTime": 1695708000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 190,
-				"outQuantity": 200,
-				"okQuantity": 190,
-				"nokQuantity": 10,
-				"recordTime": 1695711600000,
-				"startTime": 1695711600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695715200000,
-				"startTime": 1695715200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695718800000,
-				"startTime": 1695718800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695722400000,
-				"startTime": 1695722400000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 198,
-				"outQuantity": 200,
-				"okQuantity": 198,
-				"nokQuantity": 2,
-				"recordTime": 1695726000000,
-				"startTime": 1695726000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695729600000,
-				"startTime": 1695729600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 189,
-				"outQuantity": 200,
-				"okQuantity": 189,
-				"nokQuantity": 11,
-				"recordTime": 1695733200000,
-				"startTime": 1695733200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 179,
-				"outQuantity": 200,
-				"okQuantity": 179,
-				"nokQuantity": 21,
-				"recordTime": 1695736800000,
-				"startTime": 1695736800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695740400000,
-				"startTime": 1695740400000
-			}
-		],
-		"下片机": [
-			{
-				"inQuantity": 200,
-				"totalQuantity": 190,
-				"outQuantity": 200,
-				"okQuantity": 190,
-				"nokQuantity": 10,
-				"recordTime": 1695672000000,
-				"startTime": 1695672000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 177,
-				"outQuantity": 200,
-				"okQuantity": 177,
-				"nokQuantity": 23,
-				"recordTime": 1695675600000,
-				"startTime": 1695675600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 198,
-				"outQuantity": 200,
-				"okQuantity": 198,
-				"nokQuantity": 2,
-				"recordTime": 1695679200000,
-				"startTime": 1695679200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695682800000,
-				"startTime": 1695682800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 185,
-				"outQuantity": 200,
-				"okQuantity": 185,
-				"nokQuantity": 15,
-				"recordTime": 1695686400000,
-				"startTime": 1695686400000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 198,
-				"outQuantity": 200,
-				"okQuantity": 198,
-				"nokQuantity": 2,
-				"recordTime": 1695690000000,
-				"startTime": 1695690000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695693600000,
-				"startTime": 1695693600000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 193,
-				"outQuantity": 200,
-				"okQuantity": 193,
-				"nokQuantity": 7,
-				"recordTime": 1695697200000,
-				"startTime": 1695697200000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695700800000,
-				"startTime": 1695700800000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 200,
-				"outQuantity": 200,
-				"okQuantity": 200,
-				"nokQuantity": 0,
-				"recordTime": 1695704400000,
-				"startTime": 1695704400000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 192,
-				"outQuantity": 200,
-				"okQuantity": 192,
-				"nokQuantity": 8,
-				"recordTime": 1695708000000,
-				"startTime": 1695708000000
-			},
-			{
-				"inQuantity": 200,
-				"totalQuantity": 199,
-				"outQuantity": 200,
-				"okQuantity": 199,
-				"nokQuantity": 1,
-				"recordTime": 1695711600000,
-				"startTime": 1695711600000
-			}
-		]
-	}
-}
diff --git a/src/views/equipment/timing-diagram/status/chart.js b/src/views/equipment/timing-diagram/status/chart.js
deleted file mode 100644
index 779932c2..00000000
--- a/src/views/equipment/timing-diagram/status/chart.js
+++ /dev/null
@@ -1,328 +0,0 @@
-import * as echarts from 'echarts'
-
-function getStartTime(timestamp) {
-    return new Date(new Date(timestamp).toLocaleDateString()).getTime();
-}
-
-function renderItem(params, api) {
-    var categoryIndex = api.value(0);
-    var start = api.coord([api.value(1), categoryIndex]);
-    var end = api.coord([api.value(2), categoryIndex]);
-
-    var height = api.size([0, 1])[1] * 2;
-    var rectShape = echarts.graphic.clipRectByRect(
-        {
-            x: start[0],
-            y: start[1] - height / 2,
-            width: end[0] - start[0],
-            height: height,
-        },
-        {
-            x: params.coordSys.x,
-            y: params.coordSys.y - 16,
-            width: params.coordSys.width,
-            height: params.coordSys.height,
-        }
-    );
-
-    return (
-        rectShape && {
-            type: 'rect',
-            transition: ['shape'],
-            shape: rectShape,
-            style: api.style(),
-        }
-    );
-}
-
-// unused
-function getXaxisRange(startTime) {
-    return Array(24)
-        .fill(startTime)
-        .map((item, index) => {
-            return new Date(item + index * 3600 * 1000)
-                .toLocaleTimeString()
-                .split(':')
-                .slice(0, 2)
-                .join(':');
-        });
-}
-
-function getTodayStart(today) {
-    const [y, m, d] = [
-        today.getFullYear(),
-        today.getMonth(),
-        today.getDate(),
-    ];
-    // debugger;
-    return new Date(y, m, d).getTime();
-}
-
-
-/** 颜色配置 */
-const types = [
-    { name: '运行', color: '#288AFF' },
-    { name: '故障', color: '#FC9C91' },
-    { name: '计划停机', color: '#FFDC94' },
-    { name: '空白', color: '#F2F4F9' },
-];
-
-
-export default class GanttGraph {
-    // tooltip - 基本是固定的
-    tooltip = {
-        trigger: 'item',
-        axisPointer: {
-            type: 'none',
-        },
-        formatter: (params) => {
-            // debugger;
-            return `
-            <div style="display: flex; flex-direction: column;">
-                <span>${new Date(params.value[1]).toLocaleTimeString()} ~ ${new Date(params.value[2]).toLocaleTimeString()}</span>
-                <div style="display: flex; align-items: center; justify-content: space-between;">
-                    <div style="display: flex; align-items: center;">
-                        <span class="icon" style="width: 8px; height: 8px; border-radius: 2px; background: ${params.color}"></span>
-                        <span class="eq-name" style="margin-left: 4px;">${params.seriesName}</span>
-                    </div>
-                    <span class="run-status" style="margin-left: 8px; opacity: 0.6">${params.name}</span>
-            </div>
-            `
-        }
-    }
-    grid = []
-    xAxis = []
-    yAxis = []
-    series = []
-
-    constructor(el, startTime) {
-        this.el = el;
-        this.gridIndex = -1;
-        this.currentGraphIndex = -2;
-        this.startTime = new Date(startTime);
-        // this.startTime = new Date(new Date('2023/10/8').toLocaleDateString());
-        // console.log('<> Gantt Created', this.startTime);
-    }
-
-    // 构造一个新的 grid
-    makeGrid() {
-        this.gridIndex++;
-        return {
-            id: 'GRID_' + this.gridIndex,
-            // top: 12 + 128 * this.gridIndex,
-            top: 12 + 104 * this.gridIndex,
-            right: 48,
-            left: 100,
-            height: 56
-        }
-    }
-
-    // 构造一个 xAxis
-    makeXaxis() {
-        const [id1, id2] = ['' + Math.random(), '' + Math.random()]
-        return [
-            {
-                id: id1,
-                gridIndex: this.gridIndex,
-                axisTick: {
-                    alignWithLabel: true,
-                    inside: true,
-                },
-                type: 'time',
-                min: getTodayStart(this.startTime),
-                max: getStartTime(this.startTime.getTime() + 3600 * 24 * 1000),
-                splitNumber: 10,
-                axisLabel: {
-                    margin: 12,
-                    formatter: function (val) {
-                        return new Date(val)
-                            .toLocaleTimeString()
-                            .split(':')
-                            .slice(0, 2)
-                            .join(':');
-                    },
-                },
-                axisLine: {
-                    lineStyle: {
-                        color: '#0005',
-                    },
-                },
-                boundaryGap: false,
-                // data: getXaxisRange(getTodayStart(new Date())),
-            },
-            {
-                id: id2,
-                gridIndex: this.gridIndex,
-                axisLabel: { show: false },
-                axisLine: { show: false },
-            },
-        ]
-    }
-
-
-    // 构造一个 yAxis
-    makeYaxis(equipmentName) {
-        const [id1, id2] = ['' + Math.random(), '' + Math.random()]
-        return [
-            // 主y轴
-            {
-                id: id1,
-                gridIndex: this.gridIndex,
-                type: 'value',
-                splitLine: { show: false },
-                name: equipmentName,
-                nameLocation: 'center',
-                nameGap: 14,
-                nameRotate: 0,
-                nameTextStyle: {
-                    fontSize: 12,
-                    color: '#000A'
-                },
-                axisLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#0005',
-                    },
-                },
-                axisLabel: { show: false },
-                axisTick: { show: false },
-            },
-            // 辅y轴
-            {
-                id: id2,
-                gridIndex: this.gridIndex,
-                type: 'value',
-                splitLine: { show: false },
-                axisLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#0005',
-                    },
-                },
-                axisLabel: { show: false },
-                axisTick: { show: false },
-            },
-        ]
-    }
-
-    // 构造一个 series
-    makeSeries({ equipmentName, arr }) {
-        this.currentGraphIndex += 2;
-        const bgStartTime = this.startTime.getTime();
-        const bgEndTime = bgStartTime + 3600 * 24 * 1000;
-        return [
-            // 沉默的背景
-            {
-                xAxisIndex: this.currentGraphIndex,
-                yAxisIndex: this.currentGraphIndex,
-                type: 'custom',
-                renderItem: renderItem,
-                silent: true,
-                itemStyle: {
-                    opacity: 0.8,
-                },
-                encode: {
-                    x: [1, 2],
-                    y: 0,
-                },
-                data: [
-                    {
-                        name: '无数据',
-                        value: [0, bgStartTime, bgEndTime, 0],
-                        tooltip: { show: false },
-                        itemStyle: {
-                            color: '#F2F4F9',
-                            opacity: 0.3,
-                        }
-                    },
-                ]
-            },
-            {
-                name: equipmentName,
-                xAxisIndex: this.currentGraphIndex,
-                yAxisIndex: this.currentGraphIndex,
-                type: 'custom',
-                renderItem: renderItem,
-                itemStyle: {
-                    opacity: 0.8,
-                },
-                encode: {
-                    x: [1, 2],
-                    y: 0,
-                },
-                data: arr.map(item => ({
-                    name: ['运行', '故障', '计划停机'][item.status],
-                    value: [0, item.startTime, item.startTime + item.duration * 60 * 1000, 0],
-                    itemStyle: {
-                        color: types[item.status].color,
-                    }
-                })),
-            },
-        ]
-    }
-
-    init(data) {
-        if (!this.el) throw new Error('没有可供echarts初始化的容器')
-        if (typeof this.el == 'string') {
-            this.el = document.querySelector(this.el);
-        }
-        this.chart = echarts.init(this.el);
-        this.handleProps(data);
-
-        setTimeout(() => {
-            // debugger;
-            this.chart.setOption(this.option);
-        }, 200);
-    }
-
-    update(data) {
-        this.clear();
-        this.init(data);
-    }
-
-    resize() {
-        this.chart.resize();
-    }
-
-    get option() {
-        return {
-            tooltip: this.tooltip,
-            grid: this.grid,
-            xAxis: this.xAxis,
-            yAxis: this.yAxis,
-            series: this.series,
-        }
-    }
-
-    // 每次 graphList 刷新都会重新渲染整个所有图表
-    // 可以改进的地方：添加一个 handleAdd() 方法，一次添加一个新的
-    handleProps(props) {
-        // props 是父组件的 graphList
-        console.log('props: ', props);
-        props.forEach(eqArr => {
-            this.grid.push(this.makeGrid());
-            this.xAxis.push(...this.makeXaxis());
-            this.yAxis.push(...this.makeYaxis(eqArr.key));
-            this.series.push(...this.makeSeries({ equipmentName: eqArr.key, arr: eqArr }))
-        });
-    }
-
-    // handleAdd
-    handleAdd() { }
-
-    clear() {
-        this.grid = [];
-        this.xAxis = [];
-        this.yAxis = [];
-        this.series = [];
-        this.currentGraphIndex = -2;
-        this.gridIndex = -1;
-        this.chart.dispose();
-    }
-
-    // print option
-    print() {
-        console.log(JSON.stringify(this.option, null, 2));
-    }
-
-}
diff --git a/src/views/equipment/timing-diagram/status/gantt.js b/src/views/equipment/timing-diagram/status/gantt.js
deleted file mode 100644
index c68031c0..00000000
--- a/src/views/equipment/timing-diagram/status/gantt.js
+++ /dev/null
@@ -1,302 +0,0 @@
-import * as echarts from 'echarts'
-
-function getStartTime(timestamp) {
-  return new Date(new Date(timestamp).toLocaleDateString()).getTime();
-}
-
-function renderItem(params, api) {
-  var categoryIndex = api.value(0);
-  var start = api.coord([api.value(1), categoryIndex]);
-  var end = api.coord([api.value(2), categoryIndex]);
-
-  var height = api.size([0, 1])[1] * 0.5;
-  var rectShape = echarts.graphic.clipRectByRect(
-    {
-      x: start[0],
-      y: start[1] - height / 2,
-      width: end[0] - start[0],
-      height: height,
-    },
-    {
-      x: params.coordSys.x,
-      y: params.coordSys.y - 16,
-      width: params.coordSys.width,
-      height: params.coordSys.height,
-    }
-  );
-
-  return (
-    rectShape && {
-      type: 'rect',
-      transition: ['shape'],
-      shape: rectShape,
-      style: api.style(),
-    }
-  );
-}
-
-// unused
-function getXaxisRange(startTime) {
-  return Array(24)
-    .fill(startTime)
-    .map((item, index) => {
-      return new Date(item + index * 3600 * 1000)
-        .toLocaleTimeString()
-        .split(':')
-        .slice(0, 2)
-        .join(':');
-    });
-}
-
-function getTodayStart(today) {
-  const [y, m, d] = [
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate(),
-  ];
-  // debugger;
-  return new Date(y, m, d).getTime();
-}
-
-
-/** 颜色配置 */
-const types = [
-  { name: '运行', color: '#288AFF' },
-  { name: '计划停机', color: '#FFDC94' },
-  { name: '故障', color: '#FC9C91' },
-  { name: '空白', color: '#F2F4F9' },
-];
-
-
-export default class GanttGraph {
-  // tooltip - 基本是固定的
-  tooltip = {
-    trigger: 'item',
-    axisPointer: {
-      type: 'none',
-    },
-    formatter: (params) => {
-      // debugger;
-      return `
-            <div style="display: flex; flex-direction: column;">
-                <span>${new Date(params.value[1]).toLocaleTimeString()} ~ ${new Date(params.value[2]).toLocaleTimeString()}</span>
-                <div style="display: flex; align-items: center; justify-content: space-between;">
-                    <div style="display: flex; align-items: center;">
-                        <span class="icon" style="width: 8px; height: 8px; border-radius: 2px; background: ${params.color}"></span>
-                        <span class="eq-name" style="margin-left: 4px;">${params.data.showName}</span>
-                    </div>
-                    <span class="run-status" style="margin-left: 8px; opacity: 0.6">${params.name}</span>
-            </div>
-            `
-    }
-  }
-  grid = []
-  xAxis = []
-  yAxis = []
-  series = []
-
-  constructor(el, startTime) {
-    this.el = el;
-    this.startTime = new Date(startTime);
-    // this.startTime = new Date(new Date('2023/10/8').toLocaleDateString());
-    // console.log('<> Gantt Created', this.startTime);
-  }
-  // 构造一个新的 grid
-  makeGrid() {
-    return {
-      top: 0,
-      right: 20,
-      left: 100,
-      bottom: 50,
-    }
-  }
-
-  // 构造一个 xAxis
-  makeXaxis() {
-    return [
-      {
-        axisTick: {
-          alignWithLabel: true,
-          inside: true,
-        },
-        type: 'time',
-        min: getTodayStart(this.startTime),
-        max: getStartTime(this.startTime.getTime() + 3600 * 24 * 1000),
-        splitNumber: 10,
-        axisLabel: {
-          margin: 12,
-          formatter: function (val) {
-            return new Date(val)
-              .toLocaleTimeString()
-              .split(':')
-              .slice(0, 2)
-              .join(':');
-          },
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#0005',
-          },
-        },
-        boundaryGap: false,
-        // data: getXaxisRange(getTodayStart(new Date())),
-      },
-    ]
-  }
-
-
-  // 构造一个 yAxis
-  makeYaxis(equipmentName) {
-    return [
-      // 主y轴
-      {
-        data: equipmentName,
-      }
-    ]
-  }
-
-  // 构造一个 series
-  makeSeries(xdata) {
-    const bgStartTime = this.startTime.getTime();
-    const bgEndTime = bgStartTime + 3600 * 24 * 1000;
-    return [
-      {
-        type: 'custom',
-        renderItem: renderItem,
-        itemStyle: {
-          opacity: 0.8,
-        },
-        encode: {
-          x: [1, 2],
-          y: 0,
-        },
-        data: xdata,
-      },
-    ]
-  }
-
-  init(data) {
-    if (!this.el) throw new Error('没有可供echarts初始化的容器')
-    if (typeof this.el == 'string') {
-      this.el = document.querySelector(this.el);
-    }
-    this.chart = echarts.init(this.el);
-    this.handleProps(data);
-
-    setTimeout(() => {
-      // debugger;
-      this.chart.setOption(this.option);
-    }, 200);
-  }
-
-  update(data) {
-    this.clear();
-    this.init(data);
-  }
-
-  resize() {
-    this.chart.resize();
-  }
-
-  get option() {
-    return {
-      tooltip: this.tooltip,
-      grid: this.grid,
-      xAxis: this.xAxis,
-      yAxis: this.yAxis,
-      series: this.series,
-      dataZoom: [
-        {
-          type: 'slider',
-          xAxisIndex: 0,
-          filterMode: 'weakFilter',
-          height: 20,
-          bottom: 0,
-          start: 0,
-          end: 80,
-          handleIcon:
-            'path://M10.7,11.9H9.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-          handleSize: '80%',
-          showDetail: false
-        },
-        {
-          type: 'inside',
-          id: 'insideX',
-          xAxisIndex: 0,
-          filterMode: 'weakFilter',
-          start: 0,
-          end: 80,
-          zoomOnMouseWheel: true,
-          moveOnMouseMove: true
-        },
-        {
-          type: 'slider',
-          yAxisIndex: 0,
-          zoomLock: true,
-          width: 10,
-          right: 10,
-          top: 70,
-          bottom: 20,
-          start: 0,
-          end: 100,
-          handleSize: 0,
-          showDetail: false
-        },
-        {
-          type: 'inside',
-          id: 'insideY',
-          yAxisIndex: 0,
-          start: 0,
-          end: 100,
-          zoomOnMouseWheel: true,
-          moveOnMouseMove: true,
-          moveOnMouseWheel: true
-        }
-      ],
-    }
-  }
-
-  // 每次 graphList 刷新都会重新渲染整个所有图表
-  // 可以改进的地方：添加一个 handleAdd() 方法，一次添加一个新的
-  handleProps(props) {
-    // props 是父组件的 graphList
-    console.log('props: ', props);
-    let ylist = []
-    let xdata = []
-    props.forEach((eqArr, index) => {
-      ylist.push(eqArr.key)
-      eqArr.forEach(item => {
-        xdata.push({
-          name: ['运行', '计划停机', '故障'][item.status],
-          showName: eqArr.key,
-          value: [index, item.startTime, item.startTime + item.duration * 60 * 1000, 0],
-          itemStyle: {
-            color: types[item.status].color,
-          }
-        }
-        )
-      })
-    });
-    this.grid.push(this.makeGrid());
-    this.xAxis.push(...this.makeXaxis());
-    this.yAxis.push(...this.makeYaxis(ylist));
-    this.series.push(...this.makeSeries(xdata))
-  }
-
-  // handleAdd
-  handleAdd() { }
-
-  clear() {
-    this.grid = [];
-    this.xAxis = [];
-    this.yAxis = [];
-    this.series = [];
-    this.chart.dispose();
-  }
-
-  // print option
-  print() {
-    console.log(JSON.stringify(this.option, null, 2));
-  }
-
-}
diff --git a/src/views/equipment/timing-diagram/status/index-old.vue b/src/views/equipment/timing-diagram/status/index-old.vue
deleted file mode 100644
index fb34a225..00000000
--- a/src/views/equipment/timing-diagram/status/index-old.vue
+++ /dev/null
@@ -1,529 +0,0 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-09-04 09:34:52
-    description: 设备状态时序图
--->
-
-<template>
-	<div class="status-timegraph-container" style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
-		<el-row class="" style="
-				margin-bottom: 12px;
-				background: #fff;
-				padding: 16px 16px 0;
-				border-radius: 8px;
-			">
-			<div class="blue-title">生产节拍时序图</div>
-			<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" :remove-blue="true"
-				@select-changed="handleSearchBarSelectChange" @headBtnClick="handleSearchBarBtnClick" />
-		</el-row>
-
-		<el-row class="" style="
-				height: 1px;
-				flex: 1;
-				margin-bottom: 12px;
-				background: #fff;
-				padding: 16px 16px 32px;
-				border-radius: 8px;
-				display: flex;
-				flex-direction: column;
-			">
-			<el-row :gutter="20">
-				<el-col :span="6">
-					<div class="blue-title">设备状态时序图</div>
-				</el-col>
-				<el-col :span="18" class="legend-row">
-					<div class="legend">
-						<div class="icon running"></div>
-						<div>运行中</div>
-					</div>
-					<div class="legend">
-						<div class="icon fault"></div>
-						<div>故障</div>
-					</div>
-					<div class="legend">
-						<div class="icon stop"></div>
-						<div>计划停机</div>
-					</div>
-				</el-col>
-			</el-row>
-			<div class="main-area" style="flex: 1; display: flex; flex-direction: column;">
-				<div class="graphs" v-show="graphList.length" id="status-chart" style="height: 1px; flex: 1;"></div>
-				<h2 v-if="!graphList || graphList.length == 0" class="no-data-bg"></h2>
-			</div>
-		</el-row>
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog dialogTitle="添加设备" :dialogVisible="open" width="500px" @close="open = false" @cancel="open = false"
-			@confirm="submitForm">
-			<el-select v-if="open" style="width: 100%" v-model="queryParams.equipmentId" placeholder="请选择一个设备">
-				<el-option v-for="eq in eqList" :key="eq.id" :value="eq.id" :label="eq.name"></el-option>
-			</el-select>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import Gantt from './gantt';
-
-export default {
-	name: 'SGStatus',
-	components: {},
-	props: {},
-	data() {
-		return {
-			chart: null,
-			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					placeholder: '请选择产线',
-					selectOptions: [],
-					param: 'lineId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '工段',
-					placeholder: '请选择工段',
-					selectOptions: [],
-					param: 'sectionId',
-				},
-				// 时间段
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'date',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					placeholder: '选择日期',
-					param: 'recordTime',
-					required: true,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '添加对比',
-					name: 'compare',
-					color: 'primary',
-					plain: true,
-				},
-			],
-			queryParams: {
-				lineId: null,
-				sectionId: null,
-				equipmentId: null,
-				recordTime: null,
-			},
-			graphList: [],
-			existingEquipments: [],
-			open: false,
-			eqList: [],
-			startTime: null,
-			gantt: null
-			// demo: [
-			// 	[
-			// 		{
-			// 			equipmentName: '下片机',
-			// 			duration: 30,
-			// 			relativeDuration: 0.6,
-			// 			status: 0,
-			// 			startPos: 0,
-			//             startTime: 1691568181000,
-			// 		},
-			// 		{
-			// 			equipmentName: '下片机',
-			// 			duration: 20,
-			// 			relativeDuration: 0.4,
-			// 			status: 2,
-			// 			startPos: 30,
-			//             startTime: 1691569981000
-			// 		},
-			// 	],
-			// ],
-		};
-	},
-	computed: {},
-	created() {
-		this.initProductline();
-		this.initWorksection();
-		this.initEquipment();
-		// this.getList();
-	},
-	mounted() { },
-	watch: {
-		graphList: {
-			handler(val) {
-				if (val && val.length) {
-					this.$nextTick(() => {
-						if (!this.gantt) {
-							this.gantt = new Gantt('#status-chart', this.startTime);
-							this.gantt.init(val);
-							return;
-						}
-						this.gantt.update(val);
-
-					});
-				}
-				return;
-			},
-			deep: true,
-			immediate: true,
-		},
-	},
-	methods: {
-		findMin() {
-			let min = 0;
-			this.graphList.forEach((arr) => {
-				arr.forEach((item) => {
-					if (min < item.startTime) min = item.startTime;
-				});
-			});
-			return min;
-		},
-
-		/** 重置查询条件 */
-		initQuery() {
-			this.queryParams.lineId = null;
-			this.queryParams.equipmentId = null;
-			this.queryParams.sectionId = null;
-			this.queryParams.recordTime = null;
-		},
-
-		/** 对象到数组的转换 */
-		objectToArray(obj) {
-			return Object.keys(obj).map((key) => {
-				obj[key].sort((a, b) => a.startTime - b.startTime);
-				obj[key].key = key;
-				return obj[key];
-			});
-		},
-
-		async getList() {
-			const { code, data } = await this.$axios({
-				url: '/analysis/equipment-analysis/status',
-				method: 'get',
-				params: this.queryParams,
-			});
-			if (code == 0) {
-				this.existingEquipments = Object.values(data).map((eq) => eq[0].equipmentId);
-				this.graphList = this.objectToArray(data);
-			}
-		},
-
-		/** 准备设备数据 */
-		async initEquipment() {
-			const { code, data } = await this.$axios({
-				url: '/base/equipment/listAll',
-				method: 'get',
-			});
-			if (code == 0) {
-				this.eqList = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-
-		/** 准备产线数据 */
-		async initProductline() {
-			const { code, data } = await this.$axios({
-				url: '/base/production-line/listAll',
-				method: 'get',
-			});
-			if (code == 0) {
-				this.searchBarFormConfig[0].selectOptions = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-
-		/** 准备工段数据 */
-		async initWorksection() {
-			const { code, data } = await this.$axios({
-				url: '/base/workshop-section/listAll',
-				method: 'get',
-			});
-			if (code == 0) {
-				this.searchBarFormConfig[1].selectOptions = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-
-		handleSearchBarSelectChange({ param, value }) {
-			if (!value) {
-				this.searchBarFormConfig[1].selectOptions = [];
-				return;
-			}
-			switch (param) {
-				case 'lineId':
-					this.$axios({
-						url: '/base/workshop-section/listByParentId',
-						method: 'get',
-						params: {
-							id: value,
-						},
-					}).then(({ code, data }) => {
-						if (code == 0) {
-							this.searchBarFormConfig[1].selectOptions = data.map((item) => {
-								return {
-									name: item.name,
-									id: item.id,
-								};
-							});
-						}
-					});
-			}
-		},
-
-		handleSearchBarBtnClick({ btnName, ...payload }) {
-			switch (btnName) {
-				case 'search':
-					if (!payload.recordTime || payload.recordTime.length <= 0) {
-						this.$message.warning('请选择时间段');
-						return;
-					}
-
-					this.startTime = new Date(payload.recordTime)
-					this.queryParams.lineId = payload.lineId || null;
-					this.queryParams.sectionId = payload.sectionId || null;
-					this.queryParams.equipmentId = payload.equipmentId || null;
-					this.queryParams.recordTime = payload.recordTime
-						? [
-							payload.recordTime,
-							new Date(
-								new Date(payload.recordTime).getTime() + 24 * 3600 * 1000
-							)
-								.toLocaleDateString()
-								.split('/')
-								.map((value, index) => {
-									if (index == 1 || index == 2) {
-										return value.padStart(2, '0');
-									}
-									return value;
-								})
-								.join('-') + ' 00:00:00',
-						]
-						: null;
-					this.getList();
-					break;
-				case 'compare':
-					this.open = true;
-					break;
-			}
-		},
-
-		async submitForm() {
-			if (this.existingEquipments.indexOf(this.queryParams.equipmentId) >= 0) {
-				this.$message.warning('该设备已存在');
-				return;
-			}
-      const {sectionId,...params} = this.queryParams
-			const { code, data } = await this.$axios({
-				url: '/analysis/equipment-analysis/status',
-				method: 'get',
-				params: params,
-			});
-			if (code == 0) {
-				const newEqlist = this.objectToArray(data);
-				if (!newEqlist || newEqlist.length == 0) {
-					this.$message.warning('该设备没有状态数据');
-					return;
-				}
-				this.graphList.push(newEqlist[0]);
-			}
-			this.open = false;
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.graph {
-	// border: 1px solid #ccc;
-	// padding: 12px 12px 28px 12px;
-	// margin: 64px 0;
-	position: relative;
-	display: flex;
-}
-
-.graph-title {
-	// position: absolute;
-	// top: -64px;
-	// left: -1px;
-	// padding: 8px 18px;
-	padding: 0 12px;
-	font-size: 14px;
-	line-height: 1;
-}
-
-.graph-content {
-	display: flex;
-	flex: 1;
-	padding: 22px 12px;
-	border: 1px solid #ccc;
-	border-bottom-width: 2px;
-	border-top: none;
-	position: relative;
-}
-
-.graph-content::after,
-.graph-content::before {
-	content: '';
-	position: absolute;
-	width: 3px;
-	height: 80%;
-	background: #fff;
-	right: -1px;
-	top: 0;
-}
-
-.graph-content::before {
-	right: unset;
-	left: -1px;
-}
-
-.graph-item,
-.graph-item-fixed {
-	// height: 88px;
-	// width: 24px;
-	flex: 1;
-	// border: 1px solid #ccc;
-	position: relative;
-}
-
-.graph-item-fixed {
-	flex: unset;
-}
-
-.graph-item::before,
-.graph-item-fixed::before {
-	position: absolute;
-	bottom: -16px;
-	left: 0;
-	content: attr(data-time);
-	// font-size - js
-	// rotate - js
-	// color - js, default:
-	color: #777;
-	transform-origin: left top;
-	transform: rotate(12deg);
-}
-
-.graph-item-fixed::after,
-.graph-item::after {
-	content: '';
-	position: absolute;
-	left: 0;
-	bottom: -3px;
-	display: inline-block;
-}
-
-.graph-item.tick::after,
-.graph-item-fixed.tick::after {
-	width: 1px;
-	height: 6px;
-	border-left: 1px solid #777;
-}
-
-.running {
-	background-color: #288AFF;
-	// background-color: #84f04e;
-}
-
-.waiting {
-	background-color: #5ad8a6;
-	// background-color: #409eff;
-}
-
-.fault {
-	// background-color: #ea5b5b;
-	background-color: #FC9C91;
-}
-
-.full {
-	// background-color: #e6a23c;
-	background-color: #598fff;
-}
-
-.lack {
-	// background-color: #a69c8d;
-	background-color: #7585a2;
-}
-
-.stop {
-	background-color: #FFDC94;
-}
-
-.legend-row {
-	margin: 6px 0;
-	padding-right: 12px;
-	display: flex;
-	justify-content: flex-end;
-
-	>.legend:not(:last-child) {
-		margin-right: 12px;
-	}
-
-	.legend {
-		display: flex;
-		align-items: center;
-	}
-
-	.icon {
-		width: 8px;
-		height: 8px;
-		border-radius: 2px;
-		margin-right: 4px;
-		margin-top: 1px;
-	}
-}
-
-.blue-title {
-	position: relative;
-	padding: 4px 0;
-	padding-left: 12px;
-	font-size: 14px;
-	color: #606266;
-	font-weight: 700;
-	margin-bottom: 12px;
-
-	&::before {
-		content: '';
-		position: absolute;
-		left: 0;
-		top: 6px;
-		height: 16px;
-		width: 4px;
-		border-radius: 1px;
-		background: #0b58ff;
-	}
-}
-
-.echarts__status-chart {
-	background: #ccc;
-}
-
-.echarts__status-chart>div {
-	height: 100% !important;
-	width: 100% !important;
-}
-</style>
diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue
deleted file mode 100644
index f6f57bd9..00000000
--- a/src/views/equipment/timing-diagram/status/index.vue
+++ /dev/null
@@ -1,483 +0,0 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-09-04 09:34:52
-    description: 设备状态时序图
--->
-
-<template>
-	<div
-		class="status-timegraph-container"
-		style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
-		<el-row
-			class=""
-			style="
-				margin-bottom: 12px;
-				background: #fff;
-				padding: 16px 16px 0;
-				border-radius: 8px;
-			">
-			<div class="blue-title">生产节拍时序图</div>
-			<SearchBar
-				:formConfigs="searchBarFormConfig"
-				ref="search-bar"
-				:remove-blue="true"
-				@headBtnClick="handleSearchBarBtnClick" />
-		</el-row>
-
-		<el-row
-			class=""
-			style="
-				height: 1px;
-				flex: 1;
-				margin-bottom: 12px;
-				background: #fff;
-				padding: 16px 16px 32px;
-				border-radius: 8px;
-				display: flex;
-				flex-direction: column;
-			">
-			<el-row :gutter="20">
-				<el-col :span="6">
-					<div class="blue-title">设备状态时序图</div>
-				</el-col>
-				<el-col :span="18" class="legend-row">
-					<div class="legend">
-						<div class="icon running"></div>
-						<div>运行中</div>
-					</div>
-					<div class="legend">
-						<div class="icon fault"></div>
-						<div>故障</div>
-					</div>
-					<div class="legend">
-						<div class="icon stop"></div>
-						<div>计划停机</div>
-					</div>
-				</el-col>
-			</el-row>
-			<div
-				class="main-area"
-				style="flex: 1; display: flex; flex-direction: column">
-				<div
-					class="graphs"
-					v-show="graphList.length"
-					id="status-chart"
-					style="height: 1px; flex: 1"></div>
-				<h2 v-if="!graphList || graphList.length == 0" class="no-data-bg"></h2>
-			</div>
-		</el-row>
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			dialogTitle="添加设备"
-			:dialogVisible="open"
-			width="500px"
-			@close="open = false"
-			@cancel="open = false"
-			@confirm="submitForm">
-			<el-select
-				v-if="open"
-				style="width: 100%"
-				v-model="queryParams.equipmentId"
-				placeholder="请选择一个设备">
-				<el-option
-					v-for="eq in eqList"
-					:key="eq.id"
-					:value="eq.id"
-					:label="eq.name"></el-option>
-			</el-select>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import Gantt from './gantt';
-
-export default {
-	name: 'SGStatus',
-	components: {},
-	props: {},
-	data() {
-		return {
-			chart: null,
-			searchBarFormConfig: [
-				// 时间段
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'date',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					placeholder: '选择日期',
-					param: 'recordTime',
-					required: true,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '添加对比',
-					name: 'compare',
-					color: 'primary',
-					plain: true,
-				},
-			],
-			queryParams: {
-				equipmentId: null,
-				recordTime: null,
-			},
-			graphList: [],
-			existingEquipments: [],
-			open: false,
-			eqList: [],
-			startTime: null,
-			gantt: null,
-		};
-	},
-	computed: {},
-	created() {
-		const now = new Date();
-		const year = now.getFullYear();
-		const month = String(now.getMonth() + 1).padStart(2, '0');
-		const day = String(now.getDate()).padStart(2, '0');
-    const formattedDate = `${year}-${month}-${day} 00:00:00`;
-		this.$nextTick(() => {
-			this.$refs['search-bar'].formInline.recordTime = formattedDate;
-		});
-		this.queryParams.equipmentId = Number(this.$route.query.eqid);
-		this.startTime = new Date(formattedDate);
-		this.queryParams.recordTime = formattedDate
-			? [
-      formattedDate,
-					new Date(new Date(formattedDate).getTime() + 24 * 3600 * 1000)
-						.toLocaleDateString()
-						.split('/')
-						.map((value, index) => {
-							if (index == 1 || index == 2) {
-								return value.padStart(2, '0');
-							}
-							return value;
-						})
-						.join('-') + ' 00:00:00',
-			  ]
-			: null;
-		this.getList();
-		this.initEquipment();
-	},
-	mounted() {
-  },
-	watch: {
-		graphList: {
-			handler(val) {
-				if (val && val.length) {
-					this.$nextTick(() => {
-						if (!this.gantt) {
-							this.gantt = new Gantt('#status-chart', this.startTime);
-							this.gantt.init(val);
-							return;
-						}
-						this.gantt.update(val);
-					});
-				}
-				return;
-			},
-			deep: true,
-			immediate: true,
-		},
-	},
-	methods: {
-		findMin() {
-			let min = 0;
-			this.graphList.forEach((arr) => {
-				arr.forEach((item) => {
-					if (min < item.startTime) min = item.startTime;
-				});
-			});
-			return min;
-		},
-
-		/** 重置查询条件 */
-		initQuery() {
-			this.queryParams.equipmentId = null;
-			this.queryParams.recordTime = null;
-		},
-
-		/** 对象到数组的转换 */
-		objectToArray(obj) {
-			return Object.keys(obj).map((key) => {
-				obj[key].sort((a, b) => a.startTime - b.startTime);
-				obj[key].key = key;
-				return obj[key];
-			});
-		},
-
-		async getList() {
-			const { code, data } = await this.$axios({
-				url: '/analysis/equipment-analysis/status',
-				method: 'get',
-				params: this.queryParams,
-			});
-			if (code == 0) {
-				this.existingEquipments = Object.values(data).map(
-					(eq) => eq[0].equipmentId
-				);
-				this.graphList = this.objectToArray(data);
-			}
-		},
-
-		/** 准备设备数据 */
-		async initEquipment() {
-			const { code, data } = await this.$axios({
-				url: '/base/equipment/listAll',
-				method: 'get',
-			});
-			if (code == 0) {
-				this.eqList = data.map((item) => {
-					return {
-						name: item.name,
-						id: item.id,
-					};
-				});
-			}
-		},
-
-		handleSearchBarBtnClick({ btnName, ...payload }) {
-      this.queryParams.equipmentId = Number(this.$route.query.eqid);
-			switch (btnName) {
-				case 'search':
-					if (!payload.recordTime || payload.recordTime.length <= 0) {
-						this.$message.warning('请选择时间段');
-						return;
-					}
-
-					this.startTime = new Date(payload.recordTime);
-					this.queryParams.recordTime = payload.recordTime
-						? [
-								payload.recordTime,
-								new Date(
-									new Date(payload.recordTime).getTime() + 24 * 3600 * 1000
-								)
-									.toLocaleDateString()
-									.split('/')
-									.map((value, index) => {
-										if (index == 1 || index == 2) {
-											return value.padStart(2, '0');
-										}
-										return value;
-									})
-									.join('-') + ' 00:00:00',
-						  ]
-						: null;
-					this.getList();
-					break;
-				case 'compare':
-					this.open = true;
-					break;
-			}
-		},
-
-		async submitForm() {
-			if (this.existingEquipments.indexOf(this.queryParams.equipmentId) >= 0) {
-				this.$message.warning('该设备已存在');
-				return;
-			}
-			const { ...params } = this.queryParams;
-			const { code, data } = await this.$axios({
-				url: '/analysis/equipment-analysis/status',
-				method: 'get',
-				params: params,
-			});
-			if (code == 0) {
-				const newEqlist = this.objectToArray(data);
-				if (!newEqlist || newEqlist.length == 0) {
-					this.$message.warning('该设备没有状态数据');
-					return;
-				}
-				this.graphList.push(newEqlist[0]);
-			}
-			this.open = false;
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.graph {
-	// border: 1px solid #ccc;
-	// padding: 12px 12px 28px 12px;
-	// margin: 64px 0;
-	position: relative;
-	display: flex;
-}
-
-.graph-title {
-	// position: absolute;
-	// top: -64px;
-	// left: -1px;
-	// padding: 8px 18px;
-	padding: 0 12px;
-	font-size: 14px;
-	line-height: 1;
-}
-
-.graph-content {
-	display: flex;
-	flex: 1;
-	padding: 22px 12px;
-	border: 1px solid #ccc;
-	border-bottom-width: 2px;
-	border-top: none;
-	position: relative;
-}
-
-.graph-content::after,
-.graph-content::before {
-	content: '';
-	position: absolute;
-	width: 3px;
-	height: 80%;
-	background: #fff;
-	right: -1px;
-	top: 0;
-}
-
-.graph-content::before {
-	right: unset;
-	left: -1px;
-}
-
-.graph-item,
-.graph-item-fixed {
-	// height: 88px;
-	// width: 24px;
-	flex: 1;
-	// border: 1px solid #ccc;
-	position: relative;
-}
-
-.graph-item-fixed {
-	flex: unset;
-}
-
-.graph-item::before,
-.graph-item-fixed::before {
-	position: absolute;
-	bottom: -16px;
-	left: 0;
-	content: attr(data-time);
-	// font-size - js
-	// rotate - js
-	// color - js, default:
-	color: #777;
-	transform-origin: left top;
-	transform: rotate(12deg);
-}
-
-.graph-item-fixed::after,
-.graph-item::after {
-	content: '';
-	position: absolute;
-	left: 0;
-	bottom: -3px;
-	display: inline-block;
-}
-
-.graph-item.tick::after,
-.graph-item-fixed.tick::after {
-	width: 1px;
-	height: 6px;
-	border-left: 1px solid #777;
-}
-
-.running {
-	background-color: #288aff;
-	// background-color: #84f04e;
-}
-
-.waiting {
-	background-color: #5ad8a6;
-	// background-color: #409eff;
-}
-
-.fault {
-	// background-color: #ea5b5b;
-	background-color: #fc9c91;
-}
-
-.full {
-	// background-color: #e6a23c;
-	background-color: #598fff;
-}
-
-.lack {
-	// background-color: #a69c8d;
-	background-color: #7585a2;
-}
-
-.stop {
-	background-color: #ffdc94;
-}
-
-.legend-row {
-	margin: 6px 0;
-	padding-right: 12px;
-	display: flex;
-	justify-content: flex-end;
-
-	> .legend:not(:last-child) {
-		margin-right: 12px;
-	}
-
-	.legend {
-		display: flex;
-		align-items: center;
-	}
-
-	.icon {
-		width: 8px;
-		height: 8px;
-		border-radius: 2px;
-		margin-right: 4px;
-		margin-top: 1px;
-	}
-}
-
-.blue-title {
-	position: relative;
-	padding: 4px 0;
-	padding-left: 12px;
-	font-size: 14px;
-	color: #606266;
-	font-weight: 700;
-	margin-bottom: 12px;
-
-	&::before {
-		content: '';
-		position: absolute;
-		left: 0;
-		top: 6px;
-		height: 16px;
-		width: 4px;
-		border-radius: 1px;
-		background: #0b58ff;
-	}
-}
-
-.echarts__status-chart {
-	background: #ccc;
-}
-
-.echarts__status-chart > div {
-	height: 100% !important;
-	width: 100% !important;
-}
-</style>
diff --git a/src/views/group/Calendar/holidayLog.vue b/src/views/group/Calendar/holidayLog.vue
deleted file mode 100644
index a02dd230..00000000
--- a/src/views/group/Calendar/holidayLog.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-23 13:43:55
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-23 16:50:43
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<div v-for="item in groupClassArr" :key="item.planId">
-			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
-				{{item.planName}}
-			</small-title>
-			<base-table
-				:table-props="tableProps"
-				:table-data="
-					tableData.filter((titem) => titem.schedulingPlanId == item.planId)
-				"></base-table>
-		</div>
-	</div>
-</template>
-
-<script>
-import SmallTitle from '../Schedule/SmallTitle';
-
-const tableProps = [
-	{
-		prop: 'classesName',
-		label: '班次名称',
-	},
-	{
-		prop: 'workTime',
-		label: '班次时间',
-	},
-	{
-		prop: 'teamName',
-		label: '班组名称',
-	},
-	{
-		prop: 'teamLeader',
-		label: '组长',
-	},
-	{
-		prop: 'teamLeaderPhone',
-		label: '组长电话',
-	},
-];
-
-export default {
-	components: {
-		SmallTitle,
-	},
-	data() {
-		return {
-			tableProps,
-			tableData: [],
-			groupClassArr: [],
-		};
-	},
-	created() {},
-	methods: {
-		init(det) {
-			this.tableData = det;
-			//返回计划名和id
-			const arr = det.map((item) => {
-				const obj = {
-					planName: item.schedulingPlanName,
-					planId: item.schedulingPlanId,
-				};
-				return obj;
-			});
-			//去重
-			const map = new Map();
-			arr.forEach((item) => {
-				if (!map.has(item.planId)) {
-					map.set(item.planId, item);
-				}
-			});
-			this.groupClassArr = Array.from(map.values());
-		},
-	},
-};
-</script>
diff --git a/src/views/group/Calendar/index.vue b/src/views/group/Calendar/index.vue
deleted file mode 100644
index de8291f0..00000000
--- a/src/views/group/Calendar/index.vue
+++ /dev/null
@@ -1,567 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-23 13:43:55
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-24 11:14:55
- * @Description:
--->
-<template>
-	<el-row :gutter="10" style="background-color: #f2f4f9">
-		<!--部门数据-->
-		<el-col :span="4">
-			<div class="head-container">
-				<el-tabs v-model="activeName" stretch @tab-click="tabsClick">
-					<el-tab-pane label="部门" name="first"></el-tab-pane>
-					<el-tab-pane label="班组" name="second"></el-tab-pane>
-				</el-tabs>
-				<div v-if="activeName == 'first'">
-					<el-input
-						v-model="deptName"
-						placeholder="请输入部门名称"
-						clearable
-						size="small"
-						prefix-icon="el-icon-search"
-						style="margin-bottom: 20px" />
-					<el-tree
-						:data="deptOptions"
-						:props="defaultProps"
-						:expand-on-click-node="false"
-						:filter-node-method="filterNode"
-						ref="tree"
-						default-expand-all
-						highlight-current
-						@node-click="handleNodeClick" />
-				</div>
-				<div v-else>
-					<el-input
-						v-model="groupName"
-						placeholder="请输入班组名称"
-						clearable
-						size="small"
-						prefix-icon="el-icon-search"
-						style="margin-bottom: 20px" />
-					<el-tree
-						:data="groupOptions"
-						:props="defaultProps"
-						:expand-on-click-node="false"
-						:filter-node-method="filterNode"
-						ref="tree1"
-						default-expand-all
-						highlight-current
-						@node-click="handleNodeClick1" />
-				</div>
-			</div>
-		</el-col>
-		<el-col :span="20">
-			<div class="groupTeamScheduling">
-				<div class="operationArea">
-					<el-form :inline="true" class="demo-form-inline">
-						<span class="blue-block"></span>
-						<el-form-item label="月份选择">
-							<el-date-picker
-								v-model="startDay"
-								type="month"
-								placeholder="选择月"
-								size="small"
-								@change="selectMonth"
-								:clearable="false"
-								style="width: 120px"></el-date-picker>
-							<span
-								style="color: #909399; font-size: 12px"
-								v-if="activeName == 'first'">
-								提示：排班日历仅展示当前选中部门的节假日设置，若休假日中仍有排班，则表示下级组织已通过自定义假期进行排班。
-							</span>
-							<span v-else>
-								组长:{{ showTeamName?.leaderName || '-' }} 组长电话:{{
-									showTeamName?.leaderPhone || '-'
-								}}
-							</span>
-						</el-form-item>
-						<el-form-item style="float: right">
-							<el-button
-								size="small"
-								type="primary"
-								@click="(startDay = new Date()), getHolidayPage()">
-								跳转到今天
-							</el-button>
-						</el-form-item>
-					</el-form>
-				</div>
-				<!-- 日历区域 -->
-				<div class="calenderArea">
-					<el-calendar v-model="startDay">
-						<template slot="dateCell" slot-scope="{ data }">
-							<div v-if="data.type === 'current-month'">
-								<!-- 日期 -->
-								<div class="dateStyle">
-									<el-row :gutter="20">
-										<!-- 公历和农历 -->
-										<el-col :span="18">
-											{{ Number(data.day.split('-')[2]) }}
-											<div class="lunar-date">{{ getLunarDate(data.day) }}</div>
-										</el-col>
-										<!-- 显示假或班 -->
-										<el-col :span="6">
-											<div
-												class="work-tip"
-												:style="{
-													backgroundColor: HolidayList[
-														Number(data.day.split('-')[2]) - 1
-													]?.isHoliday
-														? '#67C23A'
-														: '#409EFF',
-												}">
-												{{
-													HolidayList[Number(data.day.split('-')[2]) - 1]
-														?.isHoliday
-														? '假'
-														: '班'
-												}}
-                        <!-- //变更节假日未更新排班计划的角标 -->
-												<div
-													class="subIcon"
-													v-if="
-														HolidayList[Number(data.day.split('-')[2]) - 1]
-															?.isUpdate
-													">
-													<el-tooltip
-														effect="dark"
-														content="本日节假日变更已影响当前排班计划，但尚未同步，请及时处理。"
-														placement="top">
-														<i
-															class="el-icon-warning"
-															style="color: #f56c6c"></i>
-													</el-tooltip>
-												</div>
-											</div>
-										</el-col>
-										<!-- 显示排班 -->
-										<div
-											v-if="
-												HolidayList[Number(data.day.split('-')[2]) - 1]?.det
-													.length > 0
-											">
-											<el-col
-												:span="24"
-												v-for="(item, index) in HolidayList[
-													Number(data.day.split('-')[2]) - 1
-												]?.det.filter(
-													(item) =>
-														item.schedulingPlanId ==
-														HolidayList[Number(data.day.split('-')[2]) - 1]
-															?.schedulingPlanId
-												)"
-												:key="index">
-												<el-tooltip
-													effect="dark"
-													content="点击展示全部排班计划"
-													placement="top-start">
-													<div
-														class="holiday-div"
-														:style="{
-															backgroundColor:
-																holidayDivColor[item?.classesCode],
-														}"
-														@click="
-															holidayLog(
-																HolidayList[Number(data.day.split('-')[2]) - 1]
-																	?.det,
-																HolidayList[Number(data.day.split('-')[2]) - 1]
-																	?.date
-															)
-														"
-														:title="
-															item.classesName +
-															' | ' +
-															item.teamName +
-															' | ' +
-															item.workTime
-														">
-														{{
-															item.classesName +
-															' | ' +
-															item.teamName +
-															' | ' +
-															item.workTime
-														}}
-													</div>
-												</el-tooltip>
-											</el-col>
-										</div>
-									</el-row>
-								</div>
-							</div>
-							<div
-								v-else
-								style="font-size: 20px; font-weight: 500; text-align: left">
-								<el-row :gutter="20">
-									<el-col :span="24">
-										{{ Number(data.day.split('-')[2]) }}
-										<span style="font-size: 12px">
-											{{ getLunarDate(data.day) }}
-										</span>
-									</el-col>
-								</el-row>
-							</div>
-						</template>
-					</el-calendar>
-				</div>
-			</div>
-		</el-col>
-		<base-dialog
-			:dialogTitle="dialogTitle"
-			:dialogVisible="logVisible"
-			@cancel="cancelLog"
-			:before-close="cancelLog"
-			:destroy-on-close="true"
-			width="70%">
-			<holiday-log ref="holidayLogRef"></holiday-log>
-			<template #footer>
-				<slot name="footer">
-					<el-row slot="footer" type="flex" justify="end">
-						<el-col :span="24">
-							<el-button size="small" class="btnTextStyle" @click="cancelLog">
-								取消
-							</el-button>
-						</el-col>
-					</el-row>
-				</slot>
-			</template>
-		</base-dialog>
-	</el-row>
-</template>
-
-<script>
-import moment from 'moment';
-import { solarToLunar } from 'chinese-lunar';
-
-import { getUserProfile } from '@/api/system/user';
-import { listByDeptId } from '@/api/group/Schedule';
-import { getEnableData } from '@/api/group/holidaySetting';
-import {
-	getDeptSchedulingList,
-	getClassSchedulingList,
-} from '@/api/group/calendar';
-import holidayLog from './holidayLog';
-
-export default {
-	name: '',
-	components: {
-		holidayLog,
-	},
-	data() {
-		return {
-			activeName: 'first',
-			startDay: '', // 查询参数
-			HolidayList: [],
-			// 选择的部门名称
-			showDeptName: undefined,
-			showTeamName: {},
-			// 部门树选项
-			deptOptions: undefined,
-			groupOptions: undefined,
-			// 查询的部门名称
-			deptName: undefined,
-			groupName: undefined,
-
-			topDept: {}, // 保存当前用户的部门id为最高级部门id
-			deptId: undefined,
-			teamId: undefined,
-
-			defaultProps: {
-				children: 'children',
-				label: 'name',
-			},
-			logVisible: false,
-			dialogTitle: '',
-			holidayDivColor: ['#67c23a', '#69d983', '#f5c931', '#4fa6f0'],
-		};
-	},
-	watch: {
-		// 根据名称筛选部门树
-		deptName(val) {
-			this.$refs.tree.filter(val);
-		},
-		groupName(val) {
-			this.$refs.tree1.filter(val);
-		},
-	},
-	created() {
-		this.startDay = new Date();
-		// 查询用户个人信息
-		getUserProfile().then((response) => {
-			this.showDeptName = response.data.dept.name || '';
-			this.topDept = {
-				name: response.data.dept.name || '',
-				id: response.data.dept.id || '',
-			}; // 保存当前用户的部门为最高级部门id
-			this.deptId = response.data.dept.id || '';
-			this.getHolidayPage();
-			this.getTreeselect();
-		});
-	},
-	methods: {
-		getHolidayPage() {
-			const now = new Date(this.startDay);
-			const year = now.getFullYear();
-			const month = now.getMonth();
-			const startTime = `${year}-${String(month + 1).padStart(2, '0')}-01`;
-			const lastDate = new Date(year, month + 1, 0).getDate();
-			const endTime = `${year}-${String(month + 1).padStart(2, '0')}-${String(
-				lastDate
-			).padStart(2, '0')}`;
-
-			this.HolidayList = [];
-			if (this.activeName == 'first') {
-				getDeptSchedulingList({
-					deptId: this.deptId,
-					startTime: Date.parse(startTime),
-					endTime: Date.parse(endTime),
-				}).then((res) => {
-					this.HolidayList = res.data;
-				});
-			} else {
-				getClassSchedulingList({
-					teamId: this.teamId,
-					startTime: Date.parse(startTime),
-					endTime: Date.parse(endTime),
-				}).then((res) => {
-					this.HolidayList = res.data;
-				});
-			}
-		},
-		// 切换月份
-		selectMonth() {
-			this.getHolidayPage();
-		},
-		/** 查询部门下拉树结构 */
-		getTreeselect() {
-			getEnableData().then((response) => {
-				// 处理 deptOptions 参数
-				this.deptOptions = [];
-				this.deptOptions.push(...this.handleTree(response.data, 'id'));
-			});
-			listByDeptId(this.topDept.id).then((response) => {
-				this.groupOptions = [];
-				this.groupOptions.push(...response.data);
-			});
-		},
-		// 筛选节点
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.name.indexOf(value) !== -1;
-		},
-		tabsClick() {
-			if (this.activeName == 'second' && this.groupOptions.length > 0) {
-				this.teamId = this.groupOptions[0].id;
-				this.showTeamName = {
-					leaderName: this.groupOptions[0].leaderName || '-',
-					leaderPhone: this.groupOptions[0].leaderPhone || '-',
-				};
-			} else if (this.activeName == 'first') {
-				this.deptId = this.topDept.id;
-			}
-			this.getHolidayPage();
-		},
-		// 节点单击事件
-		handleNodeClick(data) {
-			this.deptId = data.id;
-			this.showDeptName = data.name;
-			this.getHolidayPage();
-		},
-		handleNodeClick1(data) {
-			this.teamId = data.id;
-			this.showTeamName = {
-				leaderName: data.leaderName || '-',
-				leaderPhone: data.leaderPhone || '-',
-			};
-			this.getHolidayPage();
-		},
-		//获取农历
-		getLunarDate(solarDate) {
-			try {
-				const [year, month, day] = solarDate.split('-').map(Number);
-
-				const date = new Date(year, month - 1, day);
-				const lunar = solarToLunar(date);
-
-				// 将数字月份和日期转换为中文
-				const monthMap = {
-					1: '正',
-					2: '二',
-					3: '三',
-					4: '四',
-					5: '五',
-					6: '六',
-					7: '七',
-					8: '八',
-					9: '九',
-					10: '十',
-					11: '冬',
-					12: '腊',
-				};
-
-				const dayMap = {
-					1: '初一',
-					2: '初二',
-					3: '初三',
-					4: '初四',
-					5: '初五',
-					6: '初六',
-					7: '初七',
-					8: '初八',
-					9: '初九',
-					10: '初十',
-					11: '十一',
-					12: '十二',
-					13: '十三',
-					14: '十四',
-					15: '十五',
-					16: '十六',
-					17: '十七',
-					18: '十八',
-					19: '十九',
-					20: '二十',
-					21: '廿一',
-					22: '廿二',
-					23: '廿三',
-					24: '廿四',
-					25: '廿五',
-					26: '廿六',
-					27: '廿七',
-					28: '廿八',
-					29: '廿九',
-					30: '三十',
-				};
-
-				// 返回 "三月初四" 格式
-				return `${monthMap[lunar.month]}月${dayMap[lunar.day]}`;
-			} catch (error) {
-				console.log(error);
-				return '';
-			}
-		},
-		holidayLog(det, date) {
-			this.dialogTitle = this.showDeptName + '-' + date + '-排班详情';
-			this.logVisible = true;
-			this.$nextTick(() => {
-				this.$refs.holidayLogRef.init(det);
-			});
-		},
-		cancelLog() {
-			this.dialogTitle = '';
-			this.logVisible = false;
-		},
-	},
-};
-</script>
-<style lang="scss">
-.head-container {
-	padding: 20px 10px 0;
-	background-color: #fff;
-	min-height: calc(100vh - 120px - 8px);
-	border-radius: 8px;
-}
-.groupTeamScheduling {
-	.operationArea {
-		padding: 14px 10px 0 16px;
-		margin-bottom: 8px;
-		background-color: #fff;
-		border-radius: 8px;
-		.blue-block {
-			display: inline-block;
-			width: 4px;
-			height: 16px;
-			background-color: #0b58ff;
-			border-radius: 1px;
-			margin-right: 8px;
-			margin-top: 10px;
-		}
-		.el-form-item {
-			margin-bottom: 10px;
-		}
-	}
-	// 日历
-	.calenderArea {
-		padding: 14px 10px 0 20px;
-		background-color: #fff;
-		border-radius: 8px;
-		min-height: calc(100vh - 120px - 8px - 168px);
-		.el-calendar__body {
-			padding: 10px 16px 16px 0;
-		}
-		.el-calendar__header {
-			display: none;
-		}
-		.el-calendar-table > thead {
-			height: 48px;
-			font-size: 20px;
-			font-weight: 500;
-			color: #000000;
-			background-color: rgba(242, 244, 249, 1);
-		}
-		.el-calendar-table__row {
-			height: 133px;
-			.prev,
-			.next {
-				pointer-events: none;
-			}
-			.is-selected,
-			.is-today {
-				background-color: #e4f0fd;
-			}
-			.el-calendar-day {
-				padding: 0;
-				height: 100%;
-				:hover {
-					background-color: #e4f0fd;
-				}
-				.dateStyle {
-					font-size: 20px;
-					font-weight: 500;
-					color: #000000;
-					text-align: left;
-					height: 133px;
-					line-height: 28px;
-					padding: 10px;
-					overflow: hidden;
-
-					.lunar-date {
-						display: inline-block;
-						font-size: 12px;
-						color: #909399;
-					}
-					.work-tip {
-						background: #87c1ff;
-						color: white;
-						font-size: 18px;
-						width: 30px;
-						text-align: center;
-						float: right;
-						position: relative;
-						.subIcon {
-							position: absolute;
-							top: -18px;
-							right: -10px;
-							font-size: 10px;
-						}
-					}
-					.holiday-div {
-						background-color: #67c23a;
-						border-radius: 3px;
-						height: 25px;
-						text-align: center;
-						font-size: 12px;
-						line-height: 24px;
-						color: #fff;
-						margin-bottom: 2px;
-						white-space: nowrap;
-						overflow: hidden;
-						text-overflow: ellipsis;
-					}
-				}
-			}
-		}
-	}
-}
-</style>
diff --git a/src/views/group/Schedule/SmallTitle.vue b/src/views/group/Schedule/SmallTitle.vue
deleted file mode 100644
index 8e04d268..00000000
--- a/src/views/group/Schedule/SmallTitle.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 15:27:31
- * @LastEditors: zwq
- * @LastEditTime: 2023-08-01 16:25:54
- * @Description:
--->
-<template>
-	<div :class="[className, { 'p-0': noPadding }]">
-		<slot />
-	</div>
-</template>
-
-<script>
-export default {
-	props: {
-		size: {
-			// 取值范围:  xl lg md sm
-			type: String,
-			default: 'de',
-			validator: function (val) {
-				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
-			},
-		},
-		noPadding: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	computed: {
-		className: function () {
-			return `${this.size}-title`;
-		},
-	},
-};
-</script>
-
-<style lang="scss" scoped>
-$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
-$mgr: 8px;
-@each $size, $height in $pxls {
-	.#{$size}-title {
-		font-size: $height;
-		line-height: $height;
-		color: #000;
-		font-weight: 500;
-		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
-
-		&::before {
-			content: '';
-			display: inline-block;
-			vertical-align: top;
-			width: 4px;
-			height: $height + 2px;
-			border-radius: 1px;
-			margin-right: $mgr;
-			background-color: #0b58ff;
-		}
-	}
-}
-
-.p-0 {
-	padding: 0;
-}
-</style>
diff --git a/src/views/group/Schedule/add-group.vue b/src/views/group/Schedule/add-group.vue
deleted file mode 100644
index 1b94696a..00000000
--- a/src/views/group/Schedule/add-group.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-11 14:27:37
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-29 17:12:04
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			ref="groupTableRef"
-			:id="'groupTableSelectRef'"
-			row-key="id"
-			:selectWidth="55"
-			@selection-change="selectChange"
-			:table-props="tableProps"
-			:page="1"
-			:limit="999"
-			:table-data="tableData"></base-table>
-	</div>
-</template>
-
-<script>
-import { listByDeptId } from '@/api/group/Schedule';
-
-const tableProps = [
-	{
-		prop: 'code',
-		label: '班组编号',
-		width: 140,
-	},
-	{
-		prop: 'name',
-		label: '班组名称',
-		width: 100,
-	},
-	{
-		prop: 'deptId',
-		label: '所属部门',
-	},
-	{
-		prop: 'leaderName',
-		label: '组长',
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-		showOverflowtooltip: true,
-	},
-];
-
-export default {
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: listByDeptId,
-			},
-			tableProps,
-			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
-					label: '班组编号',
-					placeholder: '班组编号',
-					param: 'code',
-				},
-				{
-					type: 'input',
-					label: '班组名称',
-					placeholder: '班组名称',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-			formInline: {
-				pageNo: 1,
-				pageSize: 100,
-				code: '',
-				name: '',
-			},
-			selectedList: [],
-			selectedArr: [], //已选的班组，从父组件传过来的
-			deptId: undefined,
-		};
-	},
-	created() {},
-	methods: {
-		init(id, tableData) {
-			this.deptId = id;
-			this.selectedArr = tableData || [];
-			this.$nextTick(() => {
-				this.getDataList();
-			});
-		},
-		// 获取数据列表
-		getDataList() {
-			this.urlOptions.getDataListURL(this.deptId).then((response) => {
-				this.tableData = response.data;
-				this.$nextTick(() => {
-					if (this.selectedArr.length > 0) {
-						this.setSelectedRows();
-					}
-				});
-			});
-		},
-		setSelectedRows() {
-			const table = this.$refs.groupTableRef.$children[0];
-
-			// 先清空选择
-			table.clearSelection();
-
-			this.selectedArr.forEach((item) => {
-				const rowInTable = this.tableData.find((i) => i.id === item.id);
-				if (rowInTable) {
-					//这里一定要用table.tableData，这样才是指向同一个数组
-					this.$set(table.store.states, 'selection', [
-						...table.store.states.selection,
-						table.tableData.find((i) => i.id === item.id),
-					]);
-				}
-			});
-
-			// 强制更新视图
-			this.$nextTick(() => {
-				table.$forceUpdate();
-				this.$forceUpdate();
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.formInline.name = val.name;
-					this.formInline.code = val.code;
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		selectChange(val) {
-			this.selectedList = val;
-		},
-		// 判断两个数组是否有重复的 id
-		hasDuplicateIds(arr1, arr2) {
-			const idSet = new Set(arr1.map((item) => item.id));
-			return arr2.some((item) => idSet.has(item.id));
-		},
-
-		dataFormSubmit() {
-			if (this.selectedList && this.selectedList.length > 0) {
-				const haveData = this.hasDuplicateIds(
-					this.selectedArr,
-					this.selectedList
-				);
-				if (haveData) {
-					this.$message('请不要重复添加数组');
-					return;
-				}
-				this.$emit('refreshTableData', this.selectedList);
-			} else if (this.selectedArr.length > 0) {
-				this.$message('请不要重复添加数组');
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/group/Schedule/add-or-updata.vue b/src/views/group/Schedule/add-or-updata.vue
deleted file mode 100644
index e98251d4..00000000
--- a/src/views/group/Schedule/add-or-updata.vue
+++ /dev/null
@@ -1,1076 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 15:07:24
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-29 15:28:52
- * @Description:
--->
-<template>
-	<div>
-		<!-- 产线信息-工艺工序圆圈 -->
-		<div class="circle-container">
-			<div v-for="(item, index) in dotArr" :key="index" class="circle-wrapper">
-				<div
-					class="circle"
-					:style="{
-						background: stepNum == index + 1 ? '#0B58FF' : '',
-					}">
-					{{ index + 1 }}
-				</div>
-				<div
-					class="circle-text"
-					:style="{
-						color: stepNum == index + 1 ? '#0B58FF' : '',
-					}">
-					{{ item.name }}
-				</div>
-				<!-- 圆点后面的虚线 -->
-				<div v-if="index < 2" class="connector" />
-			</div>
-		</div>
-		<div v-if="stepNum == 1">
-			<el-form
-				:model="dataForm"
-				:rules="dataRule"
-				ref="dataForm"
-				@keyup.enter.native="dataFormSubmit()"
-				label-position="top"
-				label-width="80px">
-				<el-row :gutter="10">
-					<el-col :span="6">
-						<el-form-item label="计划编号" prop="code">
-							<el-input
-								v-model="dataForm.code"
-								clearable
-								placeholder="请输入计划编号" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="计划名称" prop="name">
-							<el-input
-								v-model="dataForm.name"
-								clearable
-								placeholder="请输入计划名称" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="部门">
-							<dept-select
-								style="width: 100%"
-								ref="deptSelect"
-								@DeptId="setDeptId"></dept-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="周末休假方式" prop="weekType">
-							<el-select
-								style="width: 100%"
-								v-model="dataForm.weekType"
-								placeholder="请选择周末休假方式">
-								<el-option
-									v-for="item in options1"
-									:key="item.value"
-									:label="item.label"
-									:value="item.value"></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row :gutter="10">
-					<el-col :span="6">
-						<el-form-item label="开始时间" prop="startDay">
-							<el-date-picker
-								style="width: 100%"
-								v-model="dataForm.startDay"
-								type="datetime"
-								value-format="timestamp"
-								placeholder="选择日期时间"></el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="结束时间" prop="endDay">
-							<el-date-picker
-								style="width: 100%"
-								v-model="dataForm.endDay"
-								type="datetime"
-								value-format="timestamp"
-								placeholder="选择日期时间"></el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="倒班方式" prop="shiftType">
-							<el-select
-								style="width: 100%"
-								v-model="dataForm.shiftType"
-								placeholder="请选择倒班方式">
-								<el-option
-									v-for="item in options2"
-									:key="item.value"
-									:label="item.label"
-									:value="item.value"></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6" v-if="dataForm.shiftType>1">
-						<el-form-item label="同班次连排" prop="shiftSustainedNum">
-							<el-input
-								v-model="dataForm.shiftSustainedNum"
-								oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
-								<span slot="append">日</span>
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="备注" prop="remark">
-							<el-input
-								v-model="dataForm.remark"
-								clearable
-								placeholder="请输入备注" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-		</div>
-		<div v-if="stepNum == 2">
-			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
-				班次
-			</small-title>
-			<base-table
-				:table-props="tableProps1"
-				:page="1"
-				:limit="10"
-				:table-data="tableData1">
-				<method-btn
-					v-if="tableBtn1.length"
-					slot="handleBtn"
-					:width="80"
-					label="操作"
-					:method-list="tableBtn1"
-					@clickBtn="handleClick1" />
-			</base-table>
-			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
-				班组
-			</small-title>
-			<base-table
-				:table-props="tableProps2"
-				:page="1"
-				:limit="10"
-				:table-data="tableData2"
-				:add-button-show="'新增'"
-				@emitButtonClick="addNewGroup">
-				<method-btn
-					v-if="tableBtn2.length"
-					slot="handleBtn"
-					:width="110"
-					label="操作"
-					:method-list="tableBtn2"
-					@clickBtn="handleClick2" />
-			</base-table>
-		</div>
-		<div v-if="stepNum == 3">
-			<small-title
-				style="margin: 16px 0; font-size: 16px"
-				size="de"
-				:no-padding="true">
-				排班计划预览
-				<span style="font-size: 14px; color: #ff1c15">
-					系统将根据以下设置，按班组轮班顺序依次循环每日班次，生成正式排班计划，请确认。
-
-					<el-popover
-						placement="right"
-						title="比如三班两倒，同班次连排2天，不休周末排班如下"
-						width="300"
-						trigger="hover">
-						<el-table :data="gridData">
-							<el-table-column property="date"></el-table-column>
-							<el-table-column
-								property="class1"
-								label="班次一"></el-table-column>
-							<el-table-column
-								property="class2"
-								label="班次二"></el-table-column>
-						</el-table>
-						<i
-							slot="reference"
-							class="el-icon-warning-outline"
-							style="color: #ff1c15"></i>
-					</el-popover>
-				</span>
-			</small-title>
-			<el-tag>
-				{{
-					'计划时间：' +
-					parseTime(dataForm.startDay) +
-					' 至 ' +
-					parseTime(dataForm.endDay)
-				}}
-			</el-tag>
-			<div
-				style="
-					display: grid;
-					grid-template-columns: 1fr 1fr 1fr 1fr;
-					gap: 10px;
-					margin: 15px;
-				">
-				<div style="display: grid; grid-template-columns: 40px auto; gap: 10px">
-					<div class="daobanpng" />
-					<div>
-						<div style="color: rgba(0, 0, 0, 0.6)">倒班方式</div>
-						<div style="color: #000000">
-							{{ ['长白班', '两班倒', '三班倒'][dataForm.shiftType - 1] }}
-						</div>
-					</div>
-				</div>
-				<div style="display: grid; grid-template-columns: 40px auto; gap: 10px">
-					<div class="lianpaipng" />
-					<div>
-						<div style="color: rgba(0, 0, 0, 0.6)">同班次连排</div>
-						<div style="color: #000000">
-							{{
-								dataForm.shiftSustainedNum +
-								['日', '周', '月', '季'][dataForm.shiftSustainedType - 1]
-							}}
-						</div>
-					</div>
-				</div>
-				<div style="display: grid; grid-template-columns: 40px auto; gap: 10px">
-					<div class="xiujiapng" />
-					<div>
-						<div style="color: rgba(0, 0, 0, 0.6)">周末休假方式</div>
-						<div style="color: #000000">
-							{{ ['双休', '周六休', '周日休', '不休'][dataForm.weekType - 1] }}
-						</div>
-					</div>
-				</div>
-				<div style="display: grid; grid-template-columns: 40px auto; gap: 10px">
-					<div class="banzupng" />
-					<div>
-						<div style="color: rgba(0, 0, 0, 0.6)">参与班组</div>
-						<div style="color: #000000">
-							{{
-								tableData2
-									.map((item) => {
-										return item.name;
-									})
-									.join('/')
-							}}
-						</div>
-					</div>
-				</div>
-			</div>
-			<small-title
-				style="margin: 16px 0; font-size: 16px"
-				size="de"
-				:no-padding="true">
-				预览周期
-				<span>
-					<el-select
-						style="height: 20px"
-						v-model="period"
-						size="mini"
-						@change="setPeriod"
-						placeholder="请选择">
-						<el-option
-							v-for="item in periodArr"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</span>
-			</small-title>
-
-			<base-table
-				v-if="tableProps3.length > 0"
-				:table-props="tableProps3"
-				:table-data="tableData3"></base-table>
-		</div>
-		<base-dialog
-			:dialogTitle="'修改班次'"
-			:dialogVisible="addOrUpdateVisible1"
-			@cancel="cancel1"
-			@confirm="handleConfirm1"
-			:before-close="cancel1"
-			:destroy-on-close="true"
-			append-to-body
-			width="40%">
-			<edit-class
-				ref="editClassRef"
-				@refreshTableData="refreshTableData1"></edit-class>
-		</base-dialog>
-		<base-dialog
-			:dialogTitle="'班组选择'"
-			:dialogVisible="addOrUpdateVisible2"
-			@cancel="cancel2"
-			@confirm="handleConfirm2"
-			:before-close="cancel2"
-			:destroy-on-close="true"
-			append-to-body
-			width="40%">
-			<add-group
-				ref="addGroupRef"
-				@refreshTableData="refreshTableData2"></add-group>
-		</base-dialog>
-		<base-dialog
-			:dialogTitle="'绑定产线'"
-			:dialogVisible="addOrUpdateVisible3"
-			@cancel="cancel3"
-			@confirm="handleConfirm3"
-			:before-close="cancel3"
-			:destroy-on-close="true"
-			append-to-body
-			width="50%">
-			<bind-line
-				ref="bindLineRef"
-				@refreshTableData="refreshTableData3"></bind-line>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import deptSelect from './../deptSelect.vue';
-import SmallTitle from './SmallTitle';
-import propfirstSpan from './propfirstSpan.vue';
-import propSpan from './propSpan.vue';
-import { parseTime } from '@/filter/code-filter';
-import editClass from './edit-class.vue';
-import addGroup from './add-group.vue';
-import bindLine from './bind-line.vue';
-import {
-	getCode,
-	createStepOne,
-	returnStepOne,
-	createStepTwo,
-	returnStepTwo,
-	getPerView,
-	draftEditing,
-	cancelStepThree,
-	checkPlan,
-	createStepFour,
-} from '@/api/group/Schedule';
-
-const tableProps1 = [
-	{
-		prop: 'name',
-		label: '班次名称',
-	},
-	{
-		prop: 'startTime',
-		label: '开始时间',
-		filter: (val) => {
-			return val ? val.slice(0, -3) : '-';
-		},
-	},
-	{
-		prop: 'endTime',
-		label: '结束时间',
-		filter: (val) => {
-			return val ? val.slice(0, -3) : '-';
-		},
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-];
-
-const tableProps2 = [
-	{
-		prop: 'code',
-		label: '班组编号',
-		width: 140,
-	},
-	{
-		prop: 'name',
-		label: '班组名称',
-	},
-	{
-		prop: 'isProduction',
-		label: '是否生产班组',
-		filter: (val) => {
-			return val ? '是' : '否';
-		},
-		width: 110,
-	},
-	{
-		prop: 'lineName',
-		label: '产线及工段',
-		showOverflowtooltip: true,
-	},
-];
-
-export default {
-	components: {
-		deptSelect,
-		SmallTitle,
-		editClass,
-		addGroup,
-		bindLine,
-		propfirstSpan,
-		propSpan,
-	},
-	data() {
-		return {
-			dotArr: [
-				{
-					name: '基础信息',
-				},
-				{
-					name: '班组班次',
-				},
-				{
-					name: '计划确认',
-				},
-			],
-			stepNum: 1, // 当前第几步
-			shiftTypeEdit: undefined, //该值为编辑时获取的shiftType，到第二步，判断dataForm.shiftType是否改变，同时改变班次信息
-			//第一步参数
-			dataForm: {
-				id: undefined,
-				code: undefined,
-				name: undefined,
-				startDay: undefined,
-				endDay: undefined,
-				deptId: undefined,
-				weekType: undefined,
-				shiftType: undefined,
-				shiftSustainedNum: undefined,
-				shiftSustainedType: 1,
-				remark: undefined,
-			},
-			options1: [
-				{
-					value: 1,
-					label: '双休',
-				},
-				{
-					value: 2,
-					label: '周六休',
-				},
-				{
-					value: 3,
-					label: '周日休',
-				},
-				{
-					value: 4,
-					label: '不休',
-				},
-			],
-			options2: [
-				{
-					value: 1,
-					label: '长白班',
-				},
-				{
-					value: 2,
-					label: '两班倒',
-				},
-				{
-					value: 3,
-					label: '三班倒',
-				},
-			],
-			dataRule: {
-				code: [
-					{ required: true, message: '计划编号不能为空', trigger: 'blur' },
-				],
-				name: [
-					{ required: true, message: '计划名称不能为空', trigger: 'blur' },
-				],
-				startDay: [
-					{ required: true, message: '开始时间不能为空', trigger: 'change' },
-				],
-				endDay: [
-					{ required: true, message: '结束时间不能为空', trigger: 'change' },
-				],
-				weekType: [
-					{
-						required: true,
-						message: '周末休假方式不能为空',
-						trigger: 'change',
-					},
-				],
-				shiftType: [
-					{
-						required: true,
-						message: '倒班方式方式不能为空',
-						trigger: 'change',
-					},
-				],
-				shiftSustainedNum: [
-					{ required: true, message: '同班次连排不能为空', trigger: 'blur' },
-				],
-			},
-			//第二步参数
-			tableProps1,
-			tableBtn1: [
-				{
-					type: 'edit',
-					btnName: '编辑',
-				},
-			].filter((v) => v),
-			tableData1: [],
-			tableProps2,
-			tableBtn2: [
-				{
-					type: 'bind',
-					btnName: '绑定产线',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'equal',
-								name: 'isProduction',
-								value: true,
-							},
-						],
-					},
-				},
-				{
-					type: 'delete',
-					btnName: '删除',
-				},
-			].filter((v) => v),
-			tableData2: [],
-			addOrUpdateVisible1: false,
-			addOrUpdateVisible2: false,
-			addOrUpdateVisible3: false,
-			//第三步参数
-			gridData: [
-				{
-					date: '第1天',
-					class1: 'A',
-					class2: 'B',
-				},
-				{
-					date: '第2天',
-					class1: 'A',
-					class2: 'B',
-				},
-				{
-					date: '第3天',
-					class1: 'C',
-					class2: 'A',
-				},
-				{
-					date: '第4天',
-					class1: 'C',
-					class2: 'A',
-				},
-				{
-					date: '第5天',
-					class1: 'B',
-					class2: 'C',
-				},
-				{
-					date: '第6天',
-					class1: 'B',
-					class2: 'C',
-				},
-				{
-					date: '第7天',
-					class1: 'A',
-					class2: 'B',
-				},
-				{
-					date: '第8天',
-					class1: 'A',
-					class2: 'B',
-				},
-			],
-			period: 7, //预览周期
-			periodArr: [
-				{
-					value: 7,
-					label: '7天',
-				},
-				{
-					value: 14,
-					label: '14天',
-				},
-				{
-					value: 30,
-					label: '30天',
-				},
-			],
-			tableProps3: [],
-			tableData3: [],
-		};
-	},
-	methods: {
-		init(id) {
-			this.dataForm.id = id || undefined;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				if (this.dataForm.id) {
-					draftEditing(this.dataForm.id).then((res) => {
-						this.dataForm = res.data?.stepOne;
-						this.shiftTypeEdit = res.data?.stepOne.shiftType;
-						this.setDataForm();
-						this.tableData1 = res.data?.stepTwo.groupPlanClassesBaseVOList;
-						this.tableData2 = res.data?.stepTwo.groupPlanTeamBaseVOList;
-						this.tableData2.forEach((item, index) => {
-							let lineName = '';
-							lineName = this.setLineName(item.bindLineTree, lineName);
-							this.$set(
-								this.tableData2[index],
-								'lineName',
-								lineName.slice(0, -1)
-							);
-						});
-					});
-				} else {
-					getCode().then((res) => {
-						this.dataForm.code = res.data;
-					});
-				}
-			});
-		},
-		//上一步
-		upSubmit() {
-			if (this.stepNum == 2) {
-				returnStepOne(this.dataForm.id).then((res) => {
-					this.stepNum -= 1;
-					this.$emit('setSN', this.stepNum);
-					this.$nextTick(() => {
-						this.setDataForm();
-					});
-				});
-			} else if (this.stepNum == 3) {
-				returnStepTwo(this.dataForm.id).then((res) => {
-					this.stepNum -= 1;
-					this.$emit('setSN', this.stepNum);
-				});
-			}
-		},
-		//下一步
-		nextSubmit() {
-			if (this.stepNum == 1) {
-				this.$refs['dataForm'].validate((valid) => {
-					if (!valid) {
-						return false;
-					}
-
-					if (!this.dataForm.deptId) {
-						this.$message('部门不能为空');
-						return;
-					}
-          const compareDate = this.compareDates(this.dataForm.startDay,this.dataForm.endDay)
-
-					if (compareDate > 0 ) {
-						this.$message('开始时间不能大于结束时间');
-						return;
-					}
-					createStepOne(this.dataForm).then((res) => {
-						if (!this.dataForm.id) {
-							this.dataForm.id = res.data;
-						}
-						this.stepNum += 1;
-						this.$emit('setSN', this.stepNum);
-						if (
-							!this.dataForm.id ||
-							this.dataForm.shiftType !== this.shiftTypeEdit
-						) {
-							this.setTWOclass(); // (新增时或者编辑时倒班方式变了)第一步提交后，根据倒班方式设置第二部班次
-						}
-					});
-				});
-				return;
-			}
-			if (this.stepNum == 2) {
-				if (!this.tableData2 || this.tableData2.length == 0) {
-					this.$message('班组不能为空');
-					return;
-				}
-
-				let isbindLine = false;
-				this.tableData2.forEach((item) => {
-					if (!item.bindLineTree || item.bindLineTree.length == 0) {
-						isbindLine = true;
-					}
-				});
-				if (isbindLine) {
-					this.$message('生产班组必须绑定产线或工段');
-					return;
-				}
-
-				const ids = this.tableData2.map((item) => item.id);
-				const uniqueIds = [...new Set(ids)];
-				if (ids.length !== uniqueIds.length) {
-					this.$message('存在重复的班组,请检查！');
-					return;
-				}
-
-				if (this.dataForm.shiftType == 1 && this.tableData2.length > 1) {
-					this.$message('白班，班组数量仅支持 1个 班组');
-					return;
-				} else if (this.dataForm.shiftType == 2 && this.tableData2.length < 2) {
-					this.$message('两班倒，班组数量至少 2个 班组');
-					return;
-				} else if (this.dataForm.shiftType == 3 && this.tableData2.length < 3) {
-					this.$message('三班倒，班组数量至少 3个 班组');
-					return;
-				}
-
-				let data = {};
-				data.planId = this.dataForm.id;
-				data.groupPlanClassesBaseVOList = []; //排班-班次信息list
-				this.tableData1.forEach((item, index) => {
-					const obj = {
-						sort: index + 1,
-						name: item.name,
-						remark: item.remark,
-						startTime: item.startTime,
-						endTime: item.endTime,
-						daySpan: item.daySpan,
-					};
-					data.groupPlanClassesBaseVOList.push(obj);
-				});
-				data.groupPlanTeamBaseVOList = []; //排班-班组信息list
-				this.tableData2.forEach((item) => {
-					const obj = {
-						teamId: item.id,
-						name: item.name,
-            leaderName: item.leaderName,
-            leaderPhone:item.leaderPhone,
-						bindData: JSON.stringify(item.bindLineTree),
-					};
-					data.groupPlanTeamBaseVOList.push(obj);
-				});
-				createStepTwo(data).then((res) => {
-					this.stepNum += 1;
-					this.$emit('setSN', this.stepNum);
-					this.getThreeGroup(7); // 第三步，进来加载预览排班,默认7天预览周期
-				});
-				return;
-			}
-			if (this.stepNum == 3) {
-				let data = { planId: this.dataForm.id };
-				data.groupPlanTeamBaseVOList = []; //排班-班组信息list
-				this.tableData2.forEach((item) => {
-					const obj = {
-						teamId: item.id,
-						name: item.name,
-						bindData: JSON.stringify(item.bindLineTree),
-					};
-					data.groupPlanTeamBaseVOList.push(obj);
-				});
-				checkPlan(data).then((RES) => {
-					createStepFour(this.dataForm.id).then((res) => {
-						this.$modal.msgSuccess('创建计划成功');
-						this.stepNum = 1;
-						this.$emit('setSN', this.stepNum);
-						this.$emit('refreshDataList');
-					});
-				});
-				return;
-			}
-		},
-		//第一步
-		//子组件获取的部门id
-		setDeptId(val) {
-			this.dataForm.deptId = val;
-		},
-		//详情时传给子组件的部门id
-		setDataForm() {
-			this.$refs.deptSelect.setID(this.dataForm.deptId);
-		},
-    //比较时间，开始时间在结束时间前
-		compareDates(date1, date2) {
-			const d1 = date1;
-			const d2 = date2;
-
-			if (d1 === d2) {
-				return 0; // 日期相等
-			} else if (d1 < d2) {
-				return -1; // date1 在 date2 之前
-			} else {
-				return 1; // date1 在 date2 之后
-			}
-		},
-		//第二步
-		//设置第二部班次
-		setTWOclass() {
-			this.tableData1 = [];
-			if (this.dataForm.shiftType == 1) {
-				const obj = {
-					name: '长白班',
-					startTime: '08:00:00',
-					endTime: '17:00:00',
-					daySpan: 0, //是否跨天
-          code: 1, //排版日历页面，根据这个字段显示颜色
-				};
-				this.tableData1.push(obj);
-			} else if (this.dataForm.shiftType == 2) {
-				const obj1 = {
-					name: '白班',
-					startTime: '08:00:00',
-					endTime: '20:00:00',
-					daySpan: 0,
-          code: 1,
-				};
-				const obj2 = {
-					name: '夜班',
-					startTime: '20:00:00',
-					endTime: '08:00:00',
-					daySpan: 1,
-          code: 3,
-				};
-				this.tableData1.push(obj1, obj2);
-			} else if (this.dataForm.shiftType == 3) {
-				const obj1 = {
-					name: '早班',
-					startTime: '08:00:00',
-					endTime: '16:00:00',
-					daySpan: 0,
-          code: 1,
-				};
-				const obj2 = {
-					name: '中班',
-					startTime: '16:00:00',
-					endTime: '00:00:00',
-					daySpan: 1,
-          code: 2,
-				};
-				const obj3 = {
-					name: '夜班',
-					startTime: '00:00:00',
-					endTime: '08:00:00',
-					daySpan: 0,
-          code: 3,
-				};
-				this.tableData1.push(obj1, obj2, obj3);
-			}
-		},
-		//编辑班次
-		handleClick1(val) {
-			this.addOrUpdateVisible1 = true;
-			this.$nextTick(() => {
-				this.$refs.editClassRef.init(val.data);
-			});
-		},
-		//班组操作
-		handleClick2(val) {
-			if (val.type === 'bind') {
-				this.addOrUpdateVisible3 = true;
-				this.$nextTick(() => {
-					this.$refs.bindLineRef.init(val.data);
-				});
-			} else if (val.type === 'delete') {
-				this.tableData2.splice(val.data._pageIndex - 1, 1);
-			}
-		},
-		// 新增班组
-		addNewGroup() {
-			this.addOrUpdateVisible2 = true;
-			this.$nextTick(() => {
-				this.$refs.addGroupRef.init(this.dataForm.deptId,this.tableData2);
-			});
-		},
-		cancel1() {
-			this.addOrUpdateVisible1 = false;
-		},
-		cancel2() {
-			this.addOrUpdateVisible2 = false;
-		},
-		cancel3() {
-			this.addOrUpdateVisible3 = false;
-		},
-		handleConfirm1() {
-			this.$refs.editClassRef.dataFormSubmit();
-		},
-		handleConfirm2() {
-			this.$refs.addGroupRef.dataFormSubmit();
-		},
-		handleConfirm3() {
-			this.$refs.bindLineRef.dataFormSubmit();
-		},
-		refreshTableData1(index, val) {
-			this.tableData1.splice(index, 1, val);
-			this.cancel1();
-		},
-		refreshTableData2(val) {
-			this.tableData2.push(...val);
-			this.cancel2();
-		},
-		refreshTableData3(index, val) {
-			this.tableData2[index].bindLineTree = val;
-			let lineName = '';
-			lineName = this.setLineName(val, lineName);
-			if (lineName) {
-				this.$set(this.tableData2[index], 'lineName', lineName.slice(0, -1));
-			}
-			this.cancel3();
-		},
-		//提取绑定的产线工段名展示出来
-		setLineName(val, lineName) {
-			val.forEach((item) => {
-				lineName += item.name + '：';
-				if (item.children && item.children.length > 0) {
-					const childName = this.setLineName(item.children, lineName);
-					lineName = childName;
-				}
-			});
-			return lineName;
-		},
-		//第三步
-		// 进来加载预览排班
-		getThreeGroup(day) {
-			const data = {
-				id: this.dataForm.id,
-				count: day,
-			};
-			this.tableProps3 = [];
-			this.tableData3 = [];
-			getPerView(data).then((res) => {
-				this.setThreeData(res.data);
-			});
-		},
-		setPeriod(val) {
-			this.getThreeGroup(val);
-		},
-
-		setThreeData(data) {
-			//表头第一个为班次名称
-			const propfirst = {
-				prop: 'name',
-				label: '',
-				align: 'center',
-				fixed: true,
-				subcomponent: propfirstSpan,
-			};
-			this.tableProps3.push(propfirst);
-			data.forEach((item, index) => {
-				//设置所有日期为表头
-				const obj = {
-					prop: 'daydata' + index,
-					label: item.day,
-					work: item.work,
-					subcomponent: propSpan,
-				};
-				this.tableProps3.push(obj);
-				item.det.forEach((sItem, sIndex) => {
-					if (index === 0) {
-						let sObj = {
-							name: sItem.classesName + '/' + sItem.time,
-							sort: sItem.sort,
-						};
-						sObj['daydata' + index] = item.work
-							? sItem.teamName
-							: item.holidayName;
-						this.tableData3.push(sObj);
-					} else {
-						this.$set(
-							this.tableData3[sIndex],
-							'daydata' + index,
-							item.work ? sItem.teamName : item.holidayName
-						);
-						this.$set(this.tableData3[sIndex], 'sort', sItem.sort);
-					}
-				});
-			});
-		},
-		cancelStep() {
-			if (this.stepNum > 1) {
-				cancelStepThree(this.dataForm.id).then((res) => {
-					this.$message('已取消计划');
-					this.$emit('refreshDataList');
-				});
-			} else {
-				this.$emit('refreshDataList');
-			}
-		},
-	},
-};
-</script>
-
-<style scoped>
-.daobanpng {
-	width: 40px;
-	height: 40px;
-	background-image: url('~@/assets/images/daoban.png');
-	background-size: 100% 100%;
-}
-.lianpaipng {
-	width: 40px;
-	height: 40px;
-	background-image: url('~@/assets/images/lianpai.png');
-	background-size: 100% 100%;
-}
-.xiujiapng {
-	width: 40px;
-	height: 40px;
-	background-image: url('~@/assets/images/xiujia.png');
-	background-size: 100% 100%;
-}
-.banzupng {
-	width: 40px;
-	height: 40px;
-	background-image: url('~@/assets/images/banzu.png');
-	background-size: 100% 100%;
-}
-</style>
-<!-- //序号圆点 -->
-<style scoped>
-.circle-container {
-	height: 110px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	padding: 20px;
-	width: 90%;
-	overflow-x: auto;
-	margin: auto;
-}
-
-.circle-wrapper {
-	position: relative;
-	display: flex;
-	align-items: center;
-}
-
-.circle {
-	width: 52px;
-	height: 52px;
-	border-radius: 50%;
-	background: #8db1ff;
-	font-weight: 500;
-	font-size: 31px;
-	color: #ffffff;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	position: relative;
-	z-index: 2;
-	cursor: pointer;
-}
-.circle-text {
-	position: absolute;
-	top: 60px;
-	left: -15px;
-	color: #8db1ff;
-	width: 82px;
-	text-align: center;
-}
-
-/* 下半圆虚线边框 */
-.circle::after {
-	content: '';
-	position: absolute;
-	bottom: -6px; /* 2px边框 + 2px间隙 */
-	left: -4px;
-	right: -4px;
-	height: 30px; /* 半圆高度 */
-	border-radius: 0 0 60px 60px;
-	border: 1px dashed #0b58ff;
-	border-top: none;
-	z-index: 1;
-}
-
-.connector {
-	width: 160px; /* 计算连接线长度 */
-	height: 2px;
-	border-bottom: 1px dashed rgb(11, 88, 255, 1);
-	margin: 0 5px;
-	z-index: 1;
-}
-</style>
diff --git a/src/views/group/Schedule/bind-line.vue b/src/views/group/Schedule/bind-line.vue
deleted file mode 100644
index 6f4d35aa..00000000
--- a/src/views/group/Schedule/bind-line.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-30 10:47:09
- * @Description:
--->
-<template>
-	<div style="width: 100%; display: flex; justify-content: center">
-		<tree-transfer
-			:title="title"
-			:from_data="fromData"
-			:to_data="toData"
-			@add-btn="add"
-			@remove-btn="remove"
-			pid="pid"
-			:defaultProps="{ label: 'name' }"
-			height="450px"
-			style="padding-bottom: 20px"
-			:mode="mode"
-			filter
-			openAll></tree-transfer>
-	</div>
-</template>
-
-<script>
-import treeTransfer from 'el-tree-transfer';
-import { getGroupPlanTree } from '@/api/group/Schedule';
-
-export default {
-	components: { treeTransfer },
-	data() {
-		return {
-			title: ['待选', '已选'],
-			mode: 'transfer',
-			fromData: [], //左边内容
-			toData: [], //右边已选内容
-		};
-	},
-	methods: {
-		init(val) {
-			this._pageIndex = val._pageIndex - 1;
-			this.fromData = [];
-			this.toData = [];
-			getGroupPlanTree().then((res) => {
-				this.fromData = res.data;
-				this.fromData.forEach((item) => {
-					item.productionLineId = 0;
-				});
-				this.$nextTick(() => {
-					this.toData = val.bindLineTree || [];
-					this.getFilterLeftData(this.fromData, this.toData); //编辑时组件有bug，左边相同数据不消失
-				});
-			});
-		},
-		// 监听穿梭框组件添加
-		add(fromData, toData, obj) {
-			console.log('fromData:', fromData);
-			console.log('toData:', toData, obj);
-		},
-		// 监听穿梭框组件移除
-		remove(fromData, toData, obj) {
-			console.log('fromData:', fromData);
-			console.log('toData:', toData);
-		},
-		/** 消除组件左边与右边选中数据相同项 */
-		// 处理过滤数据
-		getFilterLeftData(data, selData) {
-			for (let i = data.length - 1; i >= 0; i--) {
-				for (let j = selData.length - 1; j >= 0; j--) {
-					if (data[i] && data[i].id === selData[j].id) {
-						// 当id相等可以删除的情况 即：没有子级可以删除；
-						if (!data[i].children || data[i].children.length == 0) {
-							data.splice(i, 1);
-						} else {
-							this.getFilterLeftData(data[i].children, selData[j].children);
-						}
-					}
-				}
-			}
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$emit('refreshTableData', this._pageIndex, this.toData);
-		},
-	},
-};
-</script>
diff --git a/src/views/group/Schedule/detail.vue b/src/views/group/Schedule/detail.vue
deleted file mode 100644
index 36a23ba4..00000000
--- a/src/views/group/Schedule/detail.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-21 14:27:23
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-21 15:02:27
- * @Description:
--->
-<template>
-	<div>
-		<div class="info-div">
-			<div>
-				<span class="title">计划编号:</span>
-				{{ infoData.code }}
-			</div>
-			<div>
-				<span class="title">计划状态:</span>
-				{{ ['', '草稿', '已确认', '已作废'][infoData.status] }}
-			</div>
-			<div>
-				<span class="title">计划名称:</span>
-				{{ infoData.name }}
-			</div>
-			<div>
-				<span class="title">部门:</span>
-				{{ infoData.deptName }}
-			</div>
-			<div>
-				<span class="title">开始时间:</span>
-				{{ parseTime(infoData.startDay) }}
-			</div>
-			<div>
-				<span class="title">结束时间:</span>
-				{{ parseTime(infoData.endDay) }}
-			</div>
-			<div>
-				<span class="title">周末休假方式:</span>
-				{{ ['', '双休', '周六休', '周日休', '不休'][infoData.weekType] }}
-			</div>
-			<div>
-				<span class="title">倒班方式:</span>
-				{{ ['', '长白班', '两班倒', '三班倒'][infoData.shiftType] }}
-			</div>
-			<div>
-				<span class="title">同班次连排:</span>
-				{{ infoData.shiftSustainedNum }}日
-			</div>
-			<div>
-				<span class="title">创建人:</span>
-				{{ infoData.creator }}
-			</div>
-			<div>
-				<span class="title">创建时间:</span>
-				{{ parseTime(infoData.createTime) }}
-			</div>
-			<div v-if="infoData.status == 3">
-				<span class="title">作废时间:</span>
-				{{ parseTime(infoData.disableTime) }}
-			</div>
-			<div>
-				<span class="title">备注:</span>
-				{{ infoData.remark }}
-			</div>
-		</div>
-		<div>
-			<el-tabs v-model="activeName" stretch>
-				<el-tab-pane label="班次" name="first"></el-tab-pane>
-				<el-tab-pane label="班组" name="second"></el-tab-pane>
-			</el-tabs>
-			<base-table
-				v-if="activeName == 'first'"
-				:table-props="tableProps1"
-				:page="1"
-				:limit="10"
-				:table-data="tableData1"></base-table>
-			<base-table
-      v-else
-				:table-props="tableProps2"
-				:page="1"
-				:limit="10"
-				:table-data="tableData2"></base-table>
-		</div>
-	</div>
-</template>
-
-<script>
-import { parseTime } from '@/filter/code-filter';
-import { getPlan } from '@/api/group/Schedule';
-
-const tableProps1 = [
-	{
-		prop: 'name',
-		label: '班次名称',
-	},
-	{
-		prop: 'startTime',
-		label: '开始时间',
-		filter: (val) => {
-			return val ? val.slice(0, -3) : '-';
-		},
-	},
-	{
-		prop: 'endTime',
-		label: '结束时间',
-		filter: (val) => {
-			return val ? val.slice(0, -3) : '-';
-		},
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-];
-
-const tableProps2 = [
-	{
-		prop: 'code',
-		label: '班组编号',
-		width: 140,
-	},
-	{
-		prop: 'name',
-		label: '班组名称',
-	},
-	{
-		prop: 'isProduction',
-		label: '是否生产班组',
-		filter: (val) => {
-			return val ? '是' : '否';
-		},
-		width: 110,
-	},
-	{
-		prop: 'lineName',
-		label: '产线及工段',
-	},
-];
-export default {
-	data() {
-		return {
-			infoData: {},
-			activeName: 'first',
-			tableProps1,
-			tableData1: [],
-			tableProps2,
-			tableData2: [],
-		};
-	},
-	methods: {
-		init(id) {
-			this.infoData = {};
-			getPlan(id).then((res) => {
-				this.infoData = res.data || {};
-				console.log(res);
-				this.tableData1 = res.data?.groupPlanClassesBaseVOList;
-				this.tableData2 = res.data?.groupPlanTeamBaseVOList;
-				this.tableData2.forEach((item, index) => {
-					let lineName = '';
-					lineName = this.setLineName(item.bindLineTree, lineName);
-					this.$set(this.tableData2[index], 'lineName', lineName.slice(0, -1));
-				});
-			});
-		},
-		//提取绑定的产线工段名展示出来
-		setLineName(val, lineName) {
-			val.forEach((item) => {
-				lineName += item.name + '：';
-				if (item.children && item.children.length > 0) {
-					const childName = this.setLineName(item.children, lineName);
-					lineName = childName;
-				}
-			});
-			return lineName;
-		},
-	},
-};
-</script>
-
-<style scoped>
-.info-div {
-	display: grid;
-	grid-template-columns: 1fr 1fr 1fr;
-	gap: 10px;
-}
-.title {
-	font-weight: bold;
-}
-</style>
diff --git a/src/views/group/Schedule/edit-class.vue b/src/views/group/Schedule/edit-class.vue
deleted file mode 100644
index c1b43b7c..00000000
--- a/src/views/group/Schedule/edit-class.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-20 10:23:52
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="序号" prop="index">
-					<el-input-number
-						v-model="dataForm.index"
-						:step="1"
-						:min="1"
-						step-strictly />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="班次名称" prop="name">
-					<el-input
-						v-model="dataForm.name"
-						clearable
-						placeholder="请输入班次名称" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="开始时间" prop="startTime">
-					<el-time-picker
-						style="width: 100%"
-						format="H:mm"
-						value-format="HH:mm:ss"
-						v-model="dataForm.startTime"
-						placeholder="选择日期时间"></el-time-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="结束时间" prop="endTime">
-					<el-time-picker
-						style="width: 100%"
-						format="H:mm"
-						value-format="HH:mm:ss"
-						v-model="dataForm.endTime"
-						placeholder="选择日期时间"></el-time-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="dataForm.remark"
-						clearable
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-export default {
-	components: {},
-	data() {
-		return {
-			dataForm: {
-				id: undefined,
-				index: undefined,
-				name: undefined,
-				startTime: undefined,
-				endTime: undefined,
-				remark: undefined,
-			},
-			_pageIndex: 1,
-			dataRule: {
-				index: [{ required: true, message: '序号不能为空', trigger: 'blur' }],
-				name: [
-					{ required: true, message: '班次名称不能为空', trigger: 'blur' },
-				],
-				startTime: [
-					{ required: true, message: '开始时间不能为空', trigger: 'change' },
-				],
-				endTime: [
-					{ required: true, message: '结束时间不能为空', trigger: 'change' },
-				],
-			},
-		};
-	},
-	methods: {
-		init(val) {
-			this._pageIndex = val._pageIndex-1;
-			this.dataForm.index = val._pageIndex || 1;
-			this.dataForm.name = val.name || undefined;
-			this.dataForm.startTime = val.startTime || undefined;
-			this.dataForm.endTime = val.endTime || undefined;
-			this.dataForm.remark = val.remark || undefined;
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				this.$emit('refreshTableData', this._pageIndex, this.dataForm);
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/group/Schedule/index.vue b/src/views/group/Schedule/index.vue
deleted file mode 100644
index dc5ffe03..00000000
--- a/src/views/group/Schedule/index.vue
+++ /dev/null
@@ -1,552 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-11 14:27:37
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-29 14:50:16
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<div class="searchBarBox">
-			<el-form
-				:inline="true"
-				ref="searchBarForm"
-				:model="formInline"
-				class="searchBar">
-				<span class="blue-block" />
-				<el-form-item label="计划编号" prop="code">
-					<el-input
-						v-model="formInline.code"
-						clearable
-						size="small"
-						placeholder="请输入计划编号" />
-				</el-form-item>
-				<el-form-item label="计划名称" prop="name">
-					<el-input
-						v-model="formInline.name"
-						clearable
-						size="small"
-						placeholder="请输入计划名称" />
-				</el-form-item>
-				<el-form-item label="开始时间" prop="startDay">
-					<el-date-picker
-						v-model="formInline.startDay"
-						type="datetime"
-						placeholder="选择日期时间"></el-date-picker>
-				</el-form-item>
-				<el-form-item label="结束时间" prop="endDay">
-					<el-date-picker
-						v-model="formInline.endDay"
-						type="datetime"
-						placeholder="选择日期时间"></el-date-picker>
-				</el-form-item>
-				<el-form-item label="部门" prop="deptId">
-					<dept-select
-						style="width: 200px"
-						ref="deptSelect"
-						@DeptId="setDeptId"></dept-select>
-				</el-form-item>
-				<el-form-item label="状态" prop="leaderName">
-					<el-select v-model="formInline.status" placeholder="请选择状态">
-						<el-option
-							v-for="item in options"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item>
-					<el-button
-						type="primary"
-						size="small"
-						v-hasPermi="['base:group-scheduling-plan:query']"
-						@click="buttonClick({ btnName: 'search' })">
-						查询
-					</el-button>
-				</el-form-item>
-				<el-form-item>
-					<span class="separateStyle"
-						v-hasPermi="['base:group-scheduling-plan:query']"></span>
-				</el-form-item>
-				<el-form-item>
-					<el-button size="small" @click="buttonClick({ btnName: 'reset' })">
-						重置
-					</el-button>
-				</el-form-item>
-				<el-form-item>
-					<span class="separateStyle"
-						v-hasPermi="['base:group-scheduling-plan:create']"></span>
-				</el-form-item>
-				<el-form-item>
-					<el-button
-						type="success"
-						size="small"
-						:plain="true"
-						v-hasPermi="['base:group-scheduling-plan:create']"
-						@click="buttonClick({ btnName: 'add' })">
-						新增
-					</el-button>
-				</el-form-item>
-			</el-form>
-		</div>
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			@emitFun="getDataList">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="270"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			:destroy-on-close="true"
-			append-to-body
-			width="60%">
-			<add-or-update
-				ref="addOrUpdate"
-				@setSN="setStepNum"
-				@refreshDataList="successSubmit"></add-or-update>
-			<template #footer>
-				<slot name="footer">
-					<el-row slot="footer" type="flex" justify="end">
-						<el-col :span="24">
-							<el-button
-								v-if="stepNum > 1"
-								size="small"
-								class="btnTextStyle"
-								@click="handleConfirm('up')">
-								上一步
-							</el-button>
-							<el-button
-								size="small"
-								class="btnTextStyle"
-								@click="handleCancel">
-								取消
-							</el-button>
-							<el-button
-								v-if="stepNum == 3"
-								type="primary"
-								class="btnTextStyle"
-								size="small"
-								plain
-								@click="successSubmit">
-								保存草稿
-							</el-button>
-							<el-button
-								type="primary"
-								class="btnTextStyle"
-								size="small"
-								@click="handleConfirm">
-								{{ stepNum < 3 ? '下一步' : '确认并执行' }}
-							</el-button>
-						</el-col>
-					</el-row>
-				</slot>
-			</template>
-		</base-dialog>
-		<base-dialog
-			:dialogTitle="'排班计划详情'"
-			:dialogVisible="detailVisible"
-			@cancel="detailCancel"
-			:before-close="detailCancel"
-			:destroy-on-close="true"
-			append-to-body
-			width="50%">
-			<detail ref="detailRef"></detail>
-			<template #footer>
-				<slot name="footer">
-					<el-row slot="footer" type="flex" justify="end">
-						<el-col :span="24">
-							<el-button
-								size="small"
-								class="btnTextStyle"
-								@click="detailCancel">
-								取消
-							</el-button>
-						</el-col>
-					</el-row>
-				</slot>
-			</template>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import deptSelect from './../deptSelect.vue';
-import basicPage from '@/mixins/basic-page';
-import subSpan from './subSpan.vue';
-import subStatus from './subStatus.vue';
-import detail from './detail.vue';
-import { parseTime } from '@/filter/code-filter';
-import {
-	getGroupPlanPage,
-	deleteGroupPlan,
-	copyPlan,
-	disablePlan,
-	updateScheduleLater,
-} from '@/api/group/Schedule';
-
-const tableProps = [
-	{
-		prop: 'code',
-		label: '计划编号',
-		width: 140,
-	},
-	{
-		prop: 'name',
-		label: '计划名称',
-		width: 100,
-	},
-	{
-		prop: 'startDay',
-		label: '开始时间',
-		filter: parseTime,
-		width: 150,
-	},
-	{
-		prop: 'endDay',
-		label: '结束时间',
-		filter: parseTime,
-		width: 150,
-	},
-	{
-		prop: 'shiftType',
-		label: '倒班方式',
-		filter: (val) => {
-			return val ? ['', '长白班', '两班倒', '三班倒'][val] : '-';
-		},
-		width: 110,
-	},
-	{
-		prop: 'shiftSustainedNum',
-		label: '同班次连排',
-		width: 110,
-		subcomponent: subSpan,
-	},
-	{
-		prop: 'deptName',
-		label: '部门',
-	},
-	{
-		prop: 'status',
-		label: '计划状态',
-		width: 110,
-		subcomponent: subStatus,
-	},
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime,
-		width: 150,
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getGroupPlanPage,
-				deleteURL: deleteGroupPlan,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi('base:group-scheduling-plan:update')?
-				{
-					type: 'edit',
-					btnName: '编辑',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'equal',
-								name: 'status',
-								value: 1,
-							},
-						],
-					},
-				}:undefined,
-				this.$auth.hasPermi('base:group-scheduling-plan:delete')?
-				{
-					type: 'delete',
-					btnName: '删除',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'equal',
-								name: 'status',
-								value: 1,
-							},
-						],
-					},
-				}:undefined,
-				this.$auth.hasPermi('base:group-scheduling-plan:query')?
-				{
-					type: 'detail',
-					btnName: '查看',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'unequal',
-								name: 'status',
-								value: 1,
-							},
-						],
-					},
-				}:undefined,
-				this.$auth.hasPermi('base:group-scheduling-plan:delete')?
-				{
-					type: 'cancel',
-					btnName: '作废',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'equal',
-								name: 'status',
-								value: 2,
-							},
-						],
-					},
-				}:undefined,
-				this.$auth.hasPermi('base:group-holiday:update')?
-				{
-					type: 'sync',
-					btnName: '同步节假日',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'equal',
-								name: 'status',
-								value: 2,
-							},
-							{
-								type: 'equal',
-								name: 'updateFlag',
-								value: true,
-							},
-						],
-					},
-				}:undefined,
-				this.$auth.hasPermi('base:group-scheduling-plan:create')?
-				{
-					type: 'copy',
-					btnName: '复制',
-				}:undefined,
-			].filter((v) => v),
-			tableData: [],
-			options: [
-				{
-					value: '1',
-					label: '草稿',
-				},
-				{
-					value: '2',
-					label: '已确认',
-				},
-				{
-					value: '3',
-					label: '已作废',
-				},
-			],
-			formInline: {
-				code: '',
-				name: '',
-				startDay: '',
-				endDay: '',
-				deptId: '',
-				status: '',
-			},
-			stepNum: 1, // 新增编辑时当前第几步
-			detailVisible: false,
-		};
-	},
-	components: {
-		AddOrUpdate,
-		deptSelect,
-    detail
-	},
-	created() {},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					const date1 = new Date(this.formInline.startDay).getTime();
-					const date2 = new Date(this.formInline.endDay).getTime();
-
-					if (date1 > date2) {
-						this.$message('开始时间不得晚于结束时间');
-						return;
-					}
-					this.listQuery = {
-						pageNo: 1,
-						pageSize: 10,
-						total: 1,
-						...this.formInline,
-					};
-					this.getDataList();
-					break;
-				case 'reset':
-					this.formInline.name = null;
-					this.formInline.code = null;
-					this.formInline.deptId = null;
-					this.$refs.deptSelect.clear();
-					this.formInline.leaderName = null;
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '添加排班计划';
-					this.addOrUpdateVisible = true;
-					this.$nextTick(() => {
-						this.$refs.addOrUpdate.init();
-					});
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		setDeptId(val) {
-			this.formInline.deptId = val;
-		},
-		setStepNum(val) {
-			this.stepNum = val;
-		},
-		successSubmit() {
-			this.addOrUpdateVisible = false;
-			this.addOrEditTitle = '';
-			this.stepNum = 1;
-			this.getDataList();
-		},
-		// dialog取消
-		handleCancel() {
-			this.$refs.addOrUpdate.cancelStep();
-		},
-		handleConfirm(val) {
-			if (val == 'up') {
-				this.$refs.addOrUpdate.upSubmit();
-			} else {
-				this.$refs.addOrUpdate.nextSubmit();
-			}
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data.id);
-				});
-			} else if (val.type === 'delete') {
-				this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex);
-			} else if (val.type === 'detail') {
-				this.detailVisible = true;
-				this.$nextTick(() => {
-					this.$refs.detailRef.init(val.data.id);
-				});
-			} else if (val.type === 'cancel') {
-				disablePlan(val.data.id).then((res) => {
-					this.$modal.msgSuccess('作废成功');
-          this.getDataList()
-				});
-			} else if (val.type === 'sync') {
-				updateScheduleLater({ planId: val.data.id }).then((res) => {
-					this.$modal.msgSuccess('同步节假日成功');
-          this.getDataList()
-				});
-			} else if (val.type === 'copy') {
-				copyPlan(val.data.id).then((res) => {
-					this.$modal.msgSuccess('复制成功');
-          this.getDataList()
-				});
-			}
-		},
-		detailCancel() {
-			this.detailVisible = false;
-		},
-	},
-};
-</script>
-
-<style scope>
-.searchBarBox {
-	width: 100%;
-	position: relative;
-	margin-bottom: 8px;
-}
-.searchBarBox::after {
-	content: '';
-	display: block;
-	clear: both;
-}
-.searchBar .blue-block {
-	display: inline-block;
-	float: left;
-	width: 4px;
-	height: 16px;
-	background-color: #0b58ff;
-	border-radius: 1px;
-	margin-right: 8px;
-	margin-top: 12px;
-}
-.searchBar .el-form-item {
-	margin-bottom: 4px;
-}
-.searchBar .separateStyle {
-	display: inline-block;
-	width: 1px;
-	height: 24px;
-	background: #e8e8e8;
-	vertical-align: middle;
-}
-.searchBar .vue-treeselect__control {
-	height: 32px !important;
-	line-height: 32px !important;
-	margin: 4px 0;
-}
-body .el-dialog__header {
-	font-size: 16px;
-	color: rgba(0, 0, 0, 0.85);
-	font-weight: 500;
-	padding: 13px 24px;
-	border-bottom: 1px solid #e9e9e9;
-}
-body .el-dialog__header .titleStyle::before {
-	content: '';
-	display: inline-block;
-	width: 4px;
-	height: 16px;
-	background-color: #0b58ff;
-	border-radius: 1px;
-	margin-right: 8px;
-	position: relative;
-	top: 2px;
-}
-</style>
diff --git a/src/views/group/Schedule/propSpan.vue b/src/views/group/Schedule/propSpan.vue
deleted file mode 100644
index 518c779a..00000000
--- a/src/views/group/Schedule/propSpan.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-21 13:54:52
- * @Description:
--->
-<template>
-	<span>
-		<el-tag
-			v-if="injectData.work"
-			size="small"
-			:type="['', 'success', 'warning'][injectData.sort]">
-			{{ injectData[injectData.prop] }}
-		</el-tag>
-		<el-tag v-else effect="dark" size="small" type="info">
-			{{ injectData[injectData.prop] }}
-		</el-tag>
-	</span>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>
diff --git a/src/views/group/Schedule/propfirstSpan.vue b/src/views/group/Schedule/propfirstSpan.vue
deleted file mode 100644
index c47f1488..00000000
--- a/src/views/group/Schedule/propfirstSpan.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-20 10:13:26
- * @Description:
--->
-<template>
-	<div>
-		<div>
-			{{ injectData.name.split('/')[0] }}
-		</div>
-		<div>
-			{{ injectData.name.split('/')[1] }}
-		</div>
-	</div>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>
diff --git a/src/views/group/Schedule/subSpan.vue b/src/views/group/Schedule/subSpan.vue
deleted file mode 100644
index ba908ef7..00000000
--- a/src/views/group/Schedule/subSpan.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:18:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-20 10:13:26
- * @Description:
--->
-<template>
-	<span>
-		{{
-			injectData.shiftSustainedNum +
-			(injectData.shiftSustainedType
-				? ['', '日', '周', '月', '季'][injectData.shiftSustainedType]
-				: '')
-		}}
-	</span>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>
diff --git a/src/views/group/Schedule/subStatus.vue b/src/views/group/Schedule/subStatus.vue
deleted file mode 100644
index 9ab6ce91..00000000
--- a/src/views/group/Schedule/subStatus.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-13 16:40:08
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-13 16:43:11
- * @Description:
--->
-<template>
-	<el-tag
-		v-if="injectData.status"
-     size="medium"
-		:type="['', '', 'success', 'warning'][injectData.status]">
-		{{ ['', '草稿', '已确认', '已作废'][injectData.status] }}
-	</el-tag>
-</template>
-
-<script>
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {};
-	},
-	created() {},
-	methods: {},
-};
-</script>
diff --git a/src/views/group/base/groupClasses/components/groupClassAdd.vue b/src/views/group/base/groupClasses/components/groupClassAdd.vue
deleted file mode 100644
index be383e34..00000000
--- a/src/views/group/base/groupClasses/components/groupClassAdd.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-	<el-form ref="form" :rules="rules" label-width="110px" :model="form">
-		<el-row>
-			<el-col :span="12">
-				<el-form-item label="工厂" prop="factoryId">
-					<el-select
-						v-model="form.factoryId"
-						filterable
-						clearable
-						style="width: 100%"
-						placeholder="请选择工厂">
-						<el-option
-							v-for="item in factoryArr"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="班次名称" prop="name">
-					<el-input v-model="form.name"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="编码" prop="code">
-					<el-input v-model="form.code" disabled></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="班次开始时间" prop="startTime">
-					<el-time-picker
-						v-model="form.startTime"
-						format="HH:mm"
-						value-format="HH:mm"
-						style="width: 100%"
-						@change="timeFun('start')"></el-time-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="班次结束时间" prop="endTime">
-					<el-time-picker
-						v-model="form.endTime"
-						format="HH:mm"
-						value-format="HH:mm"
-						style="width: 100%"
-						@change="timeFun('end')"></el-time-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="是否跨天" prop="daySpan">
-					<el-select
-						v-model="form.daySpan"
-						placeholder="请选择"
-						disabled
-						style="width: 100%">
-						<el-option label="否" :value="0"></el-option>
-						<el-option label="是" :value="1"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input v-model="form.remark"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-<script>
-import {
-	getGroupClasses,
-	updateGroupClasses,
-	createGroupClasses,
-	getCode,
-} from '@/api/base/groupClasses';
-import { getFactoryPage } from '@/api/core/base/factory';
-export default {
-	name: 'groupClassAdd',
-	data() {
-		return {
-			form: {
-				id: '',
-				factoryId: '',
-				name: '',
-				code: '',
-				startTime: '',
-				endTime: '',
-				daySpan: '',
-				remark: '',
-			},
-			isEdit: false, //是否是编辑
-      factoryArr: [],
-			rules: {
-				factoryId: [
-					{ required: true, message: '请选择工厂', trigger: 'change' },
-				],
-				name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
-				code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
-				startTime: [
-					{ required: true, message: '请选择班次开始时间', trigger: 'change' },
-				],
-				endTime: [
-					{ required: true, message: '请选择班次结束时间', trigger: 'change' },
-				],
-			},
-		};
-	},
-	created() {
-		const params = {
-			pageSize: 100,
-			pageNo: 1,
-		};
-		getFactoryPage(params).then((res) => {
-			this.factoryArr = res.data.list || [];
-		});
-	},
-	methods: {
-		init(id) {
-			if (id) {
-				this.isEdit = true;
-				this.form.id = id;
-				getGroupClasses(id).then((res) => {
-					if (res.code === 0) {
-						this.form = res.data;
-					}
-				});
-			} else {
-				this.isEdit = false;
-				this.form.id = '';
-				getCode().then((res) => {
-					this.form.code = res.data;
-				});
-			}
-		},
-		timeFun(val) {
-			if (this.form.startTime && this.form.endTime) {
-				if (this.form.startTime > this.form.endTime) {
-					this.form.daySpan = 1;
-				} else if (this.form.startTime < this.form.endTime) {
-					this.form.daySpan = 0;
-				} else {
-					if (val === 'start') {
-						this.form.startTime = '';
-					} else {
-						this.form.endTime = '';
-					}
-					this.$modal.msgWarning('班次开始时间和结束时间不能相同');
-				}
-			}
-		},
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					if (this.isEdit) {
-						//编辑
-						updateGroupClasses({ ...this.form }).then((res) => {
-							if (res.code === 0) {
-								this.$modal.msgSuccess('操作成功');
-								this.$emit('successSubmit');
-							}
-						});
-					} else {
-						createGroupClasses({ ...this.form }).then((res) => {
-							if (res.code === 0) {
-								this.$modal.msgSuccess('操作成功');
-								this.$emit('successSubmit');
-							}
-						});
-					}
-				} else {
-					return false;
-				}
-			});
-		},
-		formClear() {
-			this.$refs.form.resetFields();
-			this.isEdit = false;
-		},
-	},
-};
-</script>
diff --git a/src/views/group/base/groupClasses/components/statusBtn.vue b/src/views/group/base/groupClasses/components/statusBtn.vue
deleted file mode 100644
index 020d2aa2..00000000
--- a/src/views/group/base/groupClasses/components/statusBtn.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-01 14:53:55
- * @LastEditors: zwq
- * @LastEditTime: 2025-01-14 13:09:33
- * @Description:
--->
-<template>
-  <el-switch v-model="state" type="text" size="small" :disabled="readonly" @change="changeHandler" />
-</template>
-
-<script>
-export default {
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      state: false
-    }
-  },
-  computed: {
-    readonly() {
-      return !!this.injectData.readonly
-    }
-  },
-  mounted() {
-    this.mapToState()
-  },
-  methods: {
-    mapToState() {
-      if (this.injectData.prop === 'enabled') {
-        this.state = this.injectData.enabled === 1 ? true : false
-      }
-    },
-    changeHandler() {
-      let params = {}
-      let payload = {}
-      params.name = 'state'
-      payload.id = this.injectData.id
-      payload.enabled = this.state ? '1' : '0'
-      payload.startTime = this.injectData.startTime
-      payload.endTime = this.injectData.endTime
-      payload.factoryId = this.injectData.factoryId
-      params.payload = payload
-      this.$emit('emitData', params)
-    }
-  }
-}
-</script>
diff --git a/src/views/group/base/groupClasses/index.vue b/src/views/group/base/groupClasses/index.vue
deleted file mode 100644
index 2fbcde32..00000000
--- a/src/views/group/base/groupClasses/index.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-01 14:53:55
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-24 16:02:39
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<!-- 列表 -->
-		<base-table
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-props="tableProps"
-			:table-data="list"
-			:max-height="tableH"
-			@emitFun="handleTableEvents">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-		<!-- 新增 -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="centervisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<group-class-add ref="classList" @successSubmit="successSubmit" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	getGroupClassesPage,
-	deleteGroupClasses,
-	updateGroupClasses,
-} from '@/api/base/groupClasses';
-import GroupClassAdd from './components/groupClassAdd.vue';
-import StatusBtn from './components/statusBtn';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
-import { getFactoryPage } from '@/api/core/base/factory';
-
-const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂',
-	},
-	{
-		prop: 'name',
-		label: '班次名称',
-	},
-	{
-		prop: 'timeStr',
-		label: '班次时间',
-		minWidth: 100,
-	},
-	{
-		prop: 'code',
-		label: '班次编码',
-		minWidth: 200,
-	},
-	{
-		prop: 'enabled',
-		label: '班次状态',
-		subcomponent: StatusBtn,
-	},
-	// {
-	// 	prop: 'remark',
-	// 	label: '备注',
-	// },
-];
-export default {
-	name: 'GroupClass',
-	components: { GroupClassAdd },
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'input',
-					label: '班次名称',
-					placeholder: '班次名称',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:group-classes:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-			],
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi('base:group-classes:update')
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-classes:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			// 总条数
-			total: 0,
-			// 班次基础信息列表
-			list: [],
-			// 弹出层标题
-			addOrEditTitle: '',
-			// 是否显示弹出层
-			centervisible: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				name: null,
-			},
-		};
-	},
-	created() {
-		this.getList();
-		this.getPdLineList();
-	},
-	methods: {
-		getPdLineList() {
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.queryParams.pageNo = 1;
-					this.queryParams.name = val.name;
-					this.queryParams.factoryId = val.factoryId || undefined;
-					this.getList();
-					break;
-				default:
-					this.addOrEditTitle = '新增';
-					this.centervisible = true;
-					this.$nextTick(() => {
-						this.$refs.classList.init();
-					});
-			}
-		},
-		// 班组状态
-		handleTableEvents(params) {
-			if (params.name === 'state') {
-				// 班组状态
-				updateGroupClasses({ ...params.payload })
-					.then((res) => {
-						if (res.code === 0) {
-							this.$modal.msgSuccess('操作成功');
-							this.getList();
-						}
-					})
-					.catch((res) => {
-						this.getList();
-					});
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			getGroupClassesPage(this.queryParams).then((res) => {
-				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
-					res.data.list.map((item) => {
-						item.timeStr =
-							item.startTime.slice(0, 5) + '-' + item.endTime.slice(0, 5);
-					});
-					this.list = res.data.list;
-					this.total = res.data.total;
-				} else {
-					this.list = [];
-					this.total = 0;
-				}
-			});
-		},
-		handleClick(val) {
-			switch (val.type) {
-				case 'edit':
-					this.addOrEditTitle = '编辑';
-					this.$nextTick(() => {
-						this.$refs.classList.init(val.data.id);
-					});
-					this.centervisible = true;
-					break;
-				default:
-					this.handleDelete(val.data);
-			}
-		},
-		handleCancel() {
-			this.$refs.classList.formClear();
-			this.centervisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.$refs.classList.submitForm();
-		},
-		successSubmit() {
-			this.handleCancel();
-			this.getList();
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			let _this = this;
-			if (row.enabled) {
-				// 可用
-				this.$confirm(
-					`是否确认删除 ${row.name} 的数据项?`,
-					'可能会影响交接班计划！',
-					{
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					}
-				).then(function () {
-					return _this
-						.$confirm(`是否确认删除 ${row.name} 的数据项?`, '系统提示', {
-							confirmButtonText: '确定',
-							cancelButtonText: '取消',
-							type: 'warning',
-						})
-						.then(function () {
-							return deleteGroupClasses(row.id);
-						})
-						.then(() => {
-							_this.getList();
-							_this.$modal.msgSuccess('删除成功');
-						})
-						.catch(() => {});
-				});
-			} else {
-				this.$confirm(`是否确认删除 ${row.name} 的数据项?`, '系统提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning',
-				})
-					.then(function () {
-						return deleteGroupClasses(row.id);
-					})
-					.then(() => {
-						_this.getList();
-						_this.$modal.msgSuccess('删除成功');
-					})
-					.catch(() => {});
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/group/base/groupReport/baseTable.vue b/src/views/group/base/groupReport/baseTable.vue
deleted file mode 100644
index 4fa1531c..00000000
--- a/src/views/group/base/groupReport/baseTable.vue
+++ /dev/null
@@ -1,278 +0,0 @@
-<template>
-	<div class="baseTable">
-		<el-table
-			:ref="id"
-			:data="renderData"
-			v-bind="$attrs"
-			:border="cancelBorder ? false : true"
-			@current-change="currentChange"
-			@selection-change="handleSelectionChange"
-			style="width: 100%"
-			:header-cell-style="{
-				background: '#F2F4F9',
-				color: '#606266',
-			}">
-			<!-- 多选 -->
-			<el-table-column
-				v-if="selectWidth"
-				type="selection"
-				:width="selectWidth" />
-			<!-- 序号 -->
-			<el-table-column
-				v-if="page && limit"
-				prop="_pageIndex"
-				:width="pageWidth"
-				align="center"
-				:fixed="cancelPageFixed ? false : true">
-				<template slot="header">
-					<el-popover placement="bottom-start" width="300" trigger="click">
-						<div
-							class="setting-box"
-							style="max-height: 400px; overflow-y: auto">
-							<el-checkbox
-								v-for="(item, index) in tableProps"
-								:key="'cb' + index"
-								v-model="selectedBox[index]"
-								:label="item.label" />
-						</div>
-						<i slot="reference" class="el-icon-s-tools" />
-					</el-popover>
-				</template>
-			</el-table-column>
-
-			<el-table-column
-				v-for="item in renderTableHeadList"
-				:key="item.prop"
-				v-bind="item"
-				:label="item.label"
-				:prop="item.prop"
-				:fixed="item.fixed || false"
-				:show-overflow-tooltip="item.showOverflowtooltip || false"
-				:sortable="item.sortable || false">
-				<template slot="header">
-					<span>{{ item.label }}</span>
-				</template>
-				<!-- 多表头 -->
-				<template v-if="item.children">
-					<el-table-column
-						v-for="sub in item.children"
-						:prop="sub.prop"
-						:key="sub.prop"
-						v-bind="sub"
-						:label="sub.label">
-						<template v-if="sub.children">
-							<el-table-column
-								v-for="ssub in sub.children"
-								:prop="ssub.prop"
-								:key="ssub.prop"
-								v-bind="ssub"
-								:label="ssub.label">
-								<template slot-scope="sscopeInner">
-									<component
-										:is="ssub.subcomponent"
-										v-if="ssub.subcomponent"
-										:key="sscopeInner.row.id"
-										:inject-data="{ ...sscopeInner.row, ...ssub }"
-										@emitData="emitData" />
-									<span v-else>
-										{{ sscopeInner.row[ssub.prop] | commonFilter(ssub.filter) }}
-									</span>
-								</template>
-							</el-table-column>
-						</template>
-						<template slot-scope="scopeInner">
-							<component
-								:is="sub.subcomponent"
-								v-if="sub.subcomponent"
-								:key="scopeInner.row.id"
-								:inject-data="{ ...scopeInner.row, ...sub }"
-								@emitData="emitData" />
-							<span v-else>
-								{{ scopeInner.row[sub.prop] | commonFilter(sub.filter) }}
-							</span>
-						</template>
-					</el-table-column>
-				</template>
-				<template slot-scope="scope">
-					<component
-						:is="item.subcomponent"
-						v-if="item.subcomponent"
-						:key="scope.row.id"
-						:itemProp="item.prop"
-						:inject-data="{ ...scope.row, ...item }"
-						@emitData="emitData" />
-					<span v-else>
-						{{ scope.row[item.prop] | commonFilter(item.filter) }}
-					</span>
-				</template>
-			</el-table-column>
-			<slot name="handleBtn" />
-		</el-table>
-		<!-- 表格底部加号 -->
-		<el-button
-			v-if="addButtonShow"
-			class="addButton"
-			icon="el-icon-plus"
-			@click="emitButtonClick">
-			{{ addButtonShow }}
-		</el-button>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'BaseTable',
-	filters: {
-		commonFilter: (source, filterType = (a) => a) => {
-			return filterType(source);
-		},
-	},
-	props: {
-		cancelBorder: {
-			type: Boolean,
-			default: false,
-		},
-		cancelPageFixed: {
-			type: Boolean,
-			default: false,
-		},
-		tableData: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-		tableProps: {
-			type: Array,
-			default: () => {
-				return [];
-			},
-		},
-		id: {
-			type: String,
-			required: false,
-			default: '',
-		},
-		page: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		pageWidth: {
-			type: Number,
-			required: false,
-			default: 70,
-		},
-		limit: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		selectWidth: {
-			type: Number,
-			required: false,
-			default: 0,
-		},
-		addButtonShow: {
-			type: String,
-			required: false,
-			default: '',
-		},
-	},
-	data() {
-		return {
-			selectedBox: new Array(100).fill(true),
-		};
-	},
-	computed: {
-		renderTableHeadList() {
-			return this.tableProps.filter((item, index) => {
-				return this.selectedBox[index];
-			});
-		},
-		renderData() {
-			return this.tableData.map((item, index) => {
-				return {
-					...item,
-					_pageIndex: (this.page - 1) * this.limit + index + 1,
-				};
-			});
-		},
-	},
-	beforeMount() {
-		this.selectedBox = new Array(100).fill(true);
-	},
-	methods: {
-		currentChange(newVal, oldVal) {
-			this.$emit('current-change', { newVal, oldVal });
-		},
-		handleSelectionChange(val) {
-			this.$emit('selection-change', val);
-		},
-		emitData(val) {
-			this.$emit('emitFun', val);
-		},
-		emitButtonClick() {
-			this.$emit('emitButtonClick');
-		},
-		setCurrent(name, index) {
-			let _this = this;
-			let obj = _this.$refs[name].data[index];
-			_this.$refs[name].setCurrentRow(obj);
-		},
-		doLayout(name) {
-			this.$refs[name].doLayout();
-		},
-	},
-};
-</script>
-<style scoped>
-.baseTable .show-col-btn {
-	margin-right: 5px;
-	line-height: inherit;
-	cursor: pointer;
-}
-.baseTable .el-icon-refresh {
-	cursor: pointer;
-}
-.baseTable >>> .el-table .el-table__cell {
-	padding: 0;
-	height: 35px;
-  border: 1px solid rgb(220, 220, 220);
-}
-</style>
-<style>
-.baseTable .el-table__body tr.current-row > td.el-table__cell {
-	background-color: #eaf1fc;
-}
-.baseTable .el-table .el-table__cell {
-	padding: 0;
-	height: 35px;
-}
-.baseTable .addButton {
-	width: 100%;
-	height: 35px;
-	border-top: none;
-	color: #0b58ff;
-	border-color: #ebeef5;
-	border-radius: 0;
-}
-.baseTable .addButton:hover {
-	color: #0b58ff;
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-.baseTable .addButton:focus {
-	border-color: #ebeef5;
-	background-color: #fff;
-}
-
-.el-tooltip__popper.is-dark {
-	background: rgba(0, 0, 0, 0.6) !important;
-}
-.el-tooltip__popper .popper__arrow,
-.el-tooltip__popper .popper__arrow::after {
-	border-top-color: rgba(0, 0, 0, 0.4) !important;
-}
-</style>
diff --git a/src/views/group/base/groupReport/gr-detail.vue b/src/views/group/base/groupReport/gr-detail.vue
deleted file mode 100644
index d97e9738..00000000
--- a/src/views/group/base/groupReport/gr-detail.vue
+++ /dev/null
@@ -1,307 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-24 14:47:58
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-25 14:03:40
- * @Description:
--->
-<template>
-	<div>
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<el-table
-			id="detail"
-			:data="tableData"
-			:header-cell-style="{
-				background: '#F2F4F9',
-				color: '#606266',
-			}"
-			border
-			:span-method="arraySpanMethod"
-			v-loading="dataListLoading"
-			style="width: 100%"
-			ref="dataList">
-			<el-table-column prop="lineName" label="产线" align="center" />
-			<el-table-column
-				prop="sizes"
-				width="105"
-				showOverflowtooltip
-        align="center"
-				label="规格" />
-			<el-table-column prop="process" label="产品工艺" align="center" />
-			<el-table-column prop="inputN" label="投入" align="center">
-				<el-table-column prop="inputNum" label="投入数量/片" />
-				<el-table-column prop="inputArea" label="投入面积/m²">
-					<template v-slot="scope">
-						<span>
-							{{
-								scope.row.inputArea != null
-									? scope.row.inputArea.toFixed(2)
-									: '-'
-							}}
-						</span>
-					</template>
-				</el-table-column>
-			</el-table-column>
-			<el-table-column prop="outputN" label="产出" align="center">
-				<el-table-column prop="outputNum" label="产出数量/片" />
-				<el-table-column prop="outputArea" label="产出面积/m²">
-					<template v-slot="scope">
-						<span>
-							{{
-								scope.row.outputArea != null
-									? scope.row.outputArea.toFixed(2)
-									: '-'
-							}}
-						</span>
-					</template>
-				</el-table-column>
-			</el-table-column>
-			<el-table-column prop="lossN" label="不良" align="center">
-				<el-table-column prop="lossNum" label="不良数量/片" />
-				<el-table-column prop="lossArea" label="不良面积/m²">
-					<template v-slot="scope">
-						<span>
-							{{
-								scope.row.lossArea != null ? scope.row.lossArea.toFixed(2) : '-'
-							}}
-						</span>
-					</template>
-				</el-table-column>
-			</el-table-column>
-			<el-table-column prop="lossRatio" label="不良率/%">
-				<template v-slot="scope">
-					<span>
-						{{
-							scope.row.lossRatio != null ? scope.row.lossRatio.toFixed(2) : '-'
-						}}
-					</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="outputRatio" label="投入产出率/%">
-				<template v-slot="scope">
-					<span>
-						{{
-							scope.row.outputRatio != null
-								? scope.row.outputRatio.toFixed(2)
-								: '-'
-						}}
-					</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="processingRatio" label="加工成品率/%">
-				<template v-slot="scope">
-					<span>
-						{{
-							scope.row.processingRatio != null
-								? scope.row.processingRatio.toFixed(2)
-								: '-'
-						}}
-					</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="lossD" label="不良详情" align="center">
-				<el-table-column prop="original" label="原片" align="center">
-					<el-table-column prop="originalLossNum" label="原片不良/片" />
-					<el-table-column prop="originalLossArea" label="原片不良/m²">
-						<template v-slot="scope">
-							<span>
-								{{
-									scope.row.originalLossArea != null
-										? scope.row.originalLossArea.toFixed(2)
-										: '-'
-								}}
-							</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column prop="edge" label="磨边" align="center">
-					<el-table-column prop="edgeLossNum" label="磨边不良/片" />
-					<el-table-column prop="edgeLossArea" label="磨边不良/m²">
-						<template v-slot="scope">
-							<span>
-								{{
-									scope.row.edgeLossArea != null
-										? scope.row.edgeLossArea.toFixed(2)
-										: '-'
-								}}
-							</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column prop="drill" label="打孔" align="center">
-					<el-table-column prop="drillLossNum" label="打孔不良/片" />
-					<el-table-column prop="drillLossArea" label="打孔不良/m²">
-						<template v-slot="scope">
-							<span>
-								{{
-									scope.row.drillLossArea != null
-										? scope.row.drillLossArea.toFixed(2)
-										: '-'
-								}}
-							</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column prop="coating" label="镀膜" align="center">
-					<el-table-column prop="coatingLossNum" label="镀膜不良/片" />
-					<el-table-column prop="coatingLossArea" label="镀膜不良/m²">
-						<template v-slot="scope">
-							<span>
-								{{
-									scope.row.coatingLossArea != null
-										? scope.row.coatingLossArea.toFixed(2)
-										: '-'
-								}}
-							</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column prop="silk" label="丝印" align="center">
-					<el-table-column prop="silkLossNum" label="丝印不良/片" />
-					<el-table-column prop="silkLossArea" label="丝印不良/m²">
-						<template v-slot="scope">
-							<span>
-								{{
-									scope.row.silkLossArea != null
-										? scope.row.silkLossArea.toFixed(2)
-										: '-'
-								}}
-							</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column prop="tempering" label="钢化" align="center">
-					<el-table-column prop="temperingLossNum" label="钢化不良/片" />
-					<el-table-column prop="temperingLossArea" label="钢化不良/m²">
-						<template v-slot="scope">
-							<span>
-								{{
-									scope.row.temperingLossArea != null
-										? scope.row.temperingLossArea.toFixed(2)
-										: '-'
-								}}
-							</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column prop="packing" label="包装" align="center">
-					<el-table-column prop="packingLossNum" label="包装不良/片" />
-					<el-table-column prop="packingLossArea" label="包装不良/m²">
-						<template v-slot="scope">
-							<span>
-								{{
-									scope.row.packingLossArea != null
-										? scope.row.packingLossArea.toFixed(2)
-										: '-'
-								}}
-							</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-			</el-table-column>
-		</el-table>
-	</div>
-</template>
-
-<script>
-import { getTeamReportPageDet } from '@/api/core/monitoring/auto';
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
-
-export default {
-	components: {},
-	data() {
-		return {
-			tableData: [],
-			dataListLoading: false,
-			formConfig: [
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-		};
-	},
-	components: {},
-	created() {},
-	mounted() {},
-	methods: {
-		// 获取数据列表
-		init(id) {
-			this.dataListLoading = true;
-			getTeamReportPageDet(id).then((response) => {
-				this.tableData = response.data?.map((item, index) => {
-					item.originalLossNum = item.original?.lossNum;
-					item.originalLossArea = item.original?.lossArea;
-					item.edgeLossNum = item.edge?.lossNum;
-					item.edgeLossArea = item.edge?.lossArea;
-					item.drillLossNum = item.drill?.lossNum;
-					item.drillLossArea = item.drill?.lossArea;
-					item.coatingLossNum = item.coating?.lossNum;
-					item.coatingLossArea = item.coating?.lossArea;
-					item.silkLossNum = item.silk?.lossNum;
-					item.silkLossArea = item.silk?.lossArea;
-					item.temperingLossNum = item.tempering?.lossNum;
-					item.temperingLossArea = item.tempering?.lossArea;
-					item.packingLossNum = item.packing?.lossNum;
-					item.packingLossArea = item.packing?.lossArea;
-					if (item.isSummaryReport) {
-						item.lineName = '合计';
-					}
-					return item;
-				});
-				this.dataListLoading = false;
-			});
-		},
-		arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-			if (row.isSummaryReport) {
-				if (columnIndex === 0) {
-					return [1, 3];
-				} else if (columnIndex === 1) {
-					return [0, 0];
-				} else if (columnIndex === 2) {
-					return [0, 0];
-				}
-			}
-		},
-
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		handleExport() {
-			let tables = document.querySelector('#detail').cloneNode(true);
-			let exportTable = XLSX.utils.table_to_book(tables);
-
-			var exportTableOut = XLSX.write(exportTable, {
-				bookType: 'xlsx',
-				bookSST: true,
-				type: 'array',
-			});
-			// sheetjs.xlsx为导出表格的标题名称
-			try {
-				FileSaver.saveAs(
-					new Blob([exportTableOut], {
-						type: 'application/octet-stream',
-					}),
-					'班组生产报表-详情.xlsx'
-				);
-			} catch (e) {
-				if (typeof console !== 'undefined') console.log(e, exportTableOut);
-			}
-			return exportTableOut;
-		},
-	},
-};
-</script>
diff --git a/src/views/group/base/groupReport/index.vue b/src/views/group/base/groupReport/index.vue
deleted file mode 100644
index 2e064f67..00000000
--- a/src/views/group/base/groupReport/index.vue
+++ /dev/null
@@ -1,546 +0,0 @@
-<!--
- * @Author: Do not edit
- * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2025-02-25 14:26:04
- * @LastEditors: zwq
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table-s
-			v-if="showData.length"
-			class="right-aside"
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="showData">
-			<method-btn
-				v-if="showData.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table-s>
-		<div v-else class="no-data-bg"></div>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			close-on-click-modal
-			top="0"
-			width="80%">
-			<gr-detail ref="grDetail" />
-			<slot name="footer">
-				<el-row slot="footer" type="flex" justify="end">
-					<el-col :span="24">
-						<el-button size="small" class="btnTextStyle" @click="handleCancel">
-							取消
-						</el-button>
-					</el-col>
-				</el-row>
-			</slot>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import grDetail from './gr-detail';
-import { getTeamReportPage } from '@/api/core/monitoring/auto';
-import { getFactoryPage } from '@/api/core/base/factory';
-import { getGroupTeamPage } from '@/api/base/groupTeam';
-// import codeFilter from '../../mixins/code-filter'
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
-import baseTableS from './baseTable.vue';
-import { parseTime } from '@/filter/code-filter';
-
-const tableProps = [
-	{
-		prop: 'reportType',
-		label: '报表类型',
-    fixed: true
-	},
-	{
-		prop: 'reportName',
-		label: '日期',
-		width: 180,
-    fixed: true
-	},
-	{
-		prop: 'factoryName',
-		label: '工厂',
-    fixed: true
-	},
-	{
-		prop: 'teamName',
-		label: '班组',
-    fixed: true
-	},
-
-	{
-		prop: 'inputN',
-		label: '投入',
-		align: 'center',
-		children: [
-			{
-				prop: 'inputNum',
-				label: '投入数量/片',
-        width:100
-			},
-			{
-				prop: 'inputArea',
-				label: '投入面积/m²',
-        width:100
-			},
-		],
-	},
-	{
-		prop: 'outputN',
-		label: '产出',
-		align: 'center',
-		children: [
-			{
-				prop: 'outputNum',
-				label: '产出数量/片',
-        width:100
-			},
-			{
-				prop: 'outputArea',
-				label: '产出面积/㎡',
-				filter: (val) => (val != null ? val.toFixed(2) : '-'),
-        width:100
-			},
-		],
-	},
-	{
-		prop: 'lossN',
-		label: '不良',
-		align: 'center',
-		children: [
-			{
-				prop: 'lossNum',
-				label: '不良数量/片',
-        width:100
-			},
-			{
-				prop: 'lossArea',
-				label: '不良面积/㎡',
-				filter: (val) => (val != null ? val.toFixed(2) : '-'),
-        width:100
-			},
-		],
-	},
-	{
-		prop: 'lossRatio',
-		label: '不良率/%',
-		filter: (val) => (val != null ? val.toFixed(2) : '-'),
-    width:100
-	},
-	{
-		prop: 'outputRatio',
-		label: '投入产出率/%',
-		filter: (val) => (val != null ? val.toFixed(2) : '-'),
-    width:110
-	},
-	{
-		prop: 'processingRatio',
-		label: '加工成品率/%',
-		filter: (val) => (val != null ? val.toFixed(2) : '-'),
-    width:110
-	},
-	{
-		prop: 'lossD',
-		label: '不良详情',
-		align: 'center',
-		children: [
-			{
-				prop: 'original',
-				label: '原片',
-        align: 'center',
-				children: [
-					{
-						prop: 'originalLossNum',
-						label: '原片不良/片',
-            width:100
-					},
-					{
-						prop: 'originalLossArea',
-						label: '原片不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-            width:100
-					},
-				],
-			},
-			{
-				prop: 'edge',
-				label: '磨边',
-        align: 'center',
-				children: [
-					{
-						prop: 'edgeLossNum',
-						label: '磨边不良/片',
-            width:100
-					},
-					{
-						prop: 'edgeLossArea',
-						label: '磨边不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-            width:100
-					},
-				],
-			},
-			{
-				prop: 'drill',
-				label: '打孔',
-        align: 'center',
-				children: [
-					{
-						prop: 'drillLossNum',
-						label: '打孔不良/片',
-            width:100
-					},
-					{
-						prop: 'drillLossArea',
-						label: '打孔不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-            width:100
-					},
-				],
-			},
-			{
-				prop: 'coating',
-				label: '镀膜',
-        align: 'center',
-				children: [
-					{
-						prop: 'coatingLossNum',
-						label: '镀膜不良/片',
-            width:100
-					},
-					{
-						prop: 'coatingLossArea',
-						label: '镀膜不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-            width:100
-					},
-				],
-			},
-			{
-				prop: 'silk',
-				label: '丝印',
-        align: 'center',
-				children: [
-					{
-						prop: 'silkLossNum',
-						label: '丝印不良/片',
-            width:100
-					},
-					{
-						prop: 'silkLossArea',
-						label: '丝印不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-            width:100
-					},
-				],
-			},
-			{
-				prop: 'tempering',
-				label: '钢化',
-        align: 'center',
-				children: [
-					{
-						prop: 'temperingLossNum',
-						label: '钢化不良/片',
-            width:100
-					},
-					{
-						prop: 'temperingLossArea',
-						label: '钢化不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-            width:100
-					},
-				],
-			},
-			{
-				prop: 'packing',
-				label: '包装',
-        align: 'center',
-				children: [
-					{
-						prop: 'packingLossNum',
-						label: '包装不良/片',
-            width:100
-					},
-					{
-						prop: 'packingLossArea',
-						label: '包装不良/㎡',
-						filter: (val) => (val != null ? val.toFixed(2) : '-'),
-            width:100
-					},
-				],
-			},
-		],
-	},
-];
-
-export default {
-	components: {
-		baseTableS,
-		grDetail,
-	},
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getTeamReportPage,
-			},
-			listQuery: {
-        reportType: 1,
-				pageSize: 10,
-				pageNo: 1,
-				total: 1,
-			},
-			fileName: '',
-			dataListLoading: false,
-			tableProps,
-			tableBtn: [
-				{
-					type: 'eq',
-					btnName: '详情',
-				},
-			].filter((v) => v),
-			showData: [],
-			tableData: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-				},
-				{
-					type: 'select',
-					label: '班组',
-					selectOptions: [],
-					param: 'teamId',
-				},
-				{
-					type: 'select',
-					label: '报表类型',
-					selectOptions: [
-						{
-							id: 1,
-							name: '日',
-						},
-						{
-							id: 2,
-							name: '周',
-						},
-						{
-							id: 3,
-							name: '月',
-						},
-						{
-							id: 4,
-							name: '年',
-						},
-					],
-					defaultSelect: 1,
-					param: 'reportType',
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'timestamp',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'timeVal',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			addOrEditTitle: '',
-			addOrUpdateVisible: false,
-		};
-	},
-	created() {
-		// 获取当前时间
-		const now = new Date();
-		// 获取前一天的同一时间
-		const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000);
-		// 设置为00:00:00
-		yesterday.setHours(0, 0, 0, 0);
-		// 设置为23:59:59
-		const end = new Date(yesterday.getTime());
-		end.setHours(23, 59, 59, 59);
-		this.listQuery.reportStartTime = [yesterday.getTime(),end.getTime()];
-		this.$nextTick(() => {
-			this.$refs.searchBarForm.formInline.timeVal = [yesterday.getTime(),end.getTime()];
-		});
-		this.getDataList();
-		this.getPdLineList();
-	},
-	methods: {
-		handleExport() {
-			let tables = document.querySelector('.el-table').cloneNode(true);
-			const fix = tables.querySelector('.el-table__fixed');
-			const fixRight = tables.querySelector('.el-table__fixed-right');
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'));
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'));
-			}
-			let exportTable = XLSX.utils.table_to_book(tables);
-      exportTable.Sheets.Sheet1.A1.v = '序号' //导出表格第一列表头为序号
-
-			var exportTableOut = XLSX.write(exportTable, {
-				bookType: 'xlsx',
-				bookSST: true,
-				type: 'array',
-			});
-			// sheetjs.xlsx为导出表格的标题名称
-			try {
-				FileSaver.saveAs(
-					new Blob([exportTableOut], {
-						type: 'application/octet-stream',
-					}),
-					this.fileName + '班组生产报表.xlsx'
-				);
-			} catch (e) {
-				if (typeof console !== 'undefined') console.log(e, exportTableOut);
-			}
-			return exportTableOut;
-		},
-		getPdLineList() {
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getGroupTeamPage(params).then((res) => {
-				this.formConfig[1].selectOptions = res.data.list || [];
-			});
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.teamId = val.teamId || undefined;
-					this.listQuery.reportType = val.reportType || undefined;
-					this.listQuery.reportStartTime = val.timeVal
-						? val.timeVal
-						: undefined;
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-		getDataList() {
-			this.dataListLoading = true;
-			const arr = ['日', '周', '月', '年'];
-			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
-				if (!response.data.list) {
-					this.showData = [];
-					this.dataListLoading = false;
-					return;
-				}
-				this.tableData = response.data?.list.map((item, index) => {
-					item.reportType = arr[item.reportType - 1];
-					item.originalLossNum = item.original?.lossNum;
-					item.originalLossArea = item.original?.lossArea;
-					item.edgeLossNum = item.edge?.lossNum;
-					item.edgeLossArea = item.edge?.lossArea;
-					item.drillLossNum = item.drill?.lossNum;
-					item.drillLossArea = item.drill?.lossArea;
-					item.coatingLossNum = item.coating?.lossNum;
-					item.coatingLossArea = item.coating?.lossArea;
-					item.silkLossNum = item.silk?.lossNum;
-					item.silkLossArea = item.silk?.lossArea;
-					item.temperingLossNum = item.tempering?.lossNum;
-					item.temperingLossArea = item.tempering?.lossArea;
-					item.packingLossNum = item.packing?.lossNum;
-					item.packingLossArea = item.packing?.lossArea;
-					return item;
-				});
-				this.listQuery.total = response.data?.total;
-				this.dataListLoading = false;
-				this.showData = this.tableData;
-			});
-		},
-		handleClick(val) {
-			this.addOrUpdateVisible = true;
-      const time = val.data.reportName?val.data.reportName:'- '
-      const teamName = val.data.teamName?val.data.teamName:'- '
-      const teamLeader = val.data.teamLeader?val.data.teamLeader:'- '
-			this.addOrEditTitle =
-				'时间：' +
-				time +
-				' 班组：' +
-				teamName +
-				' 组长：' +
-				teamLeader +
-				' 详情';
-			this.$nextTick(() => {
-				this.$refs.grDetail.init(val.data.id);
-			});
-		},
-		handleCancel() {
-			this.addOrUpdateVisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.handleCancel();
-		},
-		// 每页数
-		sizeChangeHandle(val) {
-			this.listQuery.pageSize = val;
-			this.listQuery.pageNo = 1;
-			this.getDataList();
-		},
-		// 当前页
-		currentChangeHandle(val) {
-			this.listQuery.pageNo = val;
-			this.getDataList();
-		},
-	},
-};
-</script>
diff --git a/src/views/group/base/groupTeam/components/groupTeamAdd.vue b/src/views/group/base/groupTeam/components/groupTeamAdd.vue
deleted file mode 100644
index 375fff65..00000000
--- a/src/views/group/base/groupTeam/components/groupTeamAdd.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<template>
-	<el-form ref="form" :rules="rules" label-width="100px" :model="form">
-		<el-row>
-			<el-col :span="12">
-				<el-form-item label="工厂" prop="factoryId">
-					<el-select
-						v-model="form.factoryId"
-						filterable
-						clearable
-						style="width: 100%"
-						placeholder="请选择工厂">
-						<el-option
-							v-for="item in factoryArr"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="班组名称" prop="name">
-					<el-input v-model="form.name"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="班组编码" prop="code">
-					<el-input v-model="form.code" disabled></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="班组组长" prop="leaderName">
-					<el-input v-model="form.leaderName" clearable></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="手机号" prop="leaderPhone">
-					<el-input v-model="form.leaderPhone" clearable></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="班组人数" prop="num">
-					<el-input-number
-						style="width: 100%"
-						v-model="form.num"
-						:step="1"
-						step-strictly></el-input-number>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-<script>
-import {
-	getGroupTeam,
-	updateGroupTeam,
-	createGroupTeam,
-	getCode,
-} from '@/api/base/groupTeam';
-import { getFactoryPage } from '@/api/core/base/factory';
-export default {
-	name: 'groupTeamAdd',
-	data() {
-		return {
-			form: {
-				id: '',
-				factoryId: '',
-				name: '',
-				code: '',
-				leaderName: '',
-				leaderPhone: '',
-				num: '',
-			},
-			factoryArr: [], //工厂
-			isEdit: false, //是否是编辑
-			rules: {
-				factoryId: [
-					{ required: true, message: '请选择工厂', trigger: 'change' },
-				],
-				name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
-				code: [{ required: true, message: '请输入班组编码', trigger: 'blur' }],
-				leaderName: [
-					{ required: true, message: '请输入组长', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	created() {
-		const params = {
-			pageSize: 100,
-			pageNo: 1,
-		};
-		getFactoryPage(params).then((res) => {
-			this.factoryArr = res.data.list || [];
-		});
-	},
-	methods: {
-		init(id) {
-			if (id) {
-				this.isEdit = true;
-				this.form.id = id;
-				getGroupTeam(id).then((res) => {
-					if (res.code === 0) {
-						this.form = res.data;
-					}
-				});
-			} else {
-				this.isEdit = false;
-				this.form.id = '';
-				getCode().then((res) => {
-					this.form.code = res.data;
-				});
-			}
-		},
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					if (this.isEdit) {
-						//编辑
-						updateGroupTeam({ ...this.form }).then((res) => {
-							if (res.code === 0) {
-								this.$modal.msgSuccess('操作成功');
-								this.$emit('successSubmit');
-							}
-						});
-					} else {
-						createGroupTeam({ ...this.form }).then((res) => {
-							if (res.code === 0) {
-								this.$modal.msgSuccess('操作成功');
-								this.$emit('successSubmit');
-							}
-						});
-					}
-				} else {
-					return false;
-				}
-			});
-		},
-		formClear() {
-			this.$refs.form.resetFields();
-			this.isEdit = false;
-		},
-	},
-};
-</script>
diff --git a/src/views/group/base/groupTeam/components/statusBtn.vue b/src/views/group/base/groupTeam/components/statusBtn.vue
deleted file mode 100644
index c1b67a12..00000000
--- a/src/views/group/base/groupTeam/components/statusBtn.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-01 14:53:55
- * @LastEditors: zwq
- * @LastEditTime: 2024-07-10 10:00:03
- * @Description:
--->
-<template>
-  <el-switch v-model="state" type="text" size="small" :disabled="readonly" @change="changeHandler" />
-</template>
-
-<script>
-export default {
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      state: false
-    }
-  },
-  computed: {
-    readonly() {
-      return !!this.injectData.readonly
-    }
-  },
-  mounted() {
-    this.mapToState()
-  },
-  methods: {
-    mapToState() {
-      if (this.injectData.prop === 'enabled') {
-        this.state = this.injectData.enabled === 1 ? true : false
-      }
-    },
-    changeHandler() {
-      let params = {}
-      let payload = {}
-      params.name = 'state'
-      payload.id = this.injectData.id
-      payload.enabled = this.state ? '1' : '0'
-      payload.code = this.injectData.code
-      payload.name = this.injectData.name
-      payload.factoryId = this.injectData.factoryId
-      payload.leaderName = this.injectData.leaderName
-      params.payload = payload
-      this.$emit('emitData', params)
-    }
-  }
-}
-</script>
diff --git a/src/views/group/base/groupTeam/components/workerEdit.vue b/src/views/group/base/groupTeam/components/workerEdit.vue
deleted file mode 100644
index 89eb92df..00000000
--- a/src/views/group/base/groupTeam/components/workerEdit.vue
+++ /dev/null
@@ -1,305 +0,0 @@
-<template>
-  <div>
-    <el-drawer :title="title" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'>
-      <div class="box">
-        <el-row class="topBox">
-          <el-col :span="6">
-            <p class="boldTitle">班组名称</p>
-            <p class="lightText">{{ teamData.teamName }}</p>
-          </el-col>
-          <el-col :span="6">
-            <p class="boldTitle">班组长</p>
-            <p class="lightText">{{ teamData.leaderName }}</p>
-          </el-col>
-          <el-col :span="6">
-            <p class="boldTitle">班组人数</p>
-            <p class="lightText">{{ teamData.teamNum }}</p>
-          </el-col>
-          <el-col :span="6">
-            <p class="boldTitle">手机号</p>
-            <p class="lightText">{{ teamData.leaderTelephone }}</p>
-          </el-col>
-        </el-row>
-        <div class="bottomBox">
-          <!-- 搜索工作栏 -->
-          <search-bar
-            v-if="visible"
-            :formConfigs="formConfig"
-            @headBtnClick="buttonClick"
-          />
-          <base-table
-            :page="queryParams.pageNo"
-            :limit="queryParams.pageSize"
-            :table-props="tableProps"
-            :table-data="tableData"
-          >
-            <method-btn
-              v-if="tableBtn.length"
-              slot="handleBtn"
-              :width="100"
-              label="操作"
-              :method-list="tableBtn"
-              @clickBtn="handleClick"
-            />
-          </base-table>
-          <pagination
-            :page.sync="queryParams.pageNo"
-            :limit.sync="queryParams.pageSize"
-            :total="total"
-            @pagination="getList"
-          />
-        </div>
-      </div>
-    </el-drawer>
-    <!-- 新增编辑组员 -->
-    <base-dialog
-      :dialogTitle="addOrEditTitle"
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-      width='40%'
-    >
-      <worker-team-add ref="workerTeamAdd" @successSubmit="successSubmit" />
-    </base-dialog>
-  </div>
-</template>
-<script>
-const tableProps = [
-  {
-    prop: 'workerName',
-    label: '人员姓名'
-  },
-  {
-    prop: 'workerMajorName',
-    label: '专业'
-  },
-  {
-    prop: 'workerTelephone',
-    label: '手机'
-  },
-  {
-    prop: 'remark',
-    label: '备注'
-  }
-]
-import { groupTeamPage, teamDetDelete } from '@/api/base/groupTeam'
-import { getWorker } from '@/api/base/worker'
-import WorkerTeamAdd from './workerTeamAdd.vue'
-export default {
-  name: 'WorkerEdit',
-  data() {
-    return {
-      visible: false,
-      title: '',
-      formConfig: [],
-      teamData: {
-        teamName: '',
-        leaderName: '',
-        teamNum: '',
-        leaderTelephone: '-',
-        teamId: ''
-      },
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20,
-        teamId: '',
-        workerName: ''
-      },
-      tableProps,
-      tableData: [],
-      tableBtn: [],
-      total: 0,
-      // 弹出层标题
-      addOrEditTitle: "",
-      // 是否显示弹出层
-      centervisible: false
-    }
-  },
-  components: { WorkerTeamAdd },
-  created() {
-  },
-  methods: {
-    init(val) {
-      this.visible = true
-      this.teamData.teamName = val.payload.name
-      this.teamData.leaderName = val.payload.leaderName
-      this.teamData.teamNum = val.payload.num
-      this.teamData.teamId = val.payload.teamId
-      this.queryParams.teamId = val.payload.id
-      getWorker({id:val.payload.leaderId}).then(res => {// 获取组长手机号
-        this.teamData.leaderTelephone = res.data.telephone || '-'
-      })
-      this.getList()
-      if (val.name === 'view') {
-        this.title = '查看组员'
-        this.tableBtn = []
-        this.formConfig = [
-          {
-            type: 'input',
-            label: '关键字',
-            placeholder: '姓名',
-            param: 'workerName'
-          },
-          {
-            type: 'button',
-            btnName: '查询',
-            name: 'search',
-            color: 'primary'
-          }
-        ]
-      }else{
-        this.title = '编辑组员'
-        this.tableBtn = [
-            {
-              type: 'edit',
-              btnName: '编辑'
-            },
-            {
-              type: 'delete',
-              btnName: '删除'
-            }
-          ]
-        this.formConfig = [
-          {
-            type: 'input',
-            label: '关键字',
-            placeholder: '姓名',
-            param: 'workerName'
-          },
-          {
-            type: 'button',
-            btnName: '查询',
-            name: 'search',
-            color: 'primary'
-          },
-          {
-            type: 'separate'
-          },
-          {
-            type: 'button',
-            btnName: '新增',
-            name: 'add',
-            color: 'success',
-            plain: true
-          }
-        ]
-      }
-    },
-    getList() {
-      groupTeamPage({ ...this.queryParams }).then(res => {
-				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
-          let arr = []
-          res.data.list.map(item => {
-            let obj = {}
-            obj.workerName = item.worker.name
-            obj.workerMajorName = item.worker.majorName
-            obj.workerTelephone = item.worker.telephone
-            obj.remark = item.remark
-            obj.id = item.id
-            arr.push(obj)
-          })
-          this.tableData = arr
-          this.total = res.data.total
-        } else {
-          this.tableData = []
-          this.total = 0
-        }
-      })
-    },
-    buttonClick(val) {
-      console.log(val)
-      if (val.btnName === 'search') {
-        this.queryParams.workerName = val.workerName
-        this.queryParams.pageNo = 1
-        this.getList()
-      }else if (val.btnName === 'add') {
-       this.addNew()
-      }
-    },
-    // 新增
-    addNew() {
-      this.addOrEditTitle = '新增'
-      this.centervisible = true
-      this.$nextTick(() => {
-        this.$refs.workerTeamAdd.init({'teamId': this.queryParams.teamId, id: ''})
-      })
-    },
-    handleCancel() {
-      this.$refs.workerTeamAdd.formClear()
-      this.centervisible = false
-      this.addOrEditTitle = ''
-    },
-    handleConfirm() {
-      this.$refs.workerTeamAdd.submitForm()
-    },
-    successSubmit() {
-      this.handleCancel()
-      this.getList()
-    },
-    handleClick(val) {
-      console.log(val)
-      switch (val.type) {
-        case 'edit':
-          this.addOrEditTitle = '编辑'
-          this.centervisible = true
-          this.$nextTick(() => {
-            this.$refs.workerTeamAdd.init({'teamId': this.queryParams.teamId, 'id': val.data.id, 'workName':val.data.workerName, 'majorName':val.data.workerMajorName})
-          })
-          break
-        default:
-          this.handleDelete(val.data)
-      }
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      console.log(row)
-      this.$modal.confirm('是否确认删除人员"' + row.workerName + '"的数据项?').then(function() {
-          return teamDetDelete({id: row.id});
-        }).then(() => {
-          this.queryParams.pageNo = 1;
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    closeD() {
-      this.teamData.teamName = ''
-      this.teamData.leaderName = ''
-      this.teamData.teamNum = ''
-      this.teamData.leaderTelephone = ''
-      this.teamData.teamId = ''
-      this.queryParams.pageNo = 1
-      this.queryParams.pageSize = 20
-      this.queryParams.teamId = ''
-      this.queryParams.workerName = ''
-      this.total = 0
-      this.$emit('closeDrawer')
-    }
-  }
-}
-</script>
-<style lang='scss' scoped>
-.box {
-  padding:0 30px;
-  .topBox {
-    padding-bottom: 30px;
-    border-bottom: 1px solid #E9E9E9;
-    .boldTitle {
-      font-size: 14px;
-      font-weight: 600;
-      color: rgba(0,0,0,0.85);
-      margin: 0;
-      margin-bottom: 10px;
-    }
-    .lightText {
-      font-size: 14px;
-      font-weight: 400;
-      color: rgba(102,102,102,0.75);
-      margin: 0;
-    }
-  }
-  .bottomBox {
-    padding-top: 30px;
-  }
-}
-</style>
diff --git a/src/views/group/base/groupTeam/components/workerOperate.vue b/src/views/group/base/groupTeam/components/workerOperate.vue
deleted file mode 100644
index 956bf89f..00000000
--- a/src/views/group/base/groupTeam/components/workerOperate.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div class="workerOperate">
-    <div class="operateBtn">
-      <span class="view" v-if="this.$auth.hasPermi('base:group-team:view-worker')" @click="emitParams('view')">查看</span>
-      <span class="edit" v-if="this.$auth.hasPermi('base:group-team:edit-worker')" @click="emitParams('edit')">编辑</span>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  name: 'WorkerOperate',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  methods: {
-    emitParams(data) {
-      let params = {}
-      params.name = data
-      params.payload = this.injectData
-      this.$emit('emitData', params)
-    }
-  }
-}
-</script>
-<style lang='scss' scoped>
-.workerOperate {
-  .operateBtn{
-    color: #0B58FF;
-    .view {
-      margin-right: 10px;
-      cursor: pointer;
-    }
-    .edit {
-      cursor: pointer;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/group/base/groupTeam/components/workerTeamAdd.vue b/src/views/group/base/groupTeam/components/workerTeamAdd.vue
deleted file mode 100644
index 608dbb19..00000000
--- a/src/views/group/base/groupTeam/components/workerTeamAdd.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
-    <el-form-item label="员工" prop="workerId" v-if='!isEdit'>
-      <el-select v-model="form.workerId" placeholder="请选择" filterable style="width: 100%;" @change="selectWorker()">
-        <el-option
-          v-for="item in workerList"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id">
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="员工" prop="workerId" v-if='isEdit'>
-      <el-input v-model="workName" disabled></el-input>
-    </el-form-item>
-    <el-form-item label="专业" prop="majorName">
-      <el-input v-model="form.majorName" disabled></el-input>
-    </el-form-item>
-    <el-form-item label="备注" prop="remark">
-      <el-input v-model="form.remark"></el-input>
-    </el-form-item>
-  </el-form>
-</template>
-<script>
-import { otherWorkerList } from '@/api/base/worker'
-import { teamDetCreate, teamDetUpdate, groupTeamDet } from '@/api/base/groupTeam'
-export default {
-  name: 'WorkerTeamAdd',
-  data() {
-    return {
-      workerList: [],
-      form: {
-        teamId: '',
-        workerId: '',
-        remark: '',
-        majorName: '',
-        id: ''
-      },
-      isEdit: false,
-      workName: '',//编辑时用
-      rules: {
-        workerId: [{ required: true, message: '员工不能为空', trigger: 'change' }]
-      }
-    }
-  },
-  methods: {
-    init(param) {
-      this.form.teamId = param.teamId
-      this.form.majorName = param.majorName
-      this.workName = param.workName
-      otherWorkerList({teamId:this.form.teamId}).then(res => {
-        this.workerList = res.data || []
-        if (param.id) {
-          this.isEdit = true
-          this.form.id = param.id
-          groupTeamDet({id: this.form.id}).then((res) => {
-            if (res.code === 0) {
-              this.form.workerId = res.data.workerId
-              this.form.remark = res.data.remark
-            }
-          })
-        } else {
-          this.isEdit = false
-          this.form.id = ''
-        }
-      })
-    },
-    selectWorker() {
-      if (this.form.workerId) {
-        this.workerList.map(item => {
-          if (item.id === this.form.workerId) {
-            this.form.majorName = item.majorName
-          }
-        })
-      }else{
-        this.form.majorName = ''
-      }
-    },
-    // 确定
-    submitForm() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          if (this.isEdit) {
-            // 编辑
-            teamDetUpdate({
-              teamId: this.form.teamId,
-              workerId: this.form.workerId,
-              remark: this.form.remark,
-              id: this.form.id
-            }).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          } else {
-            teamDetCreate({
-              teamId: this.form.teamId,
-              workerId: this.form.workerId,
-              remark: this.form.remark
-            }).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    formClear() {
-      this.$refs.form.resetFields()
-      this.workName = ''
-      this.form.majorName = ''
-      this.isEdit = false
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/group/base/groupTeam/index.vue b/src/views/group/base/groupTeam/index.vue
deleted file mode 100644
index f232bea1..00000000
--- a/src/views/group/base/groupTeam/index.vue
+++ /dev/null
@@ -1,264 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<!-- 列表 -->
-		<base-table
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-props="tableProps"
-			:table-data="list"
-			:max-height="tableH"
-			@emitFun="handleTableEvents">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-		<!-- 新增 -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="centervisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="40%">
-			<group-team-add ref="groupList" @successSubmit="successSubmit" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	getGroupTeamPage,
-	deleteGroupTeam,
-	updateGroupTeam,
-} from '@/api/base/groupTeam';
-import { parseTime } from '@/utils/ruoyi';
-import GroupTeamAdd from './components/groupTeamAdd';
-import StatusBtn from './components/statusBtn';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
-import { getFactoryPage } from '@/api/core/base/factory';
-
-const tableProps = [
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime,
-		minWidth: 160,
-	},
-	{
-		prop: 'factoryName',
-		label: '工厂',
-	},
-	{
-		prop: 'name',
-		label: '班组名称',
-	},
-	{
-		prop: 'code',
-		label: '编码',
-		minWidth: 220,
-	},
-	{
-		prop: 'num',
-		label: '班组人数',
-	},
-	{
-		prop: 'leaderName',
-		label: '组长',
-	},
-	{
-		prop: 'enabled',
-		label: '班组状态',
-		subcomponent: StatusBtn,
-	},
-];
-export default {
-	name: 'GroupTeam',
-	components: { GroupTeamAdd },
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'input',
-					label: '班组名称',
-					placeholder: '班组名称',
-					param: 'name',
-				},
-				{
-					type: 'input',
-					label: '组长',
-					placeholder: '组长',
-					param: 'leaderName',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-			],
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi('base:group-team:update')
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-team:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			// 总条数
-			total: 0,
-			// 班次基础信息列表
-			list: [],
-			// 弹出层标题
-			addOrEditTitle: '',
-			// 是否显示弹出层
-			centervisible: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				name: null,
-				code: null,
-			},
-		};
-	},
-	created() {
-		this.getList();
-		this.getPdLineList();
-	},
-	methods: {
-		getPdLineList() {
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.queryParams.pageNo = 1;
-					this.queryParams.leaderName = val.leaderName;
-					this.queryParams.factoryId = val.factoryId || undefined;
-					this.queryParams.name = val.name;
-					this.getList();
-					break;
-				default:
-					this.addOrEditTitle = '新增';
-					this.centervisible = true;
-					this.$nextTick(() => {
-						this.$refs.groupList.init();
-					});
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			getGroupTeamPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-			});
-		},
-		handleClick(val) {
-			switch (val.type) {
-				case 'edit':
-					this.addOrEditTitle = '编辑';
-					this.$nextTick(() => {
-						this.$refs.groupList.init(val.data.id);
-					});
-					this.centervisible = true;
-					break;
-				default:
-					this.handleDelete(val.data);
-			}
-		},
-		// 班组状态
-		handleTableEvents(params) {
-			if (params.name === 'state') {
-				// 班组状态
-				updateGroupTeam({ ...params.payload })
-					.then((res) => {
-						if (res.code === 0) {
-							this.$modal.msgSuccess('操作成功');
-							this.getList();
-						}
-					})
-					.catch((res) => {
-						this.getList();
-					});
-			}
-		},
-		handleCancel() {
-			this.$refs.groupList.formClear();
-			this.centervisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.$refs.groupList.submitForm();
-		},
-		successSubmit() {
-			this.handleCancel();
-			this.getList();
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-      this.$confirm(`是否确认删除 ${row.name} 的数据项?`, "系统提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-				.then(function () {
-					return deleteGroupTeam(row.id);
-				})
-				.then(() => {
-					this.queryParams.pageNo = 1;
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		closeDrawer() {
-			this.getList();
-		},
-	},
-};
-</script>
diff --git a/src/views/group/base/groupTeamScheduling/components/groupUpperLower.vue b/src/views/group/base/groupTeamScheduling/components/groupUpperLower.vue
deleted file mode 100644
index b7598d74..00000000
--- a/src/views/group/base/groupTeamScheduling/components/groupUpperLower.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-<template>
-  <div>
-    <el-drawer title="班组上下片" :visible.sync="visible" size="80%" @close='closeD'>
-      <div class="box">
-        <!-- 搜索工作栏 -->
-        <search-bar
-          :formConfigs="formConfig"
-          ref="searchBarForm"
-          @headBtnClick="buttonClick"
-        />
-        <!-- 列表 -->
-        <base-table
-          :page="queryParams.pageNo"
-          :limit="queryParams.pageSize"
-          :table-props="tableProps"
-          :table-data="list"
-          :max-height="tableH"
-        />
-        <pagination
-          :page.sync="queryParams.pageNo"
-          :limit.sync="queryParams.pageSize"
-          :total="total"
-          @pagination="getList"
-        />
-      </div>
-    </el-drawer>
-  </div>
-</template>
-<script>
-const tableProps = [
-  {
-    prop: 'name',
-    label: '产线名称'
-  },
-  {
-    prop: 'code',
-    label: '投入数量/片'
-  },
-  {
-    prop: 'code1',
-    label: '产出数量/片'
-  },
-  {
-    prop: 'num2',
-    label: '产出面积/㎡'
-  },
-  {
-    prop: 'num3',
-    label: '损耗数量/片'
-  },
-  {
-    prop: 'num4',
-    label: '损耗面积/㎡'
-  },
-  {
-    prop: 'num5',
-    label: '损耗比例/%'
-  }
-]
-export default {
-  name: 'GroupUpperLower',
-  data() {
-    return {
-      visible: false,
-      formConfig: [
-        {
-          type: 'select',
-          label: '产线',
-          selectOptions: [],
-          param: 'xb2',
-          width: 120,
-          defaultSelect: 2 // 默认值
-        },
-        {
-          type: 'datePicker',
-          label: '时间范围',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd',
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'searchTime2'
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: 'separate'
-        },
-        {
-          type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',
-          btnName: '导出',
-          name: 'export',
-          color: 'success',
-          plain: true
-        }
-      ],
-      tableProps,
-      list: [],
-      tableH: this.tableHeight(260),
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20
-      },
-      total: 0
-    }
-  },
-  methods: {
-    init() {
-      window.addEventListener('resize', () => {
-        this.tableH = this.tableHeight(260)
-      })
-      this.visible = true
-    },
-    getList() {},
-    buttonClick(val) {
-      switch (val.btnName) {
-        case 'search':
-          this.queryParams.pageNo = 1
-          this.queryParams.name = val.name
-          this.queryParams.code = val.code
-          this.getList()
-          break
-        default:
-          this.addOrEditTitle = '新增'
-          this.centervisible = true
-          this.$nextTick(() => {
-            this.$refs.groupList.init()
-          })
-      }
-    },
-    closeD() {
-      // this.$emit('closeDrawer')
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.box {
-  padding: 0 32px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/group/base/groupTeamScheduling/index.vue b/src/views/group/base/groupTeamScheduling/index.vue
deleted file mode 100644
index 49686fa8..00000000
--- a/src/views/group/base/groupTeamScheduling/index.vue
+++ /dev/null
@@ -1,550 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-01 14:54:06
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-26 15:12:16
- * @Description:
--->
-<template>
-	<div class="groupTeamScheduling">
-		<div class="operationArea">
-			<el-tabs v-model="planId" @tab-click="setPlan">
-				<el-tab-pane
-					v-for="item in planArr"
-					:key="item.id"
-					:label="item.name"
-					:name="item.id" />
-			</el-tabs>
-			<el-form :inline="true" class="demo-form-inline">
-				<span class="blue-block"></span>
-				<el-form-item label="月份选择">
-					<el-date-picker
-						v-model="startDay"
-						type="month"
-						placeholder="选择月"
-						size="small"
-						:disabled="showSetting"
-						@change="selectMonth"
-						:clearable="false"
-						style="width: 120px"></el-date-picker>
-				</el-form-item>
-				<el-form-item>
-					<span
-						class="separateStyle"
-						v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
-				</el-form-item>
-				<el-form-item>
-					<el-button
-						type="primary"
-						size="small"
-						v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"
-						:disabled="showSetting || settingBtnDis"
-						@click="settingMsg">
-						设置
-					</el-button>
-				</el-form-item>
-				<el-form-item>
-					<span class="separateStyle" v-show="showSetting"></span>
-				</el-form-item>
-				<el-form-item>
-					<el-button
-						type="primary"
-						size="small"
-						v-show="showSetting"
-						@click="confirmSetting">
-						确认
-					</el-button>
-				</el-form-item>
-				<el-form-item>
-					<el-button
-						type="primary"
-						size="small"
-						plain
-						v-show="showSetting"
-						@click="cancelSetting">
-						取消
-					</el-button>
-				</el-form-item>
-			</el-form>
-		</div>
-		<!-- 日历区域 -->
-		<div class="calenderArea">
-			<div style="font-size: 24px; font-weight: 500">
-				{{ this.month }} {{ this.year }}
-			</div>
-			<el-calendar v-model="startDay">
-				<!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
-				<template slot="dateCell" slot-scope="{ date, data }">
-					<div v-if="data.type === 'current-month'">
-						<!-- 日期 -->
-						<div class="dateStyle">
-							{{ Number(data.day.split('-')[2]) }}
-						</div>
-						<!-- 班次班组 -->
-						<!-- class有两个样式，一个是类似class1，还有个是选中红框显示 -->
-						<!-- <el-row
-							:gutter="2"
-							:class="
-								'class' +
-								(index + 1) +
-								(chooseTip === item.startDay + item.classesId
-									? ' team-active'
-									: '')
-							"
-							v-for="(item, index) in list[Number(data.day.split('-')[2])]"
-							:key="index"> -->
-						<el-row
-							:gutter="2"
-							:class="
-								'class' +
-								(index + 1)
-							"
-							v-for="(item, index) in list[Number(data.day.split('-')[2])]"
-							:key="index">
-							<el-col :span="12">
-								<div class="selectDiv">
-									<!-- 选择班组图标 -->
-									<div
-										class="toggle-icon"
-										v-show="
-											showSetting &&
-											(new Date(data.day).valueOf() < new Date().valueOf()
-												? false
-												: true)
-										">
-										<svg-icon icon-class="toggle" />
-									</div>
-									<!-- 不能选择班组 -->
-									<div
-										class="toggle-icon-hide"
-										v-show="
-											!(
-												showSetting &&
-												(new Date(data.day).valueOf() < new Date().valueOf()
-													? false
-													: true)
-											)
-										"></div>
-									<el-select
-										v-model="item.teamId"
-										size="small"
-										:disabled="
-											!showSetting ||
-											(new Date(data.day).valueOf() > new Date().valueOf()
-												? false
-												: true)
-										">
-										<el-option
-											v-for="i in teamList"
-											:key="i.id"
-											:label="i.name"
-											:value="i.id"></el-option>
-									</el-select>
-								</div>
-							</el-col>
-							<el-col :span="12">
-								<el-button class="labelClass" @click="chooseTeam(item)">
-									{{ item.classesName }}
-								</el-button>
-							</el-col>
-						</el-row>
-					</div>
-					<div v-else style='font-size: 20px;font-weight: 500;text-align: right;'>
-						{{ Number(data.day.split('-')[2]) }}
-					</div>
-				</template>
-			</el-calendar>
-		</div>
-	</div>
-</template>
-
-<script>
-import {
-	getScheduling,
-	createOrUpdateList,
-} from '@/api/base/groupTeamScheduling';
-import {
-	groupPlanList,
-	groupPlanTeamList,
-} from '@/api/base/groupSchedulingPlan';
-import { listEnabled } from '@/api/base/groupTeam';
-import moment from 'moment';
-
-export default {
-	name: 'GroupTeamScheduling',
-	data() {
-		return {
-			startDay: '', // 查询参数
-			year: '', // 2023
-			month: '', // 九月
-			monthList: [
-				'一月',
-				'二月',
-				'三月',
-				'四月',
-				'五月',
-				'六月',
-				'七月',
-				'八月',
-				'九月',
-				'十月',
-				'十一月',
-				'十二月',
-			],
-			planId: undefined, //计划id
-			list: {},
-			planArr: [], //排班计划数组
-			teamList: [], // 班组下拉
-			showSetting: false, // 设置模式。自动排班，确认，取消按钮显示
-			settingBtnDis: false,
-			jumpDisabled: true, // 操作按钮控制
-			chooseObj: {}, //当前选中的数据，查询按钮用
-			chooseTip: '', // 当前选中数据的唯一值，显示红框
-			autoScheduling: false, // 只有在当前日期后的月份才生效
-		};
-	},
-	created() {
-		this.startDay = new Date();
-		groupPlanList().then((res) => {
-			this.planArr = res.data || [];
-			this.planId = this.planArr[0] ? this.planArr[0].id : undefined;
-			if (this.planId) {
-				this.getList();
-				this.getTeamList();
-			}
-		});
-		// 设置按钮是否置灰
-		this.settingBtn();
-		this.toggleMonth();
-	},
-	methods: {
-		setPlan() {
-			this.getList();
-			this.getTeamList();
-		},
-		// 切换月份
-		selectMonth() {
-			if (this.startDay) {
-				this.settingBtn(); // 设置按钮状态,需在getlist前面
-				this.toggleMonth();
-				this.getList();
-				this.clearChoose();
-				if (
-					moment(this.startDay).valueOf() > moment().endOf('month').valueOf()
-				) {
-					this.autoScheduling = true;
-				} else {
-					this.autoScheduling = false;
-				}
-			}
-		},
-		// 获取计划对应班组列表
-		getTeamList() {
-			groupPlanTeamList(this.planId).then((res) => {
-				this.teamList = res.data || [];
-			});
-		},
-		// 获取日历数据
-		getList() {
-			let year = moment(this.startDay).format('YYYY');
-			let month = moment(this.startDay).format('M');
-			getScheduling({
-				year: year,
-				month: month,
-				planId: this.planId,
-			})
-				.then((res) => {
-					let obj = res.data || {};
-					if (obj) {
-						for (let item in obj) {
-							for (let i = 0; i < obj[item].length; i++) {
-								if (!obj[item][i].teamId) {
-									obj[item][i].teamId = '';
-								}
-							}
-						}
-					}
-					this.list = obj;
-				})
-				.catch(() => {
-					this.list = {};
-					this.settingBtnDis = true; // 禁用设置按钮
-				});
-		},
-		// 设置
-		settingMsg() {
-			this.showSetting = !this.showSetting;
-			this.clearChoose();
-		},
-		// 取消
-		cancelSetting() {
-			this.showSetting = !this.showSetting;
-			this.getList(); // 数据还原
-		},
-		// 确认
-		confirmSetting() {
-			let num = 0;
-			// 当月数据的话，今天及今天之前的不传
-			if (
-				moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')
-			) {
-				num = Number(moment().format('DD'));
-			} else {
-				num = 0;
-			}
-			// 下月数据全部都传
-			// 打平数据
-			let tempArr = Object.values(this.list);
-      console.log(tempArr)
-      console.log(num)
-			let arr = [];
-			for (let i = num; i < tempArr.length; i++) {
-				for (let j = 0; j < tempArr[i].length; j++) {
-					arr.push(tempArr[i][j]);
-				}
-			}
-			createOrUpdateList(arr).then((res) => {
-				if (res.code === 0) {
-					this.showSetting = !this.showSetting;
-					this.$modal.msgSuccess('操作成功');
-					this.getList(); // 数据更新
-				}
-			});
-		},
-		// 点击班次红框选中当前数据
-		chooseTeam(value) {
-			// if (this.showSetting) {
-			// 	this.$modal.msgWarning('当前处于设置模式');
-			// 	return false;
-			// }
-			this.chooseObj = value;
-			this.chooseTip = value.startDay + value.classesId; // 匹配当前的样式
-			this.jumpDisabled = false; //查询按钮不禁用
-		},
-		// 设置按钮如果是上个月或者今天是本月最后一天，设置按钮置灰
-		settingBtn() {
-			let nowMonth = moment().startOf('month').valueOf();
-			let startMonth = moment(this.startDay).valueOf();
-			let nowDate = moment(new Date()).date();
-			let sumDate = moment().daysInMonth();
-			if (nowMonth > startMonth) {
-				// 之前月
-				this.settingBtnDis = true;
-			} else {
-				if (nowDate < sumDate) {
-					this.settingBtnDis = false;
-				} else {
-					this.settingBtnDis = true;
-				}
-			}
-		},
-		// 清除红框选中数据
-		clearChoose() {
-			this.chooseObj = {};
-			this.chooseTip = '';
-			this.jumpDisabled = true;
-		},
-		// 切换月份显示
-		toggleMonth() {
-			this.year = moment(this.startDay).format('YYYY');
-			let month = Number(moment(this.startDay).format('MM'));
-			this.month = this.monthList[month - 1];
-		},
-	},
-};
-</script>
-<style lang="scss">
-.demo-form-inline {
-	.el-date-editor .el-range__icon {
-		font-size: 16px;
-		color: #0b58ff;
-	}
-	.el-input__prefix .el-icon-date {
-		font-size: 16px;
-		color: #0b58ff;
-	}
-}
-.groupTeamScheduling {
-	background-color: #f2f4f9;
-	.operationArea {
-		padding: 14px 10px 0 16px;
-		margin-bottom: 8px;
-		background-color: #fff;
-		border-radius: 8px;
-		.blue-block {
-			display: inline-block;
-			width: 4px;
-			height: 16px;
-			background-color: #0b58ff;
-			border-radius: 1px;
-			margin-right: 8px;
-			margin-top: 10px;
-		}
-		.separateStyle {
-			display: inline-block;
-			width: 1px;
-			height: 24px;
-			background: #e8e8e8;
-			vertical-align: middle;
-		}
-		.el-form-item {
-			margin-bottom: 10px;
-		}
-		.rightItem {
-			float: right;
-		}
-	}
-	// 日历
-	.calenderArea {
-		padding: 14px 10px 0 20px;
-		background-color: #fff;
-		border-radius: 8px;
-		.el-calendar__body {
-			padding: 10px 16px 16px 0;
-		}
-		.el-calendar__header {
-			display: none;
-		}
-		.el-calendar-table > thead {
-			height: 48px;
-			font-size: 20px;
-			font-weight: 500;
-			color: #000000;
-			background-color: rgba(242, 244, 249, 1);
-		}
-		.el-calendar-table__row {
-			height: 133px;
-			.prev,
-			.next {
-				pointer-events: none;
-			}
-			.el-calendar-day {
-				padding: 0 10px;
-				height: 100%;
-				.dateStyle {
-					font-size: 20px;
-					font-weight: 500;
-					color: #000000;
-					text-align: right;
-					height: 32px;
-					line-height: 28px;
-					padding-right: 10px;
-				}
-			}
-		}
-		.team-active {
-			// 选中班组
-			border: 2px solid #409eff;
-		}
-		.class1,
-		.class2,
-		.class3,
-		.class4  {
-			padding: 0;
-			font-weight: 600;
-			margin-bottom: 2px;
-			.selectDiv {
-				position: relative;
-				.toggle-icon {
-					position: absolute;
-					width: 26px;
-					height: 26px;
-					line-height: 26px;
-					font-size: 14px;
-					z-index: 1;
-					text-align: center;
-				}
-				.toggle-icon-hide {
-					position: absolute;
-					width: 2px;
-					height: 28px;
-					z-index: 1;
-				}
-				.el-input__suffix {
-					display: none;
-				}
-				.el-input--suffix .el-input__inner {
-					padding: 0 4px 0 28px;
-				}
-				.el-input--small .el-input__inner {
-					height: 28px;
-					border: none;
-					font-weight: 600;
-				}
-			}
-			.labelClass {
-				width: 100%;
-				height: 28px;
-				border: none;
-				padding: 0;
-				font-weight: 600;
-				text-align: center;
-			}
-		}
-		.class1 {
-			.selectDiv {
-				.toggle-icon,
-				.toggle-icon-hide {
-					background-color: #face00;
-				}
-				.el-input--small .el-input__inner {
-					color: #e7a200;
-					background-color: #ffefc0;
-				}
-			}
-			.labelClass {
-				color: #e7a200;
-				background-color: #ffefc0;
-			}
-		}
-		.class2 {
-			.selectDiv {
-				.toggle-icon,
-				.toggle-icon-hide {
-					background-color: #3984ff;
-				}
-				.el-input--small .el-input__inner {
-					color: #2d7bff;
-					background-color: #beeaff;
-				}
-			}
-			.labelClass {
-				color: #2d7bff;
-				background-color: #beeaff;
-			}
-		}
-		.class3 {
-			.selectDiv {
-				.toggle-icon,
-				.toggle-icon-hide {
-					background-color: #37d97f;
-				}
-				.el-input--small .el-input__inner {
-					color: #129f51;
-					background-color: #e0ffee;
-				}
-			}
-			.labelClass {
-				color: #129f51;
-				background-color: #e0ffee;
-			}
-		}
-		.class4 {
-			.selectDiv {
-				.toggle-icon,
-				.toggle-icon-hide {
-					background-color: #5c2fb1;
-				}
-				.el-input--small .el-input__inner {
-					color: #381689;
-					background-color: #e2a6eb;
-				}
-			}
-			.labelClass {
-				color: #381689;
-				background-color: #e2a6eb;
-			}
-		}
-	}
-}
-</style>
diff --git a/src/views/group/base/groupWorkLog/index.vue b/src/views/group/base/groupWorkLog/index.vue
deleted file mode 100644
index 27be2287..00000000
--- a/src/views/group/base/groupWorkLog/index.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-01-15 11:20:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-25 09:37:50
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<!-- 列表 -->
-		<base-table
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-props="tableProps"
-			:table-data="list"
-			:max-height="tableH">
-		</base-table>
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-	</div>
-</template>
-
-<script>
-import { parseTime } from '@/utils/ruoyi';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
-import { schedulingPage,exportSchedulingExcel } from '@/api/base/groupTeamScheduling';
-import { getFactoryPage } from '@/api/core/base/factory';
-import {
-	getGroupClassesPage,
-} from '@/api/base/groupClasses';
-import {
-	getGroupTeamPage,
-} from '@/api/base/groupTeam';
-import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
-
-const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂',
-	},
-	{
-		prop: 'startDay',
-		label: '上班日期',
-		filter: (val) => (val ? parseTime(val, '{y}-{m}-{d}') : '-'),
-	},
-	{
-		prop: 'startTime',
-		label: '上班时间',
-		filter: (val) => (val ? parseTime(val, '{h}:{i}') : '-'),
-		width: 100,
-	},
-	{
-		prop: 'endTime',
-		label: '下班时间',
-		filter: (val) => (val ? parseTime(val, '{h}:{i}') : '-'),
-		width: 100,
-	},
-	{
-		prop: 'classesName',
-		label: '班次名称',
-	},
-	{
-		prop: 'teamName',
-		label: '班组名称',
-	},
-];
-export default {
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '班次',
-					selectOptions: [],
-					param: 'classesId',
-				},
-				{
-					type: 'select',
-					label: '班组',
-					selectOptions: [],
-					param: 'teamId',
-				},
-				{
-					type: 'datePicker',
-					label: '上班日期',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'timeVal',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
-			],
-			tableProps,
-			// 总条数
-			total: 0,
-			// 班次基础信息列表
-			list: [],
-			// 弹出层标题
-			addOrEditTitle: '',
-			// 是否显示弹出层
-			centervisible: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-			},
-		};
-	},
-	created() {
-		this.getList();
-		this.getPdLineList();
-	},
-	methods: {
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = { ...this.queryParams };
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
-        this.exportLoading = true;
-        return exportSchedulingExcel(params);
-      }).then(response => {
-        this.$download.excel(response, '上班记录报表.xls');
-        this.exportLoading = false;
-      }).catch(() => { });
-    },
-		getPdLineList() {
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-      getGroupClassesPage(params).then((res) => {
-				this.formConfig[1].selectOptions = res.data.list || [];
-			});
-			getGroupTeamPage(params).then((res) => {
-				this.formConfig[2].selectOptions = res.data.list || [];
-			});
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.queryParams.pageNo = 1;
-					this.queryParams.factoryId = val.factoryId || undefined;
-					this.queryParams.classesId = val.classesId || undefined;
-					this.queryParams.teamName = val.teamId || undefined;
-					this.queryParams.startDay = val.timeVal
-						? val.timeVal
-						: undefined;
-					this.getList();
-					break;
-				case 'export':
-					this.queryParams.pageNo = 1;
-					this.queryParams.factoryId = val.factoryId || undefined;
-					this.queryParams.classesId = val.classesId || undefined;
-					this.queryParams.teamName = val.teamId || undefined;
-					this.queryParams.startDay = val.timeVal
-						? val.timeVal
-						: undefined;
-					this.handleExport();
-					break;
-				default:
-        console.log(val);
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			schedulingPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/group/base/schedulingPlanConfig/components/schedulingPlanConfigAdd.vue b/src/views/group/base/schedulingPlanConfig/components/schedulingPlanConfigAdd.vue
deleted file mode 100644
index dc7dc16e..00000000
--- a/src/views/group/base/schedulingPlanConfig/components/schedulingPlanConfigAdd.vue
+++ /dev/null
@@ -1,240 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-10 13:43:41
- * @LastEditors: zwq
- * @LastEditTime: 2025-01-14 11:06:24
- * @Description:
--->
-<template>
-	<el-form ref="form" :rules="rules" label-width="110px" :model="form">
-		<el-row>
-			<el-col :span="12">
-				<el-form-item label="工厂" prop="factoryId">
-					<el-select
-						v-model="form.factoryId"
-						filterable
-						clearable
-						style="width: 100%"
-						placeholder="请选择工厂">
-						<el-option
-							v-for="item in factoryArr"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="计划名称" prop="name">
-					<el-input v-model="form.name" clearable />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="相关班组" prop="teamIdList">
-					<el-select
-						v-model="form.teamIdList"
-						filterable
-						clearable
-						multiple
-						style="width: 100%"
-						placeholder="请选择班组">
-						<el-option
-							v-for="item in teamList"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="相关班次" prop="classesIdList">
-					<el-select
-						v-model="form.classesIdList"
-						filterable
-						clearable
-						multiple
-						style="width: 100%"
-						placeholder="请选择班次">
-						<el-option
-							v-for="item in classList"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input v-model="form.remark"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="false">
-				<el-form-item label="是否生产班组" prop="isProduction">
-					<el-radio-group v-model="form.isProduction">
-						<el-radio :label="true">是</el-radio>
-						<el-radio :label="false">否</el-radio>
-					</el-radio-group>
-				</el-form-item>
-			</el-col>
-			<el-col :span="24" v-show="form.isProduction">
-				<tree-transfer
-					:title="title"
-					:from_data="fromData"
-					:to_data="toData"
-					@add-btn="add"
-					@remove-btn="remove"
-					pid="productionLineId"
-					:defaultProps="{ label: 'name' }"
-					height="450px"
-					:mode="mode"
-					filter
-					openAll></tree-transfer>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-<script>
-import {
-	getGroupPlan,
-	updateGroupPlan,
-	createGroupPlan,
-	getGroupPlanTree,
-	createGroupPlanLine,
-	updateGroupPlanLine,
-	getGroupPlanLine,
-	getLoginUserDeptId,
-} from '@/api/base/groupSchedulingPlan';
-
-import { getFactoryPage } from '@/api/core/base/factory';
-import { listDept } from '@/api/system/dept';
-import { listEnabled } from '@/api/base/groupTeam';
-import { listClassesEnabled } from '@/api/base/groupClasses';
-import treeTransfer from 'el-tree-transfer';
-
-export default {
-	components: { treeTransfer },
-	name: '',
-	data() {
-		return {
-			form: {
-				id: '',
-				name: '',
-				factoryId: '',
-				teamIdList: [],
-				classesIdList: [],
-				remark: '',
-			},
-			factoryArr: [], //工厂
-			teamList: [], //班组
-			classList: [], //班次
-			rules: {
-				name: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
-				factoryId: [
-					{ required: true, message: '请选择工厂', trigger: 'change' },
-				],
-				teamIdList: [
-					{ required: true, message: '请选择相关班组', trigger: 'change' },
-				],
-				classesIdList: [
-					{ required: true, message: '请选择相关班次', trigger: 'change' },
-				],
-			},
-			title: ['待选', '已选'], //标题 类型：Array 必填：false 默认：["源列表", "目标列表"]
-			mode: 'transfer',
-			fromData: [], //左边内容
-			toData: [], //右边已选内容
-		};
-	},
-	methods: {
-		init(id) {
-			this.form.id = id || undefined;
-			this.fromData = [];
-			this.toData = [];
-			this.getArr();
-			this.$nextTick(() => {
-				this.$refs['form'].resetFields();
-				if (this.form.id) {
-					getGroupPlan(id).then((response) => {
-						this.form = response.data;
-					});
-				}
-			});
-		},
-		getArr() {
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.factoryArr = res.data.list || [];
-			});
-			listEnabled().then((res) => {
-				this.teamList = res.data || [];
-			});
-			listClassesEnabled().then((res) => {
-				this.classList = res.data || [];
-			});
-			getGroupPlanTree().then((res) => {
-				this.fromData = res.data;
-				this.fromData.forEach((item) => {
-					item.productionLineId = 0;
-				});
-			});
-		},
-		// 监听穿梭框组件添加
-		add(fromData, toData, obj) {
-			console.log('fromData:', fromData);
-			console.log('toData:', toData);
-		},
-		// 监听穿梭框组件移除
-		remove(fromData, toData, obj) {
-			console.log('fromData:', fromData);
-			console.log('toData:', toData);
-		},
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					if (this.form.id) {
-						//编辑
-						updateGroupPlan({ ...this.form }).then((res) => {
-							if (res.code === 0) {
-								this.$modal.msgSuccess('操作成功');
-								this.$emit('successSubmit');
-							}
-						});
-					} else {
-						createGroupPlan({ ...this.form }).then((res) => {
-							if (res.code === 0) {
-								this.$modal.msgSuccess('操作成功');
-								this.$emit('successSubmit');
-							}
-						});
-					}
-				} else {
-					return false;
-				}
-			});
-		},
-		formClear() {
-			this.$refs.form.resetFields();
-		},
-
-		/** 消除组件左边与右边选中数据相同项 */
-		// 处理过滤数据
-		getFilterLeftData(data, selData) {
-			for (let i = data.length - 1; i >= 0; i--) {
-				for (let j = selData.length - 1; j >= 0; j--) {
-					if (data[i] && data[i].id === selData[j].id) {
-						// 当id相等可以删除的情况 即：没有子级可以删除；
-						if (!data[i].children) {
-							data.splice(i, 1);
-						} else {
-							this.getFilterLeftData(data[i].children, selData[j].children);
-						}
-					}
-				}
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/group/base/schedulingPlanConfig/index.vue b/src/views/group/base/schedulingPlanConfig/index.vue
deleted file mode 100644
index 33267b1e..00000000
--- a/src/views/group/base/schedulingPlanConfig/index.vue
+++ /dev/null
@@ -1,230 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-10 11:08:48
- * @LastEditors: zwq
- * @LastEditTime: 2025-01-14 13:28:40
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<!-- 列表 -->
-		<base-table
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-props="tableProps"
-			:table-data="list"
-			:max-height="tableH">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-		<!-- 新增 -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="centervisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<schedulingPlanConfigAdd ref="classList" @successSubmit="successSubmit" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	getGroupPlanPage,
-	deleteGroupPlan,
-} from '@/api/base/groupSchedulingPlan';
-import schedulingPlanConfigAdd from './components/schedulingPlanConfigAdd.vue';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
-import { getFactoryPage } from '@/api/core/base/factory';
-const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂',
-	},
-	{
-		prop: 'name',
-		label: '计划名称',
-	},
-	{
-		prop: 'teamName',
-		label: '班组名称',
-	},
-	{
-		prop: 'classesName',
-		label: '班次名称',
-	},
-];
-export default {
-	name: 'schedulingPlanConfig',
-	components: { schedulingPlanConfigAdd },
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'input',
-					label: '计划名称',
-					placeholder: '计划名称',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:group-scheduling-plan:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-			],
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi('base:group-scheduling-plan:update')
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-scheduling-plan:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			// 总条数
-			total: 0,
-			// 列表
-			list: [],
-			// 弹出层标题
-			addOrEditTitle: '',
-			// 是否显示弹出层
-			centervisible: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				name: null,
-			},
-		};
-	},
-	created() {
-		this.getList();
-		this.getPdLineList();
-	},
-	methods: {
-		getPdLineList() {
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.queryParams.pageNo = 1;
-					this.queryParams.name = val.name || undefined;
-					this.queryParams.factoryId = val.factoryId || undefined;
-					this.getList();
-					break;
-				default:
-					this.addOrEditTitle = '新增';
-					this.centervisible = true;
-					this.$nextTick(() => {
-						this.$refs.classList.init();
-					});
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			getGroupPlanPage(this.queryParams).then((res) => {
-				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
-					this.list = res.data.list;
-					this.total = res.data.total;
-				} else {
-					this.list = [];
-					this.total = 0;
-				}
-			});
-		},
-		handleClick(val) {
-			switch (val.type) {
-				case 'edit':
-					this.addOrEditTitle = '编辑';
-					this.$nextTick(() => {
-						this.$refs.classList.init(val.data.id);
-					});
-					this.centervisible = true;
-					break;
-				default:
-					this.handleDelete(val.data);
-			}
-		},
-		handleCancel() {
-			this.$refs.classList.formClear();
-			this.centervisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.$refs.classList.submitForm();
-		},
-		successSubmit() {
-			this.handleCancel();
-			this.getList();
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			let _this = this;
-      this.$confirm(`是否确认删除 ${row.name} 的数据项?`, "系统提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-				.then(function () {
-					return deleteGroupPlan(row.id);
-				})
-				.then(() => {
-					_this.getList();
-					_this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/group/base/schedulingRuleConfig/components/schedulingRuleConfigAdd.vue b/src/views/group/base/schedulingRuleConfig/components/schedulingRuleConfigAdd.vue
deleted file mode 100644
index 622c32e7..00000000
--- a/src/views/group/base/schedulingRuleConfig/components/schedulingRuleConfigAdd.vue
+++ /dev/null
@@ -1,340 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-11 09:30:21
- * @LastEditors: zwq
- * @LastEditTime: 2025-01-14 15:35:03
- * @Description:
--->
-<template>
-	<el-form ref="form" :rules="rules" label-width="110px" :model="form">
-		<el-row>
-			<el-col :span="12">
-				<el-form-item label="工厂" prop="factoryId">
-					<el-select
-						v-model="form.factoryId"
-						filterable
-						clearable
-						style="width: 100%"
-						placeholder="请选择工厂">
-						<el-option
-							v-for="item in factoryArr"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="排班开始日期" prop="startDay">
-					<el-date-picker
-						v-model="form.startDay"
-						type="datetime"
-						placeholder="选择日期时间"
-						label-format="yyyy-MM-dd HH:mm:ss"
-						value-format="timestamp"
-						style="width: 100%"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="排班结束日期" prop="endDay">
-					<el-date-picker
-						v-model="form.endDay"
-						type="datetime"
-						placeholder="选择日期时间"
-						label-format="yyyy-MM-dd HH:mm:ss"
-						value-format="timestamp"
-						style="width: 100%"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="排班计划" prop="planId">
-					<el-select
-						v-model="form.planId"
-						filterable
-						clearable
-						@change="setTableArr"
-						style="width: 100%"
-						placeholder="请选择排班计划">
-						<el-option
-							v-for="item in planArr"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="24">
-				<div class="min-title">班组上班顺序</div>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item prop="groupTeamNum">
-					<el-input-number
-						v-model="form.groupTeamNum"
-						:step="1"
-						:min="1"
-						step-strictly></el-input-number>
-					班
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-select
-					v-model="teamList"
-					clearable
-					style="width: 100%; display: inline-block; margin-bottom: 28px"
-					@change="teamRuleMore"
-					@visible-change="teamRuleLess"
-					multiple
-					placeholder="请选择班组">
-					<el-option
-						v-for="item in teamArr"
-						:key="item.id"
-						:label="item.name"
-						:value="item.id">
-						<span slot="default" style="width: 100%">
-							{{ item.name }}
-							<span v-if="teamList.includes(item.id)" style="float: right">
-								{{ teamList.findIndex((v) => v === item.id) + 1 }}
-							</span>
-						</span>
-					</el-option>
-				</el-select>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item prop="groupClassesNum">
-					<el-input-number
-						v-model="form.groupClassesNum"
-						:step="1"
-						:min="1"
-						step-strictly></el-input-number>
-					倒
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-select
-					v-model="classesList"
-					clearable
-					style="width: 100%; display: inline-block; margin-bottom: 28px"
-					@change="classesRuleMore"
-					@visible-change="classesRuleLess"
-					multiple
-					placeholder="请选择班次">
-					<el-option
-						v-for="item in classesArr"
-						:key="item.id"
-						:label="item.name"
-						:value="item.id">
-						<span slot="default" style="width: 100%">
-							{{ item.name }}
-							<span v-if="classesList.includes(item.id)" style="float: right">
-								{{ classesList.findIndex((v) => v === item.id) + 1 }}
-							</span>
-						</span>
-					</el-option>
-				</el-select>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input v-model="form.remark"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-<script>
-import {
-	getGroupRule,
-	updateGroupRule,
-	createGroupRule,
-} from '@/api/base/groupSchedulingRule';
-import {
-	groupPlanList,
-	groupPlanTeamList,
-	groupPlanClassesList,
-} from '@/api/base/groupSchedulingPlan';
-import { getFactoryPage } from '@/api/core/base/factory';
-import tableSelect from './tableSelect';
-
-export default {
-	name: 'schedulingRuleConfigAdd',
-	data() {
-		return {
-			form: {
-				id: '',
-				factoryId: '',
-				startDay: '',
-				endDay: '',
-				planId: '',
-				groupTeamNum: 1,
-				groupClassesNum: 1,
-        groupClassesList: [],
-        groupTeamList: [],
-				remark: '',
-			},
-			factoryArr: [], //工厂
-			planArr: [], //排班计划数组
-			classesArr: [],
-			teamArr: [],
-			classesList: [],
-			teamList: [],
-			rules: {
-				factoryId: [
-					{ required: true, message: '请选择工厂', trigger: 'change' },
-				],
-				startDay: [
-					{ required: true, message: '请选择排班开始时间', trigger: 'change' },
-				],
-				endDay: [
-					{ required: true, message: '请选择排班结束时间', trigger: 'change' },
-				],
-				planId: [
-					{ required: true, message: '请选择排班计划', trigger: 'change' },
-				],
-			},
-		};
-	},
-	methods: {
-		init(id) {
-			this.form = {
-				id: id || undefined,
-				factoryId: '',
-				startDay: '',
-				endDay: '',
-				planId: '',
-        groupClassesList: [],
-        groupTeamList: [],
-				remark: '',
-			};
-
-			this.classesList = [];
-			this.teamList = [];
-			this.getArr();
-			this.$nextTick(() => {
-				this.$refs['form'].resetFields();
-				if (this.form.id) {
-					getGroupRule(id).then((response) => {
-						this.form = response.data;
-            response.data.teamSequenceList.forEach(item=>{
-              this.teamList.push(item.teamId)
-            })
-            response.data.classesSequenceList.forEach(item=>{
-              this.classesList.push(item.classesId)
-            })
-            this.form.groupTeamNum = response.data.teamSequenceList.length
-            this.form.groupClassesNum = response.data.classesSequenceList.length
-						this.getTableArr(response.data.planId);
-					});
-				}
-			});
-		},
-		getArr() {
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.factoryArr = res.data.list || [];
-			});
-			groupPlanList().then((res) => {
-				this.planArr = res.data || [];
-			});
-		},
-		setTableArr() {
-			if (this.form.planId) {
-				this.getTableArr(this.form.planId);
-			}
-		},
-		async getTableArr(id) {
-			//获取下拉框
-			const res0 = await groupPlanClassesList(id);
-			this.classesArr = res0.data || [];
-			const res1 = await groupPlanTeamList(id);
-			this.teamArr = res1.data || [];
-		},
-		teamRuleMore() {
-			if (this.teamList.length > this.form.groupTeamNum) {
-				this.$message('选择班组数 超过 排班数');
-			}
-		},
-		teamRuleLess(val) {
-			if (val === false) {
-				if (this.teamList.length < this.form.groupTeamNum) {
-					this.$message('选择班组数 小于 排班数');
-				}
-			}
-		},
-		classesRuleMore() {
-			if (this.classesList.length > this.form.groupClassesNum) {
-				this.$message('选择班次数 超过 倒班数');
-			}
-		},
-		classesRuleLess(val) {
-			if (val === false) {
-				if (this.classesList.length < this.form.groupClassesNum) {
-					this.$message('选择班组数 小于 倒班数');
-				}
-			}
-		},
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					if (this.teamList.length > this.form.groupTeamNum) {
-						this.$message('选择班组数 超过 排班数');
-            return
-					} else if (this.teamList.length < this.form.groupTeamNum) {
-						this.$message('选择班组数 小于 排班数');
-            return
-					}
-					if (this.classesList.length > this.form.groupClassesNum) {
-						this.$message('选择班次数 超过 倒班数');
-            return
-					} else if (this.classesList.length < this.form.groupClassesNum) {
-						this.$message('选择班组数 小于 倒班数');
-            return
-					}
-          this.form.groupTeamList = []
-          this.teamList.forEach((item,index)=>{
-            this.form.groupTeamList.push({
-              teamId: item,
-              sequence:index+1
-            })
-          })
-          this.form.groupClassesList = []
-          this.classesList.forEach((item,index)=>{
-            this.form.groupClassesList.push({
-              classesId: item,
-              sequence:index+1
-            })
-          })
-					if (this.form.id) {
-						//编辑
-						updateGroupRule({ ...this.form }).then((res) => {
-							this.$modal.msgSuccess('操作成功');
-							this.$emit('successSubmit');
-						});
-					} else {
-						createGroupRule({ ...this.form }).then((res) => {
-							this.$modal.msgSuccess('操作成功');
-							this.$emit('successSubmit');
-						});
-					}
-				} else {
-					return false;
-				}
-			});
-		},
-		formClear() {
-			this.$refs.form.resetFields();
-		},
-	},
-};
-</script>
-<style scoped>
-.min-title {
-	margin-bottom: 5px;
-}
-.min-title::before {
-	content: '*';
-	color: #ff5454;
-	margin-right: 4px;
-}
-</style>
diff --git a/src/views/group/base/schedulingRuleConfig/components/tableSelect.vue b/src/views/group/base/schedulingRuleConfig/components/tableSelect.vue
deleted file mode 100644
index 46315e55..00000000
--- a/src/views/group/base/schedulingRuleConfig/components/tableSelect.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-	<div class="tableInner">
-		<el-select :key="itemProp+list._pageIndex" v-model="list[itemProp]" @change="changeInput">
-			<el-option
-				v-for="item in itemProp==='classesId'?list.classesArr:list.teamArr"
-				:key="item.id"
-				:label="item.name"
-				:value="item.id"></el-option>
-		</el-select>
-	</div>
-</template>
-<script>
-export default {
-	name: 'tableSelect',
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-		itemProp: {
-			type: String,
-		},
-	},
-	data() {
-		return {
-			list: this.injectData,
-		};
-	},
-	methods: {
-		changeInput() {
-			this.$emit('emitData', this.list);
-		},
-	},
-};
-</script>
-<style scoped>
-.tableInner >>> .el-input__inner {
-  color: #409EFF;
-  border: 1px rgb(232, 231, 231) solid;
-  padding: 0;
-  text-align: center;
-  height: 30px;
-}
-</style>
diff --git a/src/views/group/base/schedulingRuleConfig/index.vue b/src/views/group/base/schedulingRuleConfig/index.vue
deleted file mode 100644
index bfe2ed38..00000000
--- a/src/views/group/base/schedulingRuleConfig/index.vue
+++ /dev/null
@@ -1,284 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<!-- 列表 -->
-		<base-table
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-props="tableProps"
-			:table-data="list"
-			:max-height="tableH">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-		<!-- 新增 -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="centervisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<schedulingRuleConfigAdd ref="classList" @successSubmit="successSubmit" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	getGroupRulePage,
-	deleteGroupRule,
-	updateGroupRule,
-	getGroupRule,
-	disableGroupRule
-} from '@/api/base/groupSchedulingRule';
-import schedulingRuleConfigAdd from './components/schedulingRuleConfigAdd.vue';
-import { formatDate } from '@/utils';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
-import { getFactoryPage } from '@/api/core/base/factory';
-const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂',
-	},
-	{
-		prop: 'enableTimeStr',
-		label: '排班日期',
-		minWidth: 200,
-	},
-	{
-		prop: 'planName',
-		label: '排班计划',
-	},
-	{
-		prop: 'str',
-		label: '排班规则',
-		minWidth: 100,
-	},
-	{
-		prop: 'enabled',
-		label: '状态',
-		filter: (val) => (val ? '正常' : '作废'),
-	},
-];
-export default {
-	name: 'schedulingRuleConfig',
-	components: { schedulingRuleConfigAdd },
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'input',
-					label: '班次',
-					placeholder: '班次',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:group-scheduling-rule:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-			],
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi('base:group-scheduling-rule:cancel')
-					? {
-							type: 'cancel',
-							btnName: '作废',
-							showParam: {
-								type: '&',
-								data: [
-									{
-										type: 'unequal',
-										name: 'enabled',
-										value: 0,
-									},
-								],
-							},
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-scheduling-rule:update')
-					? {
-							type: 'edit',
-							btnName: '编辑',
-							showParam: {
-								type: '&',
-								data: [
-									{
-										type: 'unequal',
-										name: 'enabled',
-										value: 0,
-									},
-								],
-							},
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-scheduling-rule:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			// 总条数
-			total: 0,
-			// 班次基础信息列表
-			list: [],
-			// 弹出层标题
-			addOrEditTitle: '',
-			// 是否显示弹出层
-			centervisible: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				name: null,
-			},
-		};
-	},
-	created() {
-		this.getList();
-		this.getPdLineList();
-	},
-	methods: {
-		getPdLineList() {
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.queryParams.pageNo = 1;
-					this.queryParams.classesName = val.name || undefined;
-					this.queryParams.factoryId = val.factoryId || undefined;
-					this.getList();
-					break;
-				default:
-					this.addOrEditTitle = '新增';
-					this.centervisible = true;
-					this.$nextTick(() => {
-						this.$refs.classList.init();
-					});
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			getGroupRulePage(this.queryParams).then((res) => {
-				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
-					res.data.list.map((item) => {
-						item.enableTimeStr =
-							formatDate(item.startDay) +
-							'至' +
-							(item.endDay ? formatDate(item.endDay) : '永久');
-						item.str = item.strList.join(',');
-					});
-					this.list = res.data.list;
-					this.total = res.data.total;
-				} else {
-					this.list = [];
-					this.total = 0;
-				}
-			});
-		},
-		handleClick(val) {
-			switch (val.type) {
-				case 'edit':
-					this.addOrEditTitle = '编辑';
-					this.$nextTick(() => {
-						this.$refs.classList.init(val.data.id);
-					});
-					this.centervisible = true;
-					break;
-				case 'cancel':
-					this.discard(val.data);
-					break;
-				default:
-					this.handleDelete(val.data);
-			}
-		},
-		handleCancel() {
-			this.$refs.classList.formClear();
-			this.centervisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.$refs.classList.submitForm();
-		},
-		successSubmit() {
-			this.handleCancel();
-			this.getList();
-		},
-		discard(row) {
-      let _this = this
-      this.$confirm(`是否确认作废 ${row.planName} 的数据项?`, "系统提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-				.then(() => {
-					disableGroupRule(row.id).then((response) => {
-							_this.getList();
-							_this.$modal.msgSuccess('操作成功');
-					});
-				})
-				.catch(() => {});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-      this.$confirm(`是否确认删除 ${row.planName} 的数据项?`, "系统提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-				.then(function () {
-					return deleteGroupRule(row.id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/group/deptSelect.vue b/src/views/group/deptSelect.vue
deleted file mode 100644
index d6da9744..00000000
--- a/src/views/group/deptSelect.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<template>
-	<treeselect
-		v-model="deptId"
-		:options="deptOptions"
-		:show-count="true"
-		sise="small"
-		ref="treeselect"
-		placeholder="请选择归属部门"
-		@input="setId"
-		:normalizer="normalizer" />
-</template>
-
-<script>
-import Treeselect from '@riophae/vue-treeselect';
-import '@riophae/vue-treeselect/dist/vue-treeselect.css';
-import { listSimpleDepts } from '@/api/system/dept';
-
-export default {
-	components: { Treeselect },
-	data() {
-		return {
-			deptId: undefined,
-			deptOptions: undefined,
-			defaultProps: {
-				children: 'children',
-				label: 'name',
-			},
-		};
-	},
-	created() {
-		this.getTreeselect();
-	},
-	methods: {
-		/** 查询部门下拉树结构  */
-		getTreeselect() {
-			listSimpleDepts().then((response) => {
-				// 处理 deptOptions 参数
-				this.deptOptions = [];
-				this.deptOptions.push(...this.handleTree(response.data, 'id'));
-			});
-		},
-    // 子组件返回id
-		setId(val) {
-			this.$emit('DeptId', val);
-		},
-    // 父组件赋值id
-		setID(id) {
-			this.deptId = id;
-		},
-		clear() {
-			console.log(this.$refs.treeselect);
-			this.$refs.treeselect.clear();
-		},
-		// 格式化部门的下拉框
-		normalizer(node) {
-			return {
-				id: node.id,
-				label: node.name,
-				children: node.children,
-			};
-		},
-	},
-};
-</script>
diff --git a/src/views/group/groupSetting/add-or-updata.vue b/src/views/group/groupSetting/add-or-updata.vue
deleted file mode 100644
index aa48dd8d..00000000
--- a/src/views/group/groupSetting/add-or-updata.vue
+++ /dev/null
@@ -1,226 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-29 14:47:33
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item label="班组编号" prop="code">
-					<el-input
-						v-model="dataForm.code"
-						clearable
-						placeholder="请输入班组编号" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="班组名称" prop="name">
-					<el-input
-						v-model="dataForm.name"
-						clearable
-						placeholder="请输入班组名称" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="部门">
-					<dept-select
-						style="width: 100%"
-						ref="deptSelect"
-						@DeptId="setDeptId"></dept-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="组长" prop="leaderId">
-					<el-select
-						style="width: 100%"
-						v-model="dataForm.leaderId"
-						@change="setLeaderName"
-            filterable
-						placeholder="请选择组长">
-						<el-option
-							v-for="item in leaderArr"
-							:key="item.id"
-							:label="item.nickname"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="组长电话" prop="leaderPhone">
-					<el-input
-						v-model="dataForm.leaderPhone"
-						clearable
-             maxlength="11"
-						placeholder="请输入组长电话" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="班组人数" prop="num">
-					<el-input-number
-						style="width: 100%"
-						v-model="dataForm.num"
-						:step="1"
-						:min="0"
-						step-strictly />
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="生产班组" prop="isProduction">
-					<el-select
-						style="width: 100%"
-						v-model="dataForm.isProduction"
-						placeholder="请选择是否为生产班组">
-						<el-option
-							v-for="item in options"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="dataForm.remark"
-						clearable
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '@/mixins/basic-add';
-import deptSelect from './../deptSelect.vue';
-import { listSimpleUsers } from '@/api/system/user';
-import {
-	createGroup,
-	updateGroup,
-	getGroup,
-	getCode,
-} from '@/api/group/groupSetting';
-
-export default {
-	mixins: [basicAdd],
-	components: {
-		deptSelect,
-	},
-	data() {
-		return {
-			urlOptions: {
-				isGetCode: true,
-				codeURL: getCode,
-				createURL: createGroup,
-				updateURL: updateGroup,
-				infoURL: getGroup,
-				optionArrUrl: [listSimpleUsers], //需要获取下拉框的方法数组
-			},
-			dataForm: {
-				id: undefined,
-				code: undefined,
-				name: undefined,
-				leaderId: undefined,
-				leaderName: undefined,
-				leaderPhone: undefined,
-				deptId: undefined,
-				isProduction: undefined,
-				num: undefined,
-				remark: undefined,
-			},
-      setData: true,
-			leaderArr: [],
-			options: [
-				{
-					value: true,
-					label: '是',
-				},
-				{
-					value: false,
-					label: '否',
-				},
-			],
-			dataRule: {
-				code: [
-					{ required: true, message: '班组编码不能为空', trigger: 'blur' },
-				],
-				name: [
-					{ required: true, message: '班组名称不能为空', trigger: 'blur' },
-				],
-				leaderId: [
-					{ required: true, message: '组长不能为空', trigger: 'change' },
-				],
-				isProduction: [
-					{ required: true, message: '生产班组不能为空', trigger: 'change' },
-				],
-        leaderPhone: [
-          {
-            pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
-			},
-		};
-	},
-	methods: {
-		setDeptId(val) {
-			this.dataForm.deptId = val;
-		},
-		/** 获取下拉框数组 */
-		getArr() {
-			this.urlOptions.optionArrUrl[0]()
-				.then(({ data: res }) => {
-					this.leaderArr = res;
-				})
-				.catch(() => {});
-		},
-    setDataForm(){
-      this.$refs.deptSelect.setID(this.dataForm.deptId)
-    },
-		setLeaderName(val) {
-			this.leaderArr.map((item) => {
-				if (val === item.id) {
-					this.dataForm.leaderName = item.nickname;
-				}
-			});
-		},
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs["dataForm"].validate((valid) => {
-        if (!valid) {
-          return false;
-        }
-        if(!this.dataForm.deptId){
-						this.$message('部门不能为空');
-            return
-        }
-        // 修改的提交
-        if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.visible = false;
-            this.$emit("refreshDataList");
-          });
-          return;
-        }
-        // 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.visible = false;
-          this.$emit("refreshDataList");
-        });
-      });
-    },
-	},
-};
-</script>
diff --git a/src/views/group/groupSetting/changeStatus.vue b/src/views/group/groupSetting/changeStatus.vue
deleted file mode 100644
index b9744b78..00000000
--- a/src/views/group/groupSetting/changeStatus.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-	<el-switch
-		@change="changeStatus"
-		size="small"
-		v-model="list.enabled"
-		:active-value="1"
-		:inactive-value="0"></el-switch>
-</template>
-
-<script>
-import { updateGroup } from '@/api/group/groupSetting';
-export default {
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			list: this.injectData,
-		};
-	},
-	created() {},
-	methods: {
-		changeStatus(val) {
-			const data = { ...this.injectData, enabled: val };
-			updateGroup(data).then((res) => {
-				this.$modal.msgSuccess('修改成功');
-					this.$emit('emitData');
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/group/groupSetting/index.vue b/src/views/group/groupSetting/index.vue
deleted file mode 100644
index 5aa9dbb3..00000000
--- a/src/views/group/groupSetting/index.vue
+++ /dev/null
@@ -1,289 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-10-11 14:27:37
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-29 14:44:41
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<div class="searchBarBox">
-			<el-form
-				:inline="true"
-				ref="searchBarForm"
-				:model="formInline"
-				class="searchBar">
-				<span class="blue-block" />
-				<el-form-item label="班组编号" prop="code">
-					<el-input
-						v-model="formInline.code"
-						clearable
-						size="small"
-						placeholder="请输入班组编号" />
-				</el-form-item>
-				<el-form-item label="部门" prop="deptId">
-					<dept-select
-						style="width: 200px"
-						ref="deptSelect"
-						@DeptId="setDeptId"></dept-select>
-				</el-form-item>
-				<el-form-item label="班组名称" prop="name">
-					<el-input
-						v-model="formInline.name"
-						clearable
-						size="small"
-						placeholder="请输入班组名称" />
-				</el-form-item>
-				<el-form-item label="组长" prop="leaderName">
-					<el-input
-						v-model="formInline.leaderName"
-						clearable
-						size="small"
-						placeholder="请输入组长" />
-				</el-form-item>
-				<el-form-item>
-					<el-button
-						type="primary"
-						size="small"
-						v-hasPermi="['base:group-team:query']"
-						@click="buttonClick({ btnName: 'search' })">
-						查询
-					</el-button>
-				</el-form-item>
-				<el-form-item>
-					<span
-						class="separateStyle"
-						v-hasPermi="['base:group-team:query']"></span>
-				</el-form-item>
-				<el-form-item>
-					<el-button size="small" @click="buttonClick({ btnName: 'reset' })">
-						重置
-					</el-button>
-				</el-form-item>
-				<el-form-item>
-					<span
-						class="separateStyle"
-						v-hasPermi="['base:group-team:create']"></span>
-				</el-form-item>
-				<el-form-item>
-					<el-button
-						type="success"
-						size="small"
-						:plain="true"
-						v-hasPermi="['base:group-team:create']"
-						@click="buttonClick({ btnName: 'add' })">
-						新增
-					</el-button>
-				</el-form-item>
-			</el-form>
-		</div>
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			@emitFun="getDataList">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			:destroy-on-close="true"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import deptSelect from './../deptSelect.vue';
-import basicPage from '@/mixins/basic-page';
-import changeStatus from './changeStatus.vue';
-import { parseTime } from '@/filter/code-filter';
-import { getGroupPage } from '@/api/group/groupSetting';
-
-const tableProps = [
-	{
-		prop: 'code',
-		label: '班组编号',
-		width: 210,
-	},
-	{
-		prop: 'name',
-		label: '班组名称',
-	},
-	{
-		prop: 'deptName',
-		label: '所属部门',
-		width: 110,
-	},
-	{
-		prop: 'leaderName',
-		label: '组长',
-	},
-	{
-		prop: 'leaderPhone',
-		label: '组长电话',
-		width: 110,
-	},
-	{
-		prop: 'num',
-		label: '人数',
-		width: 70,
-	},
-	{
-		prop: 'isProduction',
-		label: '是否生产班组',
-		filter: (val) => {
-			return val ? '是' : '否';
-		},
-		width: 110,
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-		showOverflowtooltip: true,
-	},
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime,
-		width: 150,
-	},
-	{
-		prop: 'enabled',
-		label: '班组状态',
-		subcomponent: changeStatus,
-		width: 80,
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getGroupPage,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi('base:group-team:update')
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableData: [],
-			formInline: {
-				code: '',
-				name: '',
-				deptId: '',
-				leaderName: '',
-			},
-		};
-	},
-	components: {
-		AddOrUpdate,
-		deptSelect,
-	},
-	created() {},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery = {
-						pageNo: 1,
-						pageSize: 10,
-						total: 1,
-						...this.formInline,
-					};
-					this.getDataList();
-					break;
-				case 'reset':
-					this.formInline.name = null;
-					this.formInline.code = null;
-					this.formInline.deptId = null;
-					this.$refs.deptSelect.clear();
-					this.formInline.leaderName = null;
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		setDeptId(val) {
-			this.formInline.deptId = val;
-		},
-	},
-};
-</script>
-
-<style scope>
-.searchBarBox {
-	width: 100%;
-	position: relative;
-	margin-bottom: 8px;
-}
-.searchBarBox::after {
-	content: '';
-	display: block;
-	clear: both;
-}
-.searchBar .blue-block {
-	display: inline-block;
-	float: left;
-	width: 4px;
-	height: 16px;
-	background-color: #0b58ff;
-	border-radius: 1px;
-	margin-right: 8px;
-	margin-top: 12px;
-}
-.searchBar .el-form-item {
-	margin-bottom: 4px;
-}
-.searchBar .separateStyle {
-	display: inline-block;
-	width: 1px;
-	height: 24px;
-	background: #e8e8e8;
-	vertical-align: middle;
-}
-.searchBar .vue-treeselect__control {
-	height: 32px !important;
-	line-height: 32px !important;
-	margin: 4px 0;
-}
-</style>
diff --git a/src/views/group/holidaySetting/add-or-updata.vue b/src/views/group/holidaySetting/add-or-updata.vue
deleted file mode 100644
index 1d094380..00000000
--- a/src/views/group/holidaySetting/add-or-updata.vue
+++ /dev/null
@@ -1,382 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-23 13:29:58
- * @Description:
--->
-<template>
-	<div>
-		<el-form
-			:model="dataForm"
-			:rules="dataRule"
-			ref="dataForm"
-			@keyup.enter.native="dataFormSubmit()"
-			label-position="top"
-			label-width="80px">
-			<el-row :gutter="20">
-				<el-col :span="12">
-					<el-form-item label="节假日名称" prop="name">
-						<el-input
-							v-model="dataForm.name"
-							clearable
-							:disabled="detail"
-							placeholder="请输入节假日名称" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="日历类型" prop="calendarType">
-						<el-select
-							v-model="dataForm.calendarType"
-							:disabled="detail"
-							style="width: 100%">
-							<el-option
-								v-for="item in options1"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value"></el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="日期类型" prop="dateType">
-						<el-select
-							style="width: 100%"
-							:disabled="detail"
-							v-model="dataForm.dateType">
-							<el-option
-								v-for="item in options2"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value"></el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item
-						v-if="dataForm.dateType == 1"
-						label="日期"
-						prop="dateDay">
-						<el-date-picker
-							:disabled="detail"
-							style="width: 100%"
-							key="date"
-							v-model="dataForm.dateDay"
-							type="date"
-							placeholder="选择日期"
-							format="yyyy-MM-dd"
-							value-format="--MM-dd"
-							:picker-options="pickerOptions"></el-date-picker>
-					</el-form-item>
-					<el-form-item v-else label="日期" prop="dateDayArr">
-						<el-date-picker
-							:disabled="detail"
-							style="width: 100%"
-							key="daterange"
-							v-model="dataForm.dateDayArr"
-							type="daterange"
-							format="yyyy-MM-dd"
-							value-format="--MM-dd"
-							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
-							:picker-options="pickerOptions"></el-date-picker>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="是否每年重复" prop="repeat">
-						<el-select
-							v-model="dataForm.repeat"
-							:disabled="detail"
-							style="width: 100%">
-							<el-option
-								v-for="item in options3"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value"></el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12" v-if="detail">
-					<el-form-item label="来源" prop="inherited">
-						<el-radio-group disabled v-model="dataForm.inherited">
-							<el-radio :label="true">继承</el-radio>
-							<el-radio :label="false">自定义</el-radio>
-						</el-radio-group>
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-		<el-dialog
-			title="删除确认"
-			:visible.sync="dialogVisible"
-			width="30%"
-			append-to-body>
-			<span>
-				确认删除该节假日吗？
-				<br />
-				该节假日已被排班计划使用，建议确认是否同步更新排班计划。
-				<br />
-				此操作不可恢复，请确认是否继续
-			</span>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button @click="onlyDelete">仅删除</el-button>
-				<el-button type="primary" @click="deleteAndUpdate">
-					删除并更新
-				</el-button>
-			</span>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	createHoliday,
-	updateHoliday,
-	checkDeleteHoliday,
-	deleteHoliday,
-	updateSchedule,
-	getHoliday,
-} from '@/api/group/holidaySetting';
-
-export default {
-	components: {},
-	data() {
-		return {
-			dataForm: {
-				id: undefined,
-				name: undefined,
-				calendarType: 1,
-				dateType: 1,
-				dateDay: undefined,
-				dateDayArr: [],
-				repeat: true,
-				inherited: true, //	是否为继承
-				deptId: undefined,
-			},
-			detail: false,
-			options1: [
-				{
-					value: 1,
-					label: '公历(阳历)',
-				},
-				{
-					value: 2,
-					label: '农历(阴历)',
-				},
-			],
-			options2: [
-				{
-					value: 1,
-					label: '单天',
-				},
-				{
-					value: 2,
-					label: '时间段',
-				},
-			],
-			options3: [
-				{
-					value: false,
-					label: '否，本年度有效',
-				},
-				{
-					value: true,
-					label: '是，每年循环生效',
-				},
-			],
-			dataRule: {
-				name: [
-					{ required: true, message: '节假日名称不能为空', trigger: 'blur' },
-				],
-				calendarType: [
-					{ required: true, message: '日历类型不能为空', trigger: 'change' },
-				],
-				dateType: [
-					{ required: true, message: '日期类型不能为空', trigger: 'change' },
-				],
-				dateDay: [
-					{ required: true, message: '日期不能为空', trigger: 'change' },
-				],
-				dateDayArr: [
-					{ required: true, message: '日期不能为空', trigger: 'change' },
-				],
-				repeat: [
-					{
-						required: true,
-						message: '是否每年重复不能为空',
-						trigger: 'change',
-					},
-				],
-			},
-			pickerOptions: {
-				disabledDate(time) {
-					return time.getTime() < Date.now();
-				},
-			},
-			dialogVisible: false,
-		};
-	},
-	methods: {
-		init(deptId, id, detail) {
-			this.dataForm.deptId = deptId || undefined;
-			this.dataForm.id = id || undefined;
-			this.detail = detail || false;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				if (this.dataForm.id) {
-					getHoliday(this.dataForm.id).then((res) => {
-						this.dataForm = res.data;
-						if (
-							this.dataForm.dateType == 1 &&
-							this.dataForm.calendarType == 1
-						) {
-							this.dataForm.dateDay = this.dataForm.oneDay;
-						} else if (
-							this.dataForm.dateType == 2 &&
-							this.dataForm.calendarType == 1
-						) {
-							this.dataForm.dateDayArr = [
-								this.dataForm.startDay,
-								this.dataForm.endDay,
-							];
-						} else if (
-							this.dataForm.dateType == 1 &&
-							this.dataForm.calendarType == 2
-						) {
-							this.dataForm.dateDay = this.dataForm.oneDayChinese;
-						} else if (
-							this.dataForm.dateType == 2 &&
-							this.dataForm.calendarType == 2
-						) {
-							this.dataForm.dateDayArr = [
-								this.dataForm.startDayChinese,
-								this.dataForm.endDayChinese,
-							];
-						}
-					});
-				}
-			});
-		},
-		editHoliday() {
-			this.detail = false;
-		},
-		deleteHoliday() {
-			//删除节假日基础信息前校验是否影响排班
-			checkDeleteHoliday(this.dataForm.id).then((res) => {
-				if (res.data) {
-					this.dialogVisible = true;
-				} else {
-					this.$confirm(
-						'确认删除该节假日吗？<br/>此操作不可恢复，请确认是否继续',
-						'删除确认',
-						{
-							dangerouslyUseHTMLString: true,
-							confirmButtonText: '确认删除',
-							cancelButtonText: '取消',
-							type: 'warning',
-						}
-					)
-						.then(() => {
-							deleteHoliday(this.dataForm.id).then((res) => {
-								console.log(res);
-								this.$modal.msgSuccess('删除成功');
-								this.$emit('refreshPage');
-							});
-						})
-						.catch(() => {
-							this.$message({
-								type: 'info',
-								message: '已取消',
-							});
-						});
-				}
-			});
-		},
-		onlyDelete() {
-			deleteHoliday(this.dataForm.id).then((res) => {
-				this.dialogVisible = false;
-				this.$modal.msgSuccess('删除成功');
-				this.$emit('refreshPage');
-			});
-		},
-		deleteAndUpdate() {
-			deleteHoliday(this.dataForm.id).then((res) => {
-				this.dialogVisible = false;
-				this.$modal.msgSuccess('删除成功');
-				updateSchedule({ logId: res.data.logId }).then((res1) => {
-					this.$modal.msgSuccess('更新成功');
-					this.$emit('refreshPage');
-				});
-			});
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				if (this.dataForm.dateType == 1 && this.dataForm.calendarType == 1) {
-					this.dataForm.oneDay = this.dataForm.dateDay;
-				} else if (
-					this.dataForm.dateType == 2 &&
-					this.dataForm.calendarType == 1
-				) {
-					this.dataForm.startDay = this.dataForm.dateDayArr[0];
-					this.dataForm.endDay = this.dataForm.dateDayArr[1];
-				} else if (
-					this.dataForm.dateType == 1 &&
-					this.dataForm.calendarType == 2
-				) {
-					this.dataForm.oneDayChinese = this.dataForm.dateDay;
-				} else if (
-					this.dataForm.dateType == 2 &&
-					this.dataForm.calendarType == 2
-				) {
-					this.dataForm.startDayChinese = this.dataForm.dateDayArr[0];
-					this.dataForm.endDayChinese = this.dataForm.dateDayArr[1];
-				}
-				// 修改的提交
-				if (this.dataForm.id) {
-					updateHoliday(this.dataForm).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.$emit('refreshPage');
-					});
-					return;
-				}
-				// 添加的提交
-				createHoliday(this.dataForm).then((res) => {
-					updateSchedule;
-					if (!res.data.updateFlag) {
-						this.$modal.msgSuccess('新增成功');
-						this.$emit('refreshPage');
-					} else {
-						this.$confirm(
-							'新增节假日影响已有排班计划，是否立即更新？',
-							'更新排班',
-							{
-								confirmButtonText: '立即更新',
-								cancelButtonText: '暂不更新',
-								type: 'warning',
-							}
-						)
-							.then(() => {
-								updateSchedule({ logId: res.data.logId }).then((res1) => {
-									this.$modal.msgSuccess('新增成功');
-									this.$emit('refreshPage');
-								});
-							})
-							.catch(() => {
-								this.$message({
-									type: 'info',
-									message: '已取消',
-								});
-							});
-					}
-				});
-			});
-		},
-	},
-};
-</script>
diff --git a/src/views/group/holidaySetting/holidayLog.vue b/src/views/group/holidaySetting/holidayLog.vue
deleted file mode 100644
index bdbd11cf..00000000
--- a/src/views/group/holidaySetting/holidayLog.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-      :isFold="true"
-			@headBtnClick="buttonClick" />
-		<base-table
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
-</template>
-
-<script>
-import { parseTime } from '@/filter/code-filter';
-import { deptHolidayLogList } from '@/api/group/holidaySetting';
-
-const tableProps = [
-	{
-		prop: 'createTime',
-		label: '操作时间',
-		filter: parseTime
-	},
-	{
-		prop: 'opPeopleName',
-		label: '操作人'
-	},
-	{
-		prop: 'opType',
-		label: '操作类型',
-    filter: (val)=>{return val?['','创建','删除','修改','-','-'][val]:'-'}
-	},
-	{
-		prop: 'name',
-		label: '节假日名称'
-	},
-	{
-		prop: 'opDet',
-		label: '修改内容'
-	},
-	{
-		prop: 'planType',
-		label: '更新排班计划',
-    filter: (val)=>{return val?['','是','否','无排班计划'][val]:'-'}
-	},
-];
-
-export default {
-	data() {
-		return {
-      listQuery: { //分页
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-      },
-			tableProps,
-			tableData: [],
-			formConfig: [
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'createTime',
-				},
-				{
-					type: 'input',
-					label: '操作人',
-					placeholder: '操作人',
-					param: 'opPeopleName',
-				},
-				{
-					type: 'select',
-					label: '操作类型',
-					selectOptions: [
-						{
-							id: 1,
-							name: '创建',
-						},
-						{
-							id: 2,
-							name: '删除',
-						},
-						{
-							id: 3,
-							name: '修改',
-						},
-						{
-							id: 4,
-							name: '解除继承',
-						},
-						{
-							id: 5,
-							name: '恢复继承',
-						},
-					],
-					param: 'opType',
-				},
-				{
-					type: 'select',
-					label: '更新排班计划',
-					selectOptions: [
-						{
-							id: 1,
-							name: '是',
-						},
-						{
-							id: 2,
-							name: '否',
-						},
-						{
-							id: 3,
-							name: '无排班计划',
-						},
-					],
-					param: 'planType',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '重置',
-					name: 'reset',
-				},
-			],
-		};
-	},
-	created() {},
-	methods: {
-    // 获取数据列表
-    getDataList() {
-      deptHolidayLogList(this.listQuery).then(response => {
-        this.tableData = response.data.list;
-        this.listQuery.total = response.data.total;
-      });
-    },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.createTime = val.createTime || [];
-					this.listQuery.planType = val.planType || undefined;
-					this.listQuery.opType = val.opType || undefined;
-					this.listQuery.opPeopleName = val.opPeopleName || undefined;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/group/holidaySetting/index.vue b/src/views/group/holidaySetting/index.vue
deleted file mode 100644
index e5705edc..00000000
--- a/src/views/group/holidaySetting/index.vue
+++ /dev/null
@@ -1,564 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-01 14:54:06
- * @LastEditors: zwq
- * @LastEditTime: 2025-10-27 10:18:54
- * @Description:
--->
-<template>
-	<el-row :gutter="10" style="background-color: #f2f4f9">
-		<!--部门数据-->
-		<el-col :span="4">
-			<div class="head-container">
-				<el-input
-					v-model="deptName"
-					placeholder="请输入部门名称"
-					clearable
-					size="small"
-					prefix-icon="el-icon-search"
-					style="margin-bottom: 20px" />
-				<el-tree
-					:data="deptOptions"
-					:props="defaultProps"
-					:expand-on-click-node="false"
-					:filter-node-method="filterNode"
-					ref="tree"
-					default-expand-all
-					highlight-current
-					@node-click="handleNodeClick" />
-			</div>
-		</el-col>
-		<el-col :span="20">
-			<div class="groupTeamScheduling">
-				<div class="operationArea">
-					<el-row>
-						<el-col :span="16">
-							<div style="height: 40px; font-size: 16px">
-								<span style="color: #409eff; font-weight: 600">
-									{{ showDeptName }}
-								</span>
-								节假日设置
-							</div>
-						</el-col>
-						<el-col :span="8">
-							<div style="float: right">
-								<el-button
-									size="small"
-									type="primary"
-									style="margin-right: 10px"
-									v-hasPermi="['base:group-holiday:create']"
-									@click="addHoliday">
-									新增节假日
-								</el-button>
-								<el-button
-									size="small"
-									v-hasPermi="['base:group-holiday-log:query']"
-									@click="holidayLog">
-									节假日变更记录
-								</el-button>
-							</div>
-						</el-col>
-					</el-row>
-				</div>
-				<div class="operationArea">
-					<el-form :inline="true" class="demo-form-inline">
-						<span class="blue-block"></span>
-						<el-form-item label="月份选择">
-							<el-date-picker
-								v-model="startDay"
-								type="month"
-								placeholder="选择月"
-								size="small"
-								@change="selectMonth"
-								:clearable="false"
-								style="width: 120px"></el-date-picker>
-						</el-form-item>
-						<el-form-item style="float: right">
-							<el-button
-								size="small"
-								type="primary"
-								@click="(startDay = new Date()), getHolidayPage()">
-								跳转到今天
-							</el-button>
-						</el-form-item>
-					</el-form>
-					<el-tag
-						v-if="topDeptId == deptId"
-						type="warning"
-						closable
-						style="margin-bottom: 10px; color: black">
-						<i class="el-icon-warning" style="color: #ffbd02"></i>
-						当前节假日设置为组织架构中最高层级配置，默认自动继承至下属部门。子部门可选择
-						<span style="color: red">解除继承</span>
-						设置后进行独立修改，复制后不再继承上级设置
-					</el-tag>
-				</div>
-				<!-- 日历区域 -->
-				<div class="calenderArea">
-					<el-calendar v-model="startDay">
-						<template slot="dateCell" slot-scope="{ data }">
-							<div v-if="data.type === 'current-month'">
-								<!-- 日期 -->
-								<div class="dateStyle">
-									<el-row :gutter="20">
-										<!-- 公历和农历 -->
-										<el-col :span="18">
-											{{ Number(data.day.split('-')[2]) }}
-											<div class="lunar-date">{{ getLunarDate(data.day) }}</div>
-										</el-col>
-										<!-- 显示假或班 -->
-										<el-col :span="6">
-											<div
-												class="work-tip"
-												:style="{
-													backgroundColor: HolidayList[
-														Number(data.day.split('-')[2]) - 1
-													]?.isHoliday
-														? '#67C23A'
-														: '#409EFF',
-												}">
-												{{
-													HolidayList[Number(data.day.split('-')[2]) - 1]
-														?.isHoliday
-														? '假'
-														: '班'
-												}}
-											</div>
-										</el-col>
-										<!-- 显示假期名和操作 -->
-										<el-col
-											:span="24"
-											v-if="
-												HolidayList[Number(data.day.split('-')[2]) - 1]
-													?.isHoliday
-											">
-											<div
-												class="holiday-div"
-												@click="
-													new Date(data.day).getTime() > Date.now() &&
-														showDetail(
-															HolidayList[Number(data.day.split('-')[2]) - 1]
-																.holidayId
-														)
-												">
-												{{
-													HolidayList[Number(data.day.split('-')[2]) - 1]
-														?.holidayName
-												}}
-												<span
-													class="holiday-div-btn"
-													v-if="new Date(data.day).getTime() > Date.now()">
-													<i class="el-icon-more" style="color: #fff"></i>
-												</span>
-											</div>
-										</el-col>
-									</el-row>
-								</div>
-							</div>
-							<div
-								v-else
-								style="font-size: 20px; font-weight: 500; text-align: left">
-								<el-row :gutter="20">
-									<el-col :span="24">
-										{{ Number(data.day.split('-')[2]) }}
-										<span style="font-size: 12px">
-											{{ getLunarDate(data.day) }}
-										</span>
-									</el-col>
-								</el-row>
-							</div>
-						</template>
-					</el-calendar>
-				</div>
-			</div>
-		</el-col>
-		<base-dialog
-			:dialogTitle="dialogTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="cancel"
-			@confirm="handleConfirm"
-			:before-close="cancel"
-			:destroy-on-close="true"
-			width="40%">
-			<add-or-updata
-				ref="addOrUpdataRef"
-				@refreshPage="successSubmit"></add-or-updata>
-			<template #footer>
-				<slot name="footer">
-					<el-row slot="footer" type="flex" justify="end">
-						<el-col :span="24">
-							<el-button
-								v-if="!detail"
-								size="small"
-								class="btnTextStyle"
-								@click="cancel">
-								取消
-							</el-button>
-							<el-button
-								v-if="!detail"
-								type="primary"
-								class="btnTextStyle"
-								size="small"
-								@click="handleConfirm">
-								确定
-							</el-button>
-							<el-button
-								v-if="detail"
-								size="small"
-								type="primary"
-								class="btnTextStyle"
-								v-hasPermi="['base:group-holiday:update']"
-								@click="editHoliday">
-								修改
-							</el-button>
-							<el-button
-								v-if="detail"
-								class="btnTextStyle"
-								size="small"
-								v-hasPermi="['base:group-holiday:delete']"
-								@click="deleteHoliday">
-								删除
-							</el-button>
-						</el-col>
-					</el-row>
-				</slot>
-			</template>
-		</base-dialog>
-		<base-dialog
-			dialogTitle="节假日变更记录"
-			:dialogVisible="logVisible"
-			@cancel="cancelLog"
-			:before-close="cancelLog"
-			:destroy-on-close="true"
-			width="70%">
-			<holiday-log ref="holidayLogRef"></holiday-log>
-			<template #footer>
-				<slot name="footer">
-					<el-row slot="footer" type="flex" justify="end">
-						<el-col :span="24">
-							<el-button size="small" class="btnTextStyle" @click="cancelLog">
-								取消
-							</el-button>
-						</el-col>
-					</el-row>
-				</slot>
-			</template>
-		</base-dialog>
-	</el-row>
-</template>
-
-<script>
-import moment from 'moment';
-import { solarToLunar } from 'chinese-lunar';
-
-import { getUserProfile } from '@/api/system/user';
-import { deptHolidayList, getEnableData } from '@/api/group/holidaySetting';
-
-import addOrUpdata from './add-or-updata.vue';
-import holidayLog from './holidayLog';
-
-export default {
-	name: '',
-	components: {
-		addOrUpdata,
-		holidayLog,
-	},
-	data() {
-		return {
-			startDay: '', // 查询参数
-			HolidayList: [],
-			// 部门树选项
-			deptOptions: undefined,
-			// 查询的部门名称
-			deptName: undefined,
-			// 选择的部门名称
-			showDeptName: undefined,
-			topDeptId: undefined, // 保存当前用户的部门id为最高级部门id
-			deptId: undefined,
-			defaultProps: {
-				children: 'children',
-				label: 'name',
-			},
-			dialogTitle: undefined,
-			addOrUpdateVisible: false,
-			detail: false,
-			logVisible: false,
-		};
-	},
-	watch: {
-		// 根据名称筛选部门树
-		deptName(val) {
-			this.$refs.tree.filter(val);
-		},
-	},
-	created() {
-		this.startDay = new Date();
-		// 查询用户个人信息
-		getUserProfile().then((response) => {
-			this.showDeptName = response.data.dept.name || '';
-			this.topDeptId = response.data.dept.id || ''; // 保存当前用户的部门id为最高级部门id
-			this.deptId = response.data.dept.id || '';
-			this.getHolidayPage();
-		});
-		this.getTreeselect();
-	},
-	methods: {
-		getHolidayPage() {
-			const now = new Date(this.startDay);
-			const year = now.getFullYear();
-			const month = now.getMonth();
-			const startTime = `${year}-${String(month + 1).padStart(2, '0')}-01`;
-			const lastDate = new Date(year, month + 1, 0).getDate();
-			const endTime = `${year}-${String(month + 1).padStart(2, '0')}-${String(
-				lastDate
-			).padStart(2, '0')}`;
-
-			this.HolidayList = [];
-			deptHolidayList({
-				deptId: this.deptId,
-				startTime: Date.parse(startTime),
-				endTime: Date.parse(endTime),
-			}).then((res) => {
-				this.HolidayList = res.data;
-			});
-		},
-		// 切换月份
-		selectMonth() {
-			this.getHolidayPage();
-		},
-		/** 查询部门下拉树结构 */
-		getTreeselect() {
-			getEnableData().then((response) => {
-				// 处理 deptOptions 参数
-				this.deptOptions = [];
-				this.deptOptions.push(...this.handleTree(response.data, 'id'));
-			});
-		},
-		// 筛选节点
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.name.indexOf(value) !== -1;
-		},
-		// 节点单击事件
-		handleNodeClick(data) {
-			this.deptId = data.id;
-			this.showDeptName = data.name;
-			this.getHolidayPage();
-		},
-		//获取农历
-		getLunarDate(solarDate) {
-			try {
-				const [year, month, day] = solarDate.split('-').map(Number);
-
-				const date = new Date(year, month - 1, day);
-				const lunar = solarToLunar(date);
-
-				// 将数字月份和日期转换为中文
-				const monthMap = {
-					1: '正',
-					2: '二',
-					3: '三',
-					4: '四',
-					5: '五',
-					6: '六',
-					7: '七',
-					8: '八',
-					9: '九',
-					10: '十',
-					11: '冬',
-					12: '腊',
-				};
-
-				const dayMap = {
-					1: '初一',
-					2: '初二',
-					3: '初三',
-					4: '初四',
-					5: '初五',
-					6: '初六',
-					7: '初七',
-					8: '初八',
-					9: '初九',
-					10: '初十',
-					11: '十一',
-					12: '十二',
-					13: '十三',
-					14: '十四',
-					15: '十五',
-					16: '十六',
-					17: '十七',
-					18: '十八',
-					19: '十九',
-					20: '二十',
-					21: '廿一',
-					22: '廿二',
-					23: '廿三',
-					24: '廿四',
-					25: '廿五',
-					26: '廿六',
-					27: '廿七',
-					28: '廿八',
-					29: '廿九',
-					30: '三十',
-				};
-
-				// 返回 "三月初四" 格式
-				return `${monthMap[lunar.month]}月${dayMap[lunar.day]}`;
-			} catch (error) {
-				console.log(error);
-				return '';
-			}
-		},
-		addHoliday() {
-			this.addOrUpdateVisible = true;
-			this.detail = false;
-			this.dialogTitle = '新增节假日';
-			this.$nextTick(() => {
-				this.$refs.addOrUpdataRef.init(this.deptId);
-			});
-		},
-		holidayLog() {
-			this.logVisible = true;
-			this.$nextTick(() => {
-				this.$refs.holidayLogRef.getDataList();
-			});
-		},
-		cancel() {
-			this.getHolidayPage();
-			this.addOrUpdateVisible = false;
-		},
-		successSubmit() {
-			this.cancel();
-			this.getHolidayPage();
-		},
-		handleConfirm() {
-			this.$refs.addOrUpdataRef.dataFormSubmit();
-		},
-		showDetail(id) {
-			this.addOrUpdateVisible = true;
-			this.detail = true;
-			this.dialogTitle = '节假日详情';
-			this.$nextTick(() => {
-				this.$refs.addOrUpdataRef.init(this.deptId, id, true);
-			});
-		},
-		editHoliday() {
-			this.detail = false;
-			this.$nextTick(() => {
-				this.$refs.addOrUpdataRef.editHoliday();
-			});
-		},
-		deleteHoliday() {
-			this.$nextTick(() => {
-				this.$refs.addOrUpdataRef.deleteHoliday();
-			});
-		},
-		cancelLog() {
-			this.logVisible = false;
-		},
-	},
-};
-</script>
-<style lang="scss">
-.head-container {
-	padding: 20px 10px 0;
-	background-color: #fff;
-	min-height: calc(100vh - 120px - 8px);
-	border-radius: 8px;
-}
-.groupTeamScheduling {
-	.operationArea {
-		padding: 14px 10px 0 16px;
-		margin-bottom: 8px;
-		background-color: #fff;
-		border-radius: 8px;
-		.blue-block {
-			display: inline-block;
-			width: 4px;
-			height: 16px;
-			background-color: #0b58ff;
-			border-radius: 1px;
-			margin-right: 8px;
-			margin-top: 10px;
-		}
-		.el-form-item {
-			margin-bottom: 10px;
-		}
-	}
-	// 日历
-	.calenderArea {
-		padding: 14px 10px 0 20px;
-		background-color: #fff;
-		border-radius: 8px;
-		min-height: calc(100vh - 120px - 8px - 168px);
-		.el-calendar__body {
-			padding: 10px 16px 16px 0;
-		}
-		.el-calendar__header {
-			display: none;
-		}
-		.el-calendar-table > thead {
-			height: 48px;
-			font-size: 20px;
-			font-weight: 500;
-			color: #000000;
-			background-color: rgba(242, 244, 249, 1);
-		}
-		.el-calendar-table__row {
-			height: 133px;
-			.prev,
-			.next {
-				pointer-events: none;
-			}
-			.is-selected,
-			.is-today {
-				background-color: #e4f0fd;
-			}
-			.el-calendar-day {
-				padding: 0;
-				height: 100%;
-				:hover {
-					background-color: #e4f0fd;
-				}
-				.dateStyle {
-					font-size: 20px;
-					font-weight: 500;
-					color: #000000;
-					text-align: left;
-					height: 133px;
-					line-height: 28px;
-					padding: 10px;
-
-					.lunar-date {
-						display: inline-block;
-						font-size: 12px;
-						color: #909399;
-					}
-					.work-tip {
-						background: #87c1ff;
-						color: white;
-						font-size: 18px;
-						width: 30px;
-						text-align: center;
-						float: right;
-					}
-					.holiday-div {
-						background-color: #67c23a;
-						border-radius: 3px;
-						height: 25px;
-						text-align: center;
-						line-height: 24px;
-						color: #fff;
-						.holiday-div-btn {
-							float: right;
-							transform: rotate(90deg);
-							font-size: 14px;
-							pointer-events: none;
-						}
-					}
-				}
-			}
-		}
-	}
-}
-</style>
diff --git a/src/views/monitoring/equipmentAlarmLog/index.vue b/src/views/monitoring/equipmentAlarmLog/index.vue
deleted file mode 100644
index f240cc20..00000000
--- a/src/views/monitoring/equipmentAlarmLog/index.vue
+++ /dev/null
@@ -1,313 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<!-- <base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="500px"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
-		</base-dialog> -->
-	</div>
-</template>
-
-<script>
-import {
-	createEquipmentAlarmLog,
-	updateEquipmentAlarmLog,
-	deleteEquipmentAlarmLog,
-	getEquipmentAlarmLog,
-	getEquipmentAlarmLogPage,
-	exportEquipmentAlarmLogExcel,
-} from '@/api/monitoring/equipmentAlarmLog';
-import Editor from '@/components/Editor';
-import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import { getAccessToken } from '@/utils/auth';
-import { getFactoryPage } from '@/api/core/base/factory';
-import { publicFormatter } from '@/utils/dict';
-
-export default {
-	name: 'EquipmentAlarmLog',
-	components: {
-		Editor,
-	},
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			searchBarKeys: ['checkTime'],
-			optionArrUrl: [getFactoryPage],
-			tableBtn: [
-				this.$auth.hasPermi('base:equipment-alarm-log:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-alarm-log:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'factoryName',
-					label: '工厂',
-				},
-				{ prop: 'productionLine', label: '产线' },
-				{ prop: 'workshopSection', label: '工段' },
-				{ prop: 'equipment', label: '设备名称' },
-				// {
-				// 	width: 90,
-				// 	prop: 'alarmGrade',
-				// 	label: '报警级别',
-				// 	filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
-				// },
-				{
-					prop: 'createTime',
-					label: '报警时间',
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				// { prop: 'alarmContent', label: '报警内容' },
-				// {
-				// 	_action: 'equipment-group-show-alert',
-				// 	label: '报警',
-				// 	,
-				// 	subcomponent: {
-				// 		props: ['injectData'],
-				// 		render: function (h) {
-				// 			const _this = this;
-				// 			return h(
-				// 				'el-button',
-				// 				{
-				// 					props: { type: 'text', size: 'mini' },
-				// 					on: {
-				// 						click: function () {
-				// 							console.log('inejctdata', _this.injectData);
-				// 							_this.$emit('emitData', {
-				// 								action: _this.injectData._action,
-				// 								// value: _this.injectData.id,
-				// 								value: _this.injectData,
-				// 							});
-				// 						},
-				// 					},
-				// 				},
-				// 				'查看报警'
-				// 			);
-				// 		},
-				// 	},
-				// },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'daterange', // datetimerange
-					// format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始日期',
-					endPlaceholder: '结束日期',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'createTime',
-					// width: 350,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-        factoryId: undefined,
-				createTime: [],
-			},
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {},
-		};
-	},
-	created() {
-		this.getArr();
-		this.getList();
-	},
-	methods: {
-		getArr() {
-			const params = {
-				page: 1,
-				limit: 500,
-			};
-			this.optionArrUrl.forEach((item, index) => {
-				item(params).then((response) => {
-					this.searchBarFormConfig[index].selectOptions = response.data.list;
-				});
-			});
-		},
-		/** 重写 basicPageMixin 里的 handleSearchBarBtnClick */
-		handleSearchBarBtnClick(btn) {
-			// 仅查询一种情况
-			this.queryParams.factoryId = btn.factoryId;
-			this.queryParams.createTime = btn.createTime;
-			this.handleQuery();
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentAlarmLogPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				alarmId: undefined,
-				alarmContent: undefined,
-				alarmValue: undefined,
-				alarmEquipmentId: undefined,
-				remark: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备报警日志';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentAlarmLog(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备报警日志';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentAlarmLog(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentAlarmLog(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除设备报警日志编号为"' + id + '"的数据项?')
-				.then(function () {
-					return deleteEquipmentAlarmLog(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备报警日志数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentAlarmLogExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备报警日志.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/monitoring/equipmentAlarmRealtime/index.vue b/src/views/monitoring/equipmentAlarmRealtime/index.vue
deleted file mode 100644
index b5e7080b..00000000
--- a/src/views/monitoring/equipmentAlarmRealtime/index.vue
+++ /dev/null
@@ -1,326 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<el-form
-			:model="queryParams"
-			ref="queryForm"
-			size="small"
-			:inline="true"
-			v-show="showSearch"
-			label-width="68px">
-			<el-form-item label="创建时间" prop="createTime">
-				<el-date-picker
-					v-model="queryParams.createTime"
-					style="width: 240px"
-					value-format="yyyy-MM-dd HH:mm:ss"
-					type="daterange"
-					range-separator="-"
-					start-placeholder="开始日期"
-					end-placeholder="结束日期"
-					:default-time="['00:00:00', '23:59:59']" />
-			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" icon="el-icon-search" @click="handleQuery">
-					搜索
-				</el-button>
-				<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-			</el-form-item>
-		</el-form>
-
-		<!-- 操作工具栏 -->
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['monitoring:equipment-alarm-realtime:create']">
-					新增
-				</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					:loading="exportLoading"
-					v-hasPermi="['monitoring:equipment-alarm-realtime:export']">
-					导出
-				</el-button>
-			</el-col>
-			<right-toolbar
-				:showSearch.sync="showSearch"
-				@queryTable="getList"></right-toolbar>
-		</el-row>
-
-		<!-- 列表 -->
-		<el-table v-loading="loading" :data="list">
-			<el-table-column label="id" align="center" prop="id" />
-			<el-table-column
-				label="报警信息ID，关联base_equipment_group_alarm表"
-				align="center"
-				prop="alarmId" />
-			<el-table-column
-				label="字符型报警编码"
-				align="center"
-				prop="alarmContent" />
-			<el-table-column label="报警详细描述" align="center" prop="description" />
-			<el-table-column
-				label="报警设备id 关联equipment表"
-				align="center"
-				prop="alarmEquipmentId" />
-			<el-table-column label="实时报警值" align="center" prop="alarmValue" />
-			<el-table-column
-				label="状态，0 正常 1 报警中"
-				align="center"
-				prop="alarmStatus" />
-			<el-table-column
-				label="创建时间"
-				align="center"
-				prop="createTime"
-				width="180">
-				<template v-slot="scope">
-					<span>{{ parseTime(scope.row.createTime) }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column
-				label="操作"
-				align="center"
-				class-name="small-padding fixed-width">
-				<template v-slot="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['monitoring:equipment-alarm-realtime:update']">
-						修改
-					</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['monitoring:equipment-alarm-realtime:delete']">
-						删除
-					</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<el-dialog
-			:title="title"
-			:visible.sync="open"
-			width="500px"
-			v-dialogDrag
-			append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item
-					label="报警信息ID，关联base_equipment_group_alarm表"
-					prop="alarmId">
-					<el-input
-						v-model="form.alarmId"
-						placeholder="请输入报警信息ID，关联base_equipment_group_alarm表" />
-				</el-form-item>
-				<el-form-item label="字符型报警编码">
-					<editor v-model="form.alarmContent" :min-height="192" />
-				</el-form-item>
-				<el-form-item label="报警详细描述">
-					<editor v-model="form.description" :min-height="192" />
-				</el-form-item>
-				<el-form-item
-					label="报警设备id 关联equipment表"
-					prop="alarmEquipmentId">
-					<el-input
-						v-model="form.alarmEquipmentId"
-						placeholder="请输入报警设备id 关联equipment表" />
-				</el-form-item>
-				<el-form-item label="实时报警值" prop="alarmValue">
-					<el-input v-model="form.alarmValue" placeholder="请输入实时报警值" />
-				</el-form-item>
-				<el-form-item label="状态，0 正常 1 报警中" prop="alarmStatus">
-					<el-radio-group v-model="form.alarmStatus">
-						<el-radio label="1">请选择字典生成</el-radio>
-					</el-radio-group>
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	createEquipmentAlarmRealtime,
-	updateEquipmentAlarmRealtime,
-	deleteEquipmentAlarmRealtime,
-	getEquipmentAlarmRealtime,
-	getEquipmentAlarmRealtimePage,
-	exportEquipmentAlarmRealtimeExcel,
-} from '@/api/monitoring/equipmentAlarmRealtime';
-import Editor from '@/components/Editor';
-
-export default {
-	name: 'EquipmentAlarmRealtime',
-	components: {
-		Editor,
-	},
-	data() {
-		return {
-			// 遮罩层
-			loading: true,
-			// 导出遮罩层
-			exportLoading: false,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 设备报警实时信息列表
-			list: [],
-			// 弹出层标题
-			title: '',
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				createTime: [],
-			},
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {},
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentAlarmRealtimePage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				alarmId: undefined,
-				alarmContent: undefined,
-				description: undefined,
-				alarmEquipmentId: undefined,
-				alarmValue: undefined,
-				alarmStatus: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备报警实时信息';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentAlarmRealtime(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备报警实时信息';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentAlarmRealtime(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentAlarmRealtime(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除设备报警实时信息编号为"' + id + '"的数据项?')
-				.then(function () {
-					return deleteEquipmentAlarmRealtime(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备报警实时信息数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentAlarmRealtimeExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备报警实时信息.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue
deleted file mode 100644
index ba262b1a..00000000
--- a/src/views/monitoring/equipmentFullParams/index.vue
+++ /dev/null
@@ -1,289 +0,0 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-08-31 09:14:19
-    description: 设备全参数查询
--->
-
-<template>
-	<div class="app-container full-param-page">
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<div
-			v-if="tableList.length"
-			class="tables">
-			<div class="custom-table" v-for="table in tableList" :key="table.key">
-				<!-- {{ JSON.stringify(spanMethod) }} -->
-				<base-table
-					:key="table.key + '__basetable'"
-					:table-props="table.tableProps"
-					:table-data="table.dataManager?.dataList ?? []"
-					:span-method="spanMethod"
-					:max-height="tableH"
-					@emitFun="(val) => handleEmitFun(table, val)"></base-table>
-				<pagination
-					:key="table.key + '__pagination'"
-					v-show="table.total > 0"
-					:total="table.total"
-					:page.sync="table.pageNo"
-					:limit.sync="table.pageSize"
-					:page-size="table.pageSize"
-					:page-sizes="[1, 3, 5, 10, 20]"
-					@pagination="
-						({ page, limit, current }) =>
-							getListFor(table, { page, limit, current })
-					" />
-			</div>
-		</div>
-		<div v-else class="no-data-bg"></div>
-	</div>
-</template>
-
-<script>
-import LocalDataManager from './utils/local-data-manager';
-// import response from './response';
-import moment from 'moment';
-import { parseTime } from '@/filter/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-
-export default {
-	name: 'EquipmentFullParams',
-	mixins: [tableHeightMixin],
-	components: {},
-	props: {},
-	data() {
-		const now = new Date();
-		const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
-		const today = new Date(y, m, d, 0, 0, 0, 0).getTime();
-		const aWeekAgo = today - 3600 * 1000 * 24 * 7;
-		return {
-			tableList: [],
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '设备名称',
-					placeholder: '请输入设备名称',
-					param: 'name',
-					disabled: true,
-				},
-				{
-					type: 'input',
-					label: '设备编码',
-					placeholder: '请输入设备编码',
-					param: 'code',
-					disabled: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'datetimerange', // datetimerange
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					// valueFormat: 'timestamp',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'timeVal',
-					width: 350,
-					// defaultSelect: [new Date(aWeekAgo), new Date(today)],
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-			queryParams: {
-				equipmentId: null,
-				recordTime: null,
-			},
-			tableList: [
-				// {
-				// 	key: 'base-table__key__1',
-				// 	tableProps: [],
-				// 	list: [],
-				// 	pageNo: 1,
-				// 	pageSize: 3,
-				// 	total: 0,
-				// },
-			],
-		};
-	},
-	computed: {
-		id() {
-			return this.$route.params.equipmentId;
-		},
-		code() {
-			return this.$route.params.equipmentCode;
-		},
-		name() {
-			return this.$route.params.equipmentName;
-		},
-	},
-	mounted() {
-		if (this.id) this.$set(this.queryParams, 'equipmentId', this.id);
-		if (this.name)
-			this.$set(this.searchBarFormConfig[0], 'defaultSelect', this.name);
-		if (this.code)
-			this.$set(this.searchBarFormConfig[1], 'defaultSelect', this.code);
-		const end = new Date();
-		const start = new Date() - 1800 * 1000;
-		this.queryParams.recordTime = [parseTime(start), parseTime(end)];
-		this.searchBarFormConfig[2].startPlaceholder = parseTime(start);
-		this.searchBarFormConfig[2].endPlaceholder = parseTime(end);
-		this.handleQuery();
-		// this.handleResponse();
-	},
-	methods: {
-		buildProps(table) {
-			console.log('building props', table);
-			// 通过 otherList 来构建 props
-			const { otherList } = table;
-			const props = [
-				{
-					// type: 'index',
-					width: 48,
-					prop: 'index',
-					label: '序号',
-				},
-				{
-					width: 160,
-					prop: 'time',
-					label: '时间',
-				},
-				{
-					width: 200,
-					prop: 'plcCode',
-					label: 'PLC编码',
-				},
-			];
-			const firstLineData = {
-				index: '参考值： [最小]-[最大][/标准]',
-				time: null, // 此处必须是空白
-				plcCode: null, // 此处必须是空白
-			};
-			otherList.forEach((item) => {
-				props.push({
-					label: item.name,
-					prop: item.name,
-					width: 128,
-				});
-				firstLineData[item.name] = `${item.minValue ?? ''}-${
-					item.maxValue ?? ''
-				}${item.defaultValue != null ? '/' + item.defaultValue : ''}`;
-			});
-			return { props, firstLineData };
-		},
-
-		handleResponse(response) {
-			const { code, data } = response;
-			if (code == 0) {
-				// 处理一个表格
-				data.forEach((table, index) => {
-					console.log('handle index:', index, table);
-					const { props: tableProps, firstLineData } = this.buildProps(table);
-					this.$set(this.tableList, index, {
-						key: 'base-table__key__' + index,
-						tableProps,
-						list: [firstLineData],
-						dataManager: null,
-						pageNo: 1,
-						pageSize: 5,
-						total: 0,
-					});
-
-					// 处理某一表格的各个行
-					const { data } = table;
-					if (data) {
-						data.forEach((row, idx) => {
-							const listItem = {
-								index: idx + 1,
-								time: moment(+row.time).format('YYYY-MM-DD HH:mm:ss'),
-								plcCode: row.plcCode,
-							};
-							row.data.forEach((column) => {
-								listItem[column.dynamicName] = column.dynamicValue;
-							});
-							this.tableList[index].list.push(listItem);
-							this.tableList[index].total++;
-						});
-
-						// 处理分页
-						const { pageNo, pageSize, list } = this.tableList[index];
-						this.tableList[index].dataManager = new LocalDataManager(
-							list,
-							pageNo,
-							pageSize
-						);
-					}
-				});
-			}
-		},
-
-		spanMethod({ row, column, rowIndex, columnIndex }) {
-			if (rowIndex == 0 && columnIndex == 0) {
-				return [1, 3];
-			} else if (rowIndex == 0 && (columnIndex == 1 || columnIndex == 2)) {
-				return [0, 0];
-			}
-			return [1, 1];
-		},
-
-		/** 查询 */
-		async handleQuery() {
-			this.handleResponse(
-				await this.$axios({
-					url: '/monitoring/equipment-monitor/runLog',
-					method: 'get',
-					params: this.queryParams,
-				})
-			);
-		},
-
-		async handleSearchBarBtnClick({ btnName, timeVal }) {
-			this.searchBarFormConfig[2].startPlaceholder = '开始时间';
-			this.searchBarFormConfig[2].endPlaceholder = '结束时间';
-			if (timeVal && timeVal.length > 0) {
-				this.queryParams.recordTime = timeVal;
-			} else {
-				this.queryParams.recordTime = [];
-			}
-			await this.handleQuery();
-		},
-
-		handleEmitFun(table, val) {
-			console.log('table val', table, val);
-		},
-
-		/** 为某个 table 获取 list 数据 */
-		getListFor(table, { page, limit, current }) {
-			console.log('get list for', table, { page, limit, current });
-			table.dataManager.pageNo = page ?? current;
-			table.dataManager.pageSize = limit;
-		},
-	},
-};
-</script>
-
-<style scoped>
-.full-param-page {
-	position: relative;
-}
-
-.tables {
-	display: grid;
-	grid-template-columns: 1fr 1fr;
-	gap: 18px;
-}
-.tables >>> .baseTable {
-	overflow-x: hidden;
-}
-
-.custom-table {
-	overflow-x: hidden;
-}
-</style>
diff --git a/src/views/monitoring/equipmentFullParams/response.js b/src/views/monitoring/equipmentFullParams/response.js
deleted file mode 100644
index d984f34e..00000000
--- a/src/views/monitoring/equipmentFullParams/response.js
+++ /dev/null
@@ -1,247 +0,0 @@
-export default {
-	"code": 0,
-	"data": [
-		// 一个表格
-		{
-			"data": [
-				// 一行参数
-				{
-					"time": "1694056192800",
-					"plcCode": "PLC_CODE_1",
-					"data": [
-						// 一个参数值
-						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
-						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
-						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
-						{ "id": 'param-4', "parentId": 0, "dynamicName": "P1V4", "dynamicValue": 15 },
-						{ "id": 'param-5', "parentId": 0, "dynamicName": "P1V5", "dynamicValue": 15 },
-						{ "id": 'param-6', "parentId": 0, "dynamicName": "P1V6", "dynamicValue": 15 },
-					]
-				}
-			],
-			"otherList": [
-				// 一个参数的属性
-				{
-					"id": "attr-1",
-					"plcParamName": "P1V1",
-					"name": "P1V1", // 和 dynamicName 对应
-					"minValue": 1,
-					"maxValue": 100
-				},
-				{
-					"id": "attr-2",
-					"plcParamName": "P1V2",
-					"name": "P1V2",
-					"minValue": 10,
-					"maxValue": 90,
-					"defaultValue": 24
-				},
-				{
-					"id": "attr-3",
-					"plcParamName": "P1V3",
-					"name": "P1V3",
-					"minValue": 10,
-					"maxValue": 98
-				},
-				{
-					"id": "attr-4",
-					"plcParamName": "P1V4",
-					"name": "P1V4",
-					"minValue": 10,
-					"maxValue": 90
-				},
-				{
-					"id": "attr-5",
-					"plcParamName": "P1V5",
-					"name": "P1V5",
-					"minValue": null,
-					"maxValue": null
-				},
-				{
-					"id": "attr-6",
-					"plcParamName": "P1V6",
-					"name": "P1V6",
-					"minValue": null,
-					"maxValue": null,
-					"defaultValue": false
-				},
-			],
-			"nameData": [],
-			"otherMap": []
-		},
-		// 一个表格
-		{
-			"data": [
-				// 一行参数
-				{
-					"time": "1694056100800",
-					"plcCode": "PLC_CODE_2",
-					"data": [
-						// 一个参数值
-						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
-						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
-						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
-
-					]
-				},
-				{
-					"time": "1694056102800",
-					"plcCode": "PLC_CODE_2",
-					"data": [
-						// 一个参数值
-						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
-						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
-						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
-
-					]
-				}
-			],
-			"otherList": [
-				// 一个参数的属性
-				{
-					"id": "attr-1",
-					"plcParamName": "P1V1",
-					"name": "P1V1", // 和 dynamicName 对应
-					"minValue": 1,
-					"maxValue": 100
-				},
-				{
-					"id": "attr-2",
-					"plcParamName": "P1V2",
-					"name": "P1V2",
-					"minValue": 10,
-					"maxValue": 90
-				},
-				{
-					"id": "attr-3",
-					"plcParamName": "P1V3",
-					"name": "P1V3",
-					"minValue": 10,
-					"maxValue": 98
-				},
-			],
-			"nameData": [],
-			"otherMap": []
-		},
-		// 一个表格
-		{
-			"data": [
-				// 一行参数
-				{
-					"time": "1694056100800",
-					"plcCode": "PLC_CODE_2",
-					"data": [
-						// 一个参数值
-						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
-						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
-						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
-
-					]
-				},
-				{
-					"time": "1694056102800",
-					"plcCode": "PLC_CODE_2",
-					"data": [
-						// 一个参数值
-						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
-						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
-						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
-
-					]
-				},
-				{
-					"time": "1694056109800",
-					"plcCode": "PLC_CODE_2",
-					"data": [
-						// 一个参数值
-						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
-						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
-						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
-
-					]
-				},
-				{
-					"time": "1694066109800",
-					"plcCode": "PLC_CODE_2",
-					"data": [
-						// 一个参数值
-						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
-						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
-						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
-
-					]
-				},
-				{
-					"time": "1694067109800",
-					"plcCode": "PLC_CODE_2",
-					"data": [
-						// 一个参数值
-						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
-						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
-						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
-
-					]
-				},
-				{
-					"time": "1694068109800",
-					"plcCode": "PLC_CODE_2",
-					"data": [
-						// 一个参数值
-						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
-						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
-						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
-
-					]
-				},
-				{
-					"time": "1694069109800",
-					"plcCode": "PLC_CODE_2",
-					"data": [
-						// 一个参数值
-						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
-						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
-						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
-
-					]
-				},
-				{
-					"time": "1694071109800",
-					"plcCode": "PLC_CODE_2",
-					"data": [
-						// 一个参数值
-						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
-						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
-						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
-
-					]
-				}
-			],
-			"otherList": [
-				// 一个参数的属性
-				{
-					"id": "attr-1",
-					"plcParamName": "P1V1",
-					"name": "P1V1", // 和 dynamicName 对应
-					"minValue": 1,
-					"maxValue": 100
-				},
-				{
-					"id": "attr-2",
-					"plcParamName": "P1V2",
-					"name": "P1V2",
-					"minValue": 10,
-					"maxValue": 90
-				},
-				{
-					"id": "attr-3",
-					"plcParamName": "P1V3",
-					"name": "P1V3",
-					"minValue": 10,
-					"maxValue": 98
-				}
-			],
-			"nameData": [],
-			"otherMap": []
-		}
-	]
-}
diff --git a/src/views/monitoring/equipmentFullParams/utils/local-data-manager.js b/src/views/monitoring/equipmentFullParams/utils/local-data-manager.js
deleted file mode 100644
index 5d8c76fd..00000000
--- a/src/views/monitoring/equipmentFullParams/utils/local-data-manager.js
+++ /dev/null
@@ -1,36 +0,0 @@
-export default class LocalDataManager {
-    constructor(dataList, pageNo, pageSize) {
-        this._dataListStore = dataList;
-        this._pageNo = pageNo;
-        this._pageSize = pageSize;
-    }
-
-    set pageNo(pageNo) {
-        console.log('set pageNo', pageNo);
-        this._pageNo = pageNo;
-    }
-
-    set pageSize(pageSize) {
-        console.log('set pageSize', pageSize);
-        this._pageSize = pageSize;
-    }
-
-    get dataList() {
-        const firstLine = this._dataListStore[0];
-        const realDataList = this._dataListStore.slice(1);
-        return [
-            firstLine,
-            ...realDataList.slice((this._pageNo - 1) * this._pageSize, this._pageNo * this._pageSize)
-        ]
-    }
-
-    get total() {
-        return this._dataListStore.length;
-    }
-
-    deleteData(id) {
-        const idx = this._dataListStore.findIndex(item => item.id == id);
-        this._dataListStore.splice(idx, 1);
-        // send http request
-    }
-}
\ No newline at end of file
diff --git a/src/views/monitoring/equipmentProcessAmount/data.js b/src/views/monitoring/equipmentProcessAmount/data.js
deleted file mode 100644
index 34af77cd..00000000
--- a/src/views/monitoring/equipmentProcessAmount/data.js
+++ /dev/null
@@ -1,2323 +0,0 @@
-const edata = [
-      {
-          "equipmentId": 1,
-          "equipmentName": "1-穿梭机",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 1,
-          "sectionName": "1-穿梭机",
-          "inQuantity": 0,
-          "outQuantity": 1687,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 1687,
-          "passRate": 0.0,
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 2,
-          "equipmentName": "1-上片机械手1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 2,
-          "sectionName": "1-上片",
-          "inQuantity": 5580,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 3,
-          "equipmentName": "1-上片机械手2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 2,
-          "sectionName": "1-上片",
-          "inQuantity": -60385,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "-Infinity",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 4,
-          "equipmentName": "1-上片机械手3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 2,
-          "sectionName": "1-上片",
-          "inQuantity": 5086,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 5,
-          "equipmentName": "1-磨边机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 3,
-          "sectionName": "1-磨边",
-          "inQuantity": 5924,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 6,
-          "equipmentName": "1-磨边机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 3,
-          "sectionName": "1-磨边",
-          "inQuantity": 5707,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 7,
-          "equipmentName": "1-磨边机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 3,
-          "sectionName": "1-磨边",
-          "inQuantity": 5917,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 8,
-          "equipmentName": "1-磨边清洗机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 4,
-          "sectionName": "1-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 9,
-          "equipmentName": "1-磨边清洗机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 4,
-          "sectionName": "1-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 10,
-          "equipmentName": "1-磨边清洗机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 4,
-          "sectionName": "1-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 11,
-          "equipmentName": "1-打孔机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 5,
-          "sectionName": "1-打孔",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 12,
-          "equipmentName": "1-打孔机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 5,
-          "sectionName": "1-打孔",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 13,
-          "equipmentName": "1-打孔机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 5,
-          "sectionName": "1-打孔",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 14,
-          "equipmentName": "1-打孔清洗机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 6,
-          "sectionName": "1-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 15,
-          "equipmentName": "1-打孔清洗机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 6,
-          "sectionName": "1-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 16,
-          "equipmentName": "1-打孔清洗机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 6,
-          "sectionName": "1-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 17,
-          "equipmentName": "1-丝印机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 7,
-          "sectionName": "1-丝印",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 18,
-          "equipmentName": "1-丝印机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 7,
-          "sectionName": "1-丝印",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 19,
-          "equipmentName": "1-丝印机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 7,
-          "sectionName": "1-丝印",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 20,
-          "equipmentName": "1-一次固化机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 8,
-          "sectionName": "1-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 17546,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 17546,
-          "passRate": 0.0,
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 21,
-          "equipmentName": "1-一次固化机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 8,
-          "sectionName": "1-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 22,
-          "equipmentName": "1-一次固化机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 8,
-          "sectionName": "1-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 23,
-          "equipmentName": "1-钢化炉",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 9,
-          "sectionName": "1-钢化",
-          "inQuantity": 0,
-          "outQuantity": 17557,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 17557,
-          "passRate": 0.0,
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 24,
-          "equipmentName": "1-包装清洗机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 10,
-          "sectionName": "1-包装清洗",
-          "inQuantity": 12191,
-          "outQuantity": 12188,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 12188,
-          "passRate": 1.0002462,
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 25,
-          "equipmentName": "1-包装清洗机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 10,
-          "sectionName": "1-包装清洗",
-          "inQuantity": 5364,
-          "outQuantity": 5364,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5364,
-          "passRate": 1.0,
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 26,
-          "equipmentName": "1-铺纸机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 27,
-          "equipmentName": "1-铺纸机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 28,
-          "equipmentName": "1-下片机械手1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 0,
-          "outQuantity": 3442,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 3442,
-          "passRate": 0.0,
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 29,
-          "equipmentName": "1-下片机械手2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 0,
-          "outQuantity": 6778,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6778,
-          "passRate": 0.0,
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 30,
-          "equipmentName": "1-下片机械手3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 0,
-          "outQuantity": 7307,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 7307,
-          "passRate": 0.0,
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 31,
-          "equipmentName": "1-质检仪1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 3,
-          "sectionName": "1-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 662,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 32,
-          "equipmentName": "1-桥检1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 60,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 33,
-          "equipmentName": "1-桥检2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 11,
-          "sectionName": "1-包装",
-          "inQuantity": 16,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 293,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 34,
-          "equipmentName": "2-穿梭机",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 13,
-          "sectionName": "2-穿梭机",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 35,
-          "equipmentName": "2-上片机械手1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 14,
-          "sectionName": "2-上片",
-          "inQuantity": -59154,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "-Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 36,
-          "equipmentName": "2-上片机械手2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 14,
-          "sectionName": "2-上片",
-          "inQuantity": -59806,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "-Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 37,
-          "equipmentName": "2-上片机械手3",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 14,
-          "sectionName": "2-上片",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 38,
-          "equipmentName": "2-磨边机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 15,
-          "sectionName": "2-磨边",
-          "inQuantity": 6115,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 39,
-          "equipmentName": "2-磨边机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 15,
-          "sectionName": "2-磨边",
-          "inQuantity": 5963,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 40,
-          "equipmentName": "2-磨边清洗机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 16,
-          "sectionName": "2-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 6089,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6089,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 41,
-          "equipmentName": "2-磨边清洗机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 16,
-          "sectionName": "2-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 5932,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5932,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 42,
-          "equipmentName": "2-打孔机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 17,
-          "sectionName": "2-打孔",
-          "inQuantity": 0,
-          "outQuantity": 6069,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6069,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 43,
-          "equipmentName": "2-打孔机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 17,
-          "sectionName": "2-打孔",
-          "inQuantity": 5913,
-          "outQuantity": 5911,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5911,
-          "passRate": 1.0003383,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 44,
-          "equipmentName": "2-打孔清洗机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 18,
-          "sectionName": "2-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 6069,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6069,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 45,
-          "equipmentName": "2-打孔清洗机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 18,
-          "sectionName": "2-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 5908,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5908,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 46,
-          "equipmentName": "2-丝印机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 19,
-          "sectionName": "2-丝印",
-          "inQuantity": 6059,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 47,
-          "equipmentName": "2-丝印机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 19,
-          "sectionName": "2-丝印",
-          "inQuantity": 5896,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 48,
-          "equipmentName": "2-二次固化机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 20,
-          "sectionName": "2-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 6059,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6059,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 49,
-          "equipmentName": "2-二次固化机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 20,
-          "sectionName": "2-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 5894,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5894,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 50,
-          "equipmentName": "2-钢化炉",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 21,
-          "sectionName": "2-钢化",
-          "inQuantity": 11953,
-          "outQuantity": 11925,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 11925,
-          "passRate": 1.0023481,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 51,
-          "equipmentName": "2-包装清洗机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 22,
-          "sectionName": "2-包装清洗",
-          "inQuantity": 11896,
-          "outQuantity": 11925,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 11925,
-          "passRate": 0.99756813,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 52,
-          "equipmentName": "2-铺纸机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 23,
-          "sectionName": "2-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 53,
-          "equipmentName": "2-铺纸机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 23,
-          "sectionName": "2-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 54,
-          "equipmentName": "2-下片机械手1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 23,
-          "sectionName": "2-包装",
-          "inQuantity": 0,
-          "outQuantity": 5766,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 5766,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 55,
-          "equipmentName": "2-下片机械手2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 23,
-          "sectionName": "2-包装",
-          "inQuantity": 0,
-          "outQuantity": 6101,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6101,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 56,
-          "equipmentName": "2-质检仪",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 15,
-          "sectionName": "2-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 11896,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 57,
-          "equipmentName": "2-桥检1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 23,
-          "sectionName": "2-包装",
-          "inQuantity": 177,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 536,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 58,
-          "equipmentName": "2-桥检2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 23,
-          "sectionName": "2-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 59,
-          "equipmentName": "3-穿梭机",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 25,
-          "sectionName": "3-穿梭机",
-          "inQuantity": 0,
-          "outQuantity": 59,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 59,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 60,
-          "equipmentName": "3-上片机械手1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 26,
-          "sectionName": "3-上片",
-          "inQuantity": -62681,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "-Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 61,
-          "equipmentName": "3-上片机械手2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 26,
-          "sectionName": "3-上片",
-          "inQuantity": 3603,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 62,
-          "equipmentName": "3-上片机械手3",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 26,
-          "sectionName": "3-上片",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 63,
-          "equipmentName": "3-磨边机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 27,
-          "sectionName": "3-磨边",
-          "inQuantity": 3193,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 64,
-          "equipmentName": "3-磨边机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 27,
-          "sectionName": "3-磨边",
-          "inQuantity": 3334,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 65,
-          "equipmentName": "3-磨边清洗机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 28,
-          "sectionName": "3-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 3341,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 3341,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 66,
-          "equipmentName": "3-磨边清洗机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 28,
-          "sectionName": "3-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 3188,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 3188,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 67,
-          "equipmentName": "3-打孔机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 29,
-          "sectionName": "3-打孔",
-          "inQuantity": 3344,
-          "outQuantity": 3342,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 3342,
-          "passRate": 1.0005984,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 68,
-          "equipmentName": "3-打孔机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 29,
-          "sectionName": "3-打孔",
-          "inQuantity": 0,
-          "outQuantity": 3172,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 3172,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 69,
-          "equipmentName": "3-打孔清洗机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 30,
-          "sectionName": "3-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 3340,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 3340,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 70,
-          "equipmentName": "3-打孔清洗机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 30,
-          "sectionName": "3-打孔清洗",
-          "inQuantity": 0,
-          "outQuantity": 3170,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 3170,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 71,
-          "equipmentName": "3-丝印机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 31,
-          "sectionName": "3-丝印",
-          "inQuantity": 3364,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 72,
-          "equipmentName": "3-丝印机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 31,
-          "sectionName": "3-丝印",
-          "inQuantity": 3179,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 73,
-          "equipmentName": "3-二次固化机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 32,
-          "sectionName": "3-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 3362,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 3362,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 74,
-          "equipmentName": "3-二次固化机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 32,
-          "sectionName": "3-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 3178,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 3178,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 75,
-          "equipmentName": "3-钢化炉",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 33,
-          "sectionName": "3-钢化",
-          "inQuantity": 6558,
-          "outQuantity": 6587,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6587,
-          "passRate": 0.99559736,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 76,
-          "equipmentName": "3-包装清洗机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 34,
-          "sectionName": "3-包装清洗",
-          "inQuantity": 6585,
-          "outQuantity": 6585,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6585,
-          "passRate": 1.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 77,
-          "equipmentName": "3-铺纸机1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 35,
-          "sectionName": "3-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 78,
-          "equipmentName": "3-铺纸机2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 35,
-          "sectionName": "3-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 79,
-          "equipmentName": "3-下片机械手1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 35,
-          "sectionName": "3-包装",
-          "inQuantity": 0,
-          "outQuantity": 3190,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 3190,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 80,
-          "equipmentName": "3-下片机械手2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 35,
-          "sectionName": "3-包装",
-          "inQuantity": 0,
-          "outQuantity": 3392,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 3392,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 81,
-          "equipmentName": "3-质检仪",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 27,
-          "sectionName": "3-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 89,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 82,
-          "equipmentName": "3-桥检1",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 35,
-          "sectionName": "3-包装",
-          "inQuantity": 77,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 417,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 83,
-          "equipmentName": "3-桥检2",
-          "lineId": "1686260211054157825",
-          "lineName": "产线3",
-          "sectionId": 35,
-          "sectionName": "3-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 84,
-          "equipmentName": "4-穿梭机",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 37,
-          "sectionName": "4-穿梭机",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 85,
-          "equipmentName": "4-上片机械手1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 38,
-          "sectionName": "4-上片",
-          "inQuantity": 6926,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 86,
-          "equipmentName": "4-上片机械手2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 38,
-          "sectionName": "4-上片",
-          "inQuantity": 6396,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 87,
-          "equipmentName": "4-上片机械手3",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 38,
-          "sectionName": "4-上片",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 88,
-          "equipmentName": "4-磨边机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 39,
-          "sectionName": "4-磨边",
-          "inQuantity": 6692,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 89,
-          "equipmentName": "4-磨边机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 39,
-          "sectionName": "4-磨边",
-          "inQuantity": 6602,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 90,
-          "equipmentName": "4-磨边清洗机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 40,
-          "sectionName": "4-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 6691,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6691,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 91,
-          "equipmentName": "4-磨边清洗机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 40,
-          "sectionName": "4-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 6596,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6596,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 92,
-          "equipmentName": "4-一次镀膜机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 41,
-          "sectionName": "4-一次镀膜",
-          "inQuantity": 6673,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 93,
-          "equipmentName": "4-一次镀膜机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 41,
-          "sectionName": "4-一次镀膜",
-          "inQuantity": 6578,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 94,
-          "equipmentName": "4-一次固化机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 42,
-          "sectionName": "4-一次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 95,
-          "equipmentName": "4-一次固化机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 42,
-          "sectionName": "4-一次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 96,
-          "equipmentName": "4-二次镀膜机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 43,
-          "sectionName": "4-二次镀膜",
-          "inQuantity": 6674,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 97,
-          "equipmentName": "4-二次镀膜机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 43,
-          "sectionName": "4-二次镀膜",
-          "inQuantity": 6579,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 98,
-          "equipmentName": "4-二次固化机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 44,
-          "sectionName": "4-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 6674,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6674,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 99,
-          "equipmentName": "4-二次固化机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 44,
-          "sectionName": "4-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 6580,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6580,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 100,
-          "equipmentName": "4-钢化炉",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 45,
-          "sectionName": "4-钢化",
-          "inQuantity": 13260,
-          "outQuantity": 13251,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 13251,
-          "passRate": 1.0006791,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 101,
-          "equipmentName": "4-包装清洗机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 46,
-          "sectionName": "4-包装清洗",
-          "inQuantity": 13237,
-          "outQuantity": 13237,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 13237,
-          "passRate": 1.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 102,
-          "equipmentName": "4-铺纸机1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 47,
-          "sectionName": "4-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 103,
-          "equipmentName": "4-铺纸机2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 47,
-          "sectionName": "4-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 104,
-          "equipmentName": "4-下片机械手1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 47,
-          "sectionName": "4-包装",
-          "inQuantity": 0,
-          "outQuantity": 6441,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6441,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 105,
-          "equipmentName": "4-下片机械手2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 47,
-          "sectionName": "4-包装",
-          "inQuantity": 0,
-          "outQuantity": 6714,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6714,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 106,
-          "equipmentName": "4-质检仪",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 39,
-          "sectionName": "4-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 107,
-          "equipmentName": "4-桥检1",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 47,
-          "sectionName": "4-包装",
-          "inQuantity": 93,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 192,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 108,
-          "equipmentName": "4-桥检2",
-          "lineId": "1701892552632770122",
-          "lineName": "产线4",
-          "sectionId": 47,
-          "sectionName": "4-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 109,
-          "equipmentName": "5-穿梭机",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 49,
-          "sectionName": "5-穿梭机",
-          "inQuantity": 0,
-          "outQuantity": 15492,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 15492,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 110,
-          "equipmentName": "5-上片机械手1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 50,
-          "sectionName": "5-上片",
-          "inQuantity": 1539,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 111,
-          "equipmentName": "5-上片机械手2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 50,
-          "sectionName": "5-上片",
-          "inQuantity": 909,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 112,
-          "equipmentName": "5-上片机械手3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 50,
-          "sectionName": "5-上片",
-          "inQuantity": 579,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 113,
-          "equipmentName": "5-上片机械手4",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 50,
-          "sectionName": "5-上片",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 114,
-          "equipmentName": "5-磨边机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 51,
-          "sectionName": "5-磨边",
-          "inQuantity": 6403,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 115,
-          "equipmentName": "5-磨边机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 51,
-          "sectionName": "5-磨边",
-          "inQuantity": 6027,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 116,
-          "equipmentName": "5-磨边机3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 51,
-          "sectionName": "5-磨边",
-          "inQuantity": 6048,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 117,
-          "equipmentName": "5-磨边清洗机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 52,
-          "sectionName": "5-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 6410,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6410,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 118,
-          "equipmentName": "5-磨边清洗机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 52,
-          "sectionName": "5-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 6027,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6027,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 119,
-          "equipmentName": "5-磨边清洗机3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 52,
-          "sectionName": "5-磨边清洗",
-          "inQuantity": 0,
-          "outQuantity": 6051,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6051,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 120,
-          "equipmentName": "5-一次镀膜机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 53,
-          "sectionName": "5-一次镀膜",
-          "inQuantity": 6383,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 121,
-          "equipmentName": "5-一次镀膜机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 53,
-          "sectionName": "5-一次镀膜",
-          "inQuantity": 6000,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 122,
-          "equipmentName": "5-一次镀膜机3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 53,
-          "sectionName": "5-一次镀膜",
-          "inQuantity": 6002,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 123,
-          "equipmentName": "5-一次固化机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 54,
-          "sectionName": "5-一次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 124,
-          "equipmentName": "5-一次固化机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 54,
-          "sectionName": "5-一次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 125,
-          "equipmentName": "5-一次固化机3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 54,
-          "sectionName": "5-一次固化",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 126,
-          "equipmentName": "5-二次镀膜机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 55,
-          "sectionName": "5-二次镀膜",
-          "inQuantity": 6383,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 127,
-          "equipmentName": "5-二次镀膜机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 55,
-          "sectionName": "5-二次镀膜",
-          "inQuantity": 6001,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 128,
-          "equipmentName": "5-二次镀膜机3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 55,
-          "sectionName": "5-二次镀膜",
-          "inQuantity": 5997,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 129,
-          "equipmentName": "5-二次固化机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 56,
-          "sectionName": "5-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 6385,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6385,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 130,
-          "equipmentName": "5-二次固化机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 56,
-          "sectionName": "5-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 6001,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6001,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 131,
-          "equipmentName": "5-二次固化机3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 56,
-          "sectionName": "5-二次固化",
-          "inQuantity": 0,
-          "outQuantity": 6003,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6003,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 132,
-          "equipmentName": "5-钢化炉",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 57,
-          "sectionName": "5-钢化",
-          "inQuantity": 18392,
-          "outQuantity": 18360,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 18360,
-          "passRate": 1.001743,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 133,
-          "equipmentName": "5-包装清洗机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 58,
-          "sectionName": "5-包装清洗",
-          "inQuantity": 12139,
-          "outQuantity": 12139,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 12139,
-          "passRate": 1.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 134,
-          "equipmentName": "5-包装清洗机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 58,
-          "sectionName": "5-包装清洗",
-          "inQuantity": 6218,
-          "outQuantity": 6218,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6218,
-          "passRate": 1.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 135,
-          "equipmentName": "5-铺纸机1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 136,
-          "equipmentName": "5-铺纸机2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0
-      },
-      {
-          "equipmentId": 137,
-          "equipmentName": "5-下片机械手1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 0,
-          "outQuantity": 4320,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 4320,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 138,
-          "equipmentName": "5-下片机械手2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 0,
-          "outQuantity": 6543,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 6543,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 139,
-          "equipmentName": "5-下片机械手3",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 0,
-          "outQuantity": 7441,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 7441,
-          "passRate": 0.0,
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 140,
-          "equipmentName": "5-质检仪1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 51,
-          "sectionName": "5-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 349,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 141,
-          "equipmentName": "5-质检仪2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 51,
-          "sectionName": "5-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 112,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 142,
-          "equipmentName": "5-桥检1",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 200,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 143,
-          "equipmentName": "5-桥检2",
-          "lineId": "1714562503683465331",
-          "lineName": "产线5",
-          "sectionId": 59,
-          "sectionName": "5-包装",
-          "inQuantity": 89,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 144,
-          "equipmentName": "1-储片机1",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 1,
-          "sectionName": "1-穿梭机",
-          "inQuantity": 5928,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 145,
-          "equipmentName": "1-储片机2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 1,
-          "sectionName": "1-穿梭机",
-          "inQuantity": 5705,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 146,
-          "equipmentName": "1-储片机3",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 1,
-          "sectionName": "1-穿梭机",
-          "inQuantity": 5922,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 147,
-          "equipmentName": "1-质检仪2",
-          "lineId": "1672847052717821953",
-          "lineName": "产线1",
-          "sectionId": 3,
-          "sectionName": "1-磨边",
-          "inQuantity": 0,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 307,
-          "totalQuantity": 0,
-          "passRate": "NaN",
-          "recordTime": 1732104000000,
-          "products": [
-              "测试切换"
-          ]
-      },
-      {
-          "equipmentId": 148,
-          "equipmentName": "2-镀膜机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 61,
-          "sectionName": "2-镀膜",
-          "inQuantity": 6058,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 149,
-          "equipmentName": "2-镀膜机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 61,
-          "sectionName": "2-镀膜",
-          "inQuantity": 5895,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 150,
-          "equipmentName": "2-储片机1",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 13,
-          "sectionName": "2-穿梭机",
-          "inQuantity": 6057,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      },
-      {
-          "equipmentId": 151,
-          "equipmentName": "2-储片机2",
-          "lineId": "1672847052717821954",
-          "lineName": "产线2",
-          "sectionId": 13,
-          "sectionName": "2-穿梭机",
-          "inQuantity": 5892,
-          "outQuantity": 0,
-          "okQuantity": 0,
-          "nokQuantity": 0,
-          "totalQuantity": 0,
-          "passRate": "Infinity",
-          "recordTime": 1732104000000
-      }
-  ]
-  export default edata
diff --git a/src/views/monitoring/equipmentProcessAmount/graph.vue b/src/views/monitoring/equipmentProcessAmount/graph.vue
deleted file mode 100644
index 22d2f63f..00000000
--- a/src/views/monitoring/equipmentProcessAmount/graph.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<!--
-    filename: graph.vue
-    author: liubin
-    date: 2023-08-31 14:00:02
-    description:
--->
-
-<template>
-	<div class="chart-wrapper">
-		<div class="blue-title">各设备加工数量</div>
-		<div class="chart" ref="chart"></div>
-	</div>
-</template>
-
-<script>
-import * as echarts from 'echarts';
-import edata from './data';
-
-export default {
-	name: 'LineChartInEquipmentProcessAmount',
-	components: {},
-	props: ['equipmentList', 'render'],
-	data() {
-		return {
-			chart: null,
-			option: {
-				color: ['#288AFF'],
-				grid: {
-					top: 64,
-					left: 56,
-					right: 64,
-					bottom: 56,
-				},
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'shadow',
-					},
-				},
-				title: {
-					show: false,
-					text: '各设备加工数量',
-					textStyle: {
-						color: '#232323',
-						fontSize: 16,
-					},
-					left: 'center',
-					top: 24,
-				},
-				toolbox: {
-					feature: {
-						dataZoom: {
-							xAxisIndex: false,
-						},
-						saveAsImage: {
-							pixelRatio: 2,
-						},
-					},
-				},
-				dataZoom: [
-					{
-						type: 'slider',
-						yAxisIndex: 0,
-						filterMode: 'none',
-					},
-					{
-						type: 'inside',
-						yAxisIndex: 0,
-						filterMode: 'none',
-					},
-				],
-				yAxis: {
-					type: 'category',
-					data: [],
-					name: '设备名',
-					nameTextStyle: {
-						fontSize: 14,
-					},
-				},
-				xAxis: {
-					type: 'value',
-					name: '数量',
-					nameTextStyle: {
-						fontSize: 14,
-					},
-				},
-				series: [
-					{
-						data: [],
-						type: 'bar',
-						barWidth: 20,
-						label: {
-							show: true,
-							distance: 50,
-							formatter: '{c}',
-						},
-						large: true,
-						largeThreshold: 20,
-					},
-				],
-			},
-		};
-	},
-	watch: {
-		render: {
-			handler: function (newVal, oldVal) {
-				if (!this.chart) this.chart = echarts.init(this.$refs.chart);
-				this.$nextTick(() => {
-					if (this.chart) this.chart.setOption(this.updateConfig(this.option),true);
-				});
-			},
-			deep: true,
-		},
-	},
-	beforeDestroy() {
-		if (this.chart) this.chart.dispose();
-	},
-	methods: {
-		updateConfig(config) {
-			let nameData = [];
-			let valueData = [];
-			this.equipmentList.map((eq) => {
-				nameData.push(eq.equipmentName);
-				valueData.push(eq.totalQuantity);
-			});
-			config.yAxis.data = nameData;
-			config.series[0].data = valueData;
-			return config;
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.chart-wrapper {
-	height: 100%;
-	flex: 1;
-	// background: #f9f9f9;
-}
-
-.chart {
-	height: 100%;
-	width: 100%;
-	// background: lightcoral;
-}
-
-.blue-title {
-	position: relative;
-	padding: 4px 0;
-	padding-left: 12px;
-	font-size: 14px;
-
-	&::before {
-		content: '';
-		position: absolute;
-		left: 0;
-		top: 6px;
-		height: 16px;
-		width: 4px;
-		border-radius: 1px;
-		background: #0b58ff;
-	}
-}
-</style>
diff --git a/src/views/monitoring/equipmentProcessAmount/index.vue b/src/views/monitoring/equipmentProcessAmount/index.vue
deleted file mode 100644
index 84cff804..00000000
--- a/src/views/monitoring/equipmentProcessAmount/index.vue
+++ /dev/null
@@ -1,573 +0,0 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-08-30 14:02:49
-    description: 设备加工数量
--->
-
-<template>
-	<div style="flex: 1; display: flex; background: #f2f4f9">
-		<div
-			class="app-container"
-			style="
-				margin-right: 12px;
-				border-radius: 8px;
-				background: #fff;
-				padding: 0;
-			">
-			<div
-				class="factory-list__selector"
-				style="margin: 12px"
-				title="点击切换工厂"
-				@mouseenter="factoryListOpen = true"
-				@mouseleave="factoryListOpen = false">
-				{{ currentFactory?.label || '点我选择工厂' }}
-				<div class="factory-list__wrapper" :class="{ open: factoryListOpen }">
-					<ul class="factory-list" v-if="sidebarContent.length">
-						<li
-							v-for="fc in sidebarContent"
-							:key="fc.id"
-							:data-value="fc.id"
-							class="factory-list__item"
-							@click.prevent="factoryChangeHandler(fc.id)"
-							:class="{ 'is-current': fc.id == currentFactory?.id }">
-							<span>
-								{{ fc.label }}
-							</span>
-							<svg-icon
-								v-if="fc.id == currentFactory?.id"
-								icon-class="Confirm"
-								style="height: 14px; width: 14px" />
-						</li>
-					</ul>
-					<div v-else style="color: #0008; width: 128px; text-align: center">
-						- 无 -
-					</div>
-				</div>
-			</div>
-			<!-- side bar  -->
-			<div class="side-bar__left" style="width: 240px; height: 100%">
-				<el-tree
-					class="custom-tree-class"
-					:data="currentFactory?.children"
-					:props="treeProps"
-					:empty-text="''"
-					icon-class="custom-icon-class"
-					@node-click="handleSidebarItemClick">
-					<!-- <div class="custom-tree-node" slot-scope="{ node, data }">
-						<span class="icon"></span>
-						<span>{{ node.label }}</span>
-					</div> -->
-				</el-tree>
-			</div>
-		</div>
-		<div
-			class="app-container equipment-process-amount"
-			style="flex: 1; border-radius: 8px; background: #fff">
-			<!-- main area  -->
-			<div class="main-content" style="display: flex; flex-direction: column">
-				<SearchBar
-					:formConfigs="searchBarFormConfig"
-					ref="search-bar"
-					@headBtnClick="handleSearchBarBtnClick" />
-
-				<el-row>
-					<el-col class="custom-tabs">
-						<el-tabs v-model="activeName" @tab-click="handleTabClick">
-							<el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
-								<base-table
-									v-if="mode == 'table'"
-									:table-props="tableProps"
-									:page="1"
-									:limit="999"
-									:table-data="list"
-									:max-height="tableH"
-									@emitFun="handleEmitFun">
-									<!-- <method-btn
-							v-if="tableBtn.length"
-						slot="handleBtn"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleTableBtnClick" /> -->
-								</base-table>
-							</el-tab-pane>
-							<el-tab-pane :label="'\u3000柱状图\u3000'" name="graph">
-								<div class="graph" style="height: 56vh">
-									<!-- graph  -->
-									<Graph
-										v-if="list.length"
-										:equipment-list="list"
-										:render="renderKey" />
-									<div v-if="list.length == 0" class="no-data-bg"></div>
-								</div>
-							</el-tab-pane>
-						</el-tabs>
-					</el-col>
-				</el-row>
-
-				<!-- <transition appear name="vvv" mode="out-in"></transition> -->
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-import Graph from './graph.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-
-export default {
-	name: 'EquipmentProcessAmount',
-	components: { Graph },
-	mixins: [tableHeightMixin],
-	props: {},
-	data() {
-		return {
-			renderKey: Math.random(),
-			factoryListOpen: false,
-			currentFactory: null,
-			factoryList: [
-				{ name: '1', value: 1 },
-				{ name: '2', value: 2 },
-				{ name: '3', value: 3 },
-				{ name: '4', value: 4 },
-				{ name: '5', value: 5 },
-				{ name: '6', value: 6 },
-			],
-			sidebarContent: [
-				// {
-				// 	id: 'fc1',
-				// 	name: '工厂',
-				// 	lines: [
-				// 		{
-				// 			name: '产线1',
-				// 			id: 'pl1',
-				// 			sections: [
-				// 				{
-				// 					name: '工段1',
-				// 					id: 'pl1ws1',
-				// 					equipments: [
-				// 						{
-				// 							name: '设备1',
-				// 							id: 'pl1ws1--eq1',
-				// 						},
-				// 						{
-				// 							name: '设备2',
-				// 							id: 'pl1ws1--eq2',
-				// 						},
-				// 						{
-				// 							name: '设备3',
-				// 							id: 'pl1ws1--eq3',
-				// 						},
-				// 					],
-				// 				},
-				// 				{
-				// 					name: '工段2',
-				// 					id: 'pl1ws2',
-				// 					equipments: [
-				// 						{
-				// 							name: '设备1',
-				// 							id: 'pl2ws1--eq1',
-				// 						},
-				// 						{
-				// 							name: '设备2',
-				// 							id: 'pl2ws1--eq2',
-				// 						},
-				// 						{
-				// 							name: '设备3',
-				// 							id: 'pl2ws1--eq3',
-				// 						},
-				// 					],
-				// 				},
-				// 				{
-				// 					name: '工段3',
-				// 					id: 'pl1ws3',
-				// 					equipments: [
-				// 						{
-				// 							name: '设备1',
-				// 							id: 'pl3ws1--eq1',
-				// 						},
-				// 						{
-				// 							name: '设备2',
-				// 							id: 'pl3ws1--eq2',
-				// 						},
-				// 						{
-				// 							name: '设备3',
-				// 							id: 'pl3ws1--eq3',
-				// 						},
-				// 					],
-				// 				},
-				// 			],
-				// 		},
-				// 		{
-				// 			name: '产线2',
-				// 			id: 'pl2',
-				// 			sections: [
-				// 				{
-				// 					name: '工段1',
-				// 					id: 'pl2ws1',
-				// 				},
-				// 				{
-				// 					name: '工段2',
-				// 					id: 'pl2ws2',
-				// 				},
-				// 				{
-				// 					name: '工段3',
-				// 					id: 'pl2ws3',
-				// 				},
-				// 			],
-				// 		},
-				// 	],
-				// },
-			],
-			activeName: 'table',
-			searchBarFormConfig: [
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'daterange', // datetimerange
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始日期',
-					endPlaceholder: '结束日期',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'timeVal',
-					width: 350,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '表格',
-				// 	name: 'table',
-				// 	plain: true,
-				// 	color: 'success',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '图表',
-				// 	name: 'graph',
-				// 	plain: true,
-				// 	color: 'warning',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			tableProps: [
-				{ prop: 'lineName', label: '产线' },
-				{ prop: 'sectionName', label: '工段' },
-				// { prop: 'externalCode', label: '设备编码' },
-				{ prop: 'equipmentId', label: '设备编码' },
-				{ prop: 'equipmentName', label: '设备名称' },
-				{ prop: 'totalQuantity', label: '加工数量[片]' },
-			],
-			mode: 'table', // table | graph
-			queryParams: {
-				// pageNo: 1,
-				// pageSize: 999,
-				recordTime: [],
-				equipmentId: null,
-				lineId: null,
-				sectionId: null,
-				productId: null,
-			},
-			list: [],
-			treeProps: {
-				children: 'children',
-				label: 'label',
-			},
-		};
-	},
-	mounted() {
-		this.getTree();
-	},
-	methods: {
-		/** build side bar tree */
-		buildTree(data) {
-			data.forEach((factory) => {
-				this.$set(factory, 'label', factory.name);
-				this.$set(factory, 'type', '工厂');
-				delete factory.name;
-				// factory.children = factory.lines;
-				// delete factory.lines;
-				factory.children?.forEach((line) => {
-					this.$set(line, 'label', line.name);
-					this.$set(line, 'type', '产线');
-					delete line.name;
-					// line.children = line.sections;
-					// delete line.sections;
-					line.children?.forEach((ws) => {
-						this.$set(ws, 'label', ws.name);
-						this.$set(ws, 'type', '工段');
-						delete ws.name;
-						// ws.children = ws.equipments;
-						// delete ws.equipments;
-						ws.children?.forEach((eq) => {
-							this.$set(eq, 'label', eq.name);
-							this.$set(eq, 'type', '设备');
-							delete eq.name;
-						});
-					});
-				});
-			});
-		},
-
-		async getTree() {
-			const { data } = await this.$axios('/base/factory/getTree');
-			this.sidebarContent = data;
-			this.buildTree(data);
-			console.log('tree', this.sidebarContent);
-		},
-
-		handleTabClick(tab, event) {
-			if (tab.name == 'graph') this.renderKey = Math.random();
-		},
-
-		factoryChangeHandler(id) {
-			this.factoryListOpen = false;
-			this.handleSidebarItemClick({ id: id, type: '工厂' });
-			this.currentFactory = this.sidebarContent.find((item) => item.id == id);
-		},
-
-		handleSidebarItemClick({ label, id, type }) {
-			console.log('label clicked!', label, id, type);
-			switch (type) {
-				case '设备':
-					this.queryParams.equipmentId = id;
-					break;
-				case '工段':
-					this.queryParams.equipmentId = null;
-					this.queryParams.sectionId = id;
-					break;
-				case '产线':
-					this.queryParams.equipmentId = null;
-					this.queryParams.sectionId = null;
-					this.queryParams.lineId = id;
-					break;
-				case '工厂':
-					this.queryParams.equipmentId = null;
-					this.queryParams.sectionId = null;
-					this.queryParams.lineId = null;
-					break;
-			}
-		},
-
-		handleEmitFun() {},
-
-		handleSearchBarBtnClick(btn) {
-			switch (btn.btnName) {
-				case 'table':
-					this.mode = 'table';
-					break;
-				case 'graph':
-					this.mode = 'graph';
-					break;
-				case 'search':
-					if (btn.timeVal != null && btn.timeVal.length > 0)
-						this.queryParams.recordTime = btn.timeVal;
-					else this.queryParams.recordTime = null;
-					this.handleQuery();
-					break;
-			}
-		},
-
-		async handleQuery() {
-			console.log('queryParams', this.queryParams);
-			const { data } = await this.$axios({
-				url: '/monitoring/equipment-monitor/quantity-det-list',
-				method: 'get',
-				params: this.queryParams,
-			});
-			this.list = data;
-			if (this.activeName == 'graph') this.renderKey = Math.random();
-		},
-	},
-};
-</script>
-
-<style scoped>
-.side-bar__left >>> .is-current {
-	padding: 0;
-	color: #111;
-	/* background: #f2f4f7; */
-	background: #e3efff !important;
-}
-
-.vvv-enter,
-.vvv-leave-to {
-	/* transform: translateY(24px) scaleY(0); */
-	transform: translateY(24px);
-	opacity: 0;
-}
-
-.vvv-enter-active,
-.vvv-leave-active {
-	transition: all 0.3s ease-out;
-}
-
-.vvv-enter-to,
-.vvv-leave {
-	/* transform: translateY(0) scaleY(1); */
-	transform: translateY(0);
-}
-
-.custom-tabs >>> .el-tabs__header {
-	margin-bottom: 8px;
-	display: inline-block;
-	transform: translateY(-12px);
-}
-.custom-tabs >>> .el-tabs__item {
-	padding-left: 0px !important;
-	padding-right: 0px !important;
-	line-height: 36px !important;
-	height: 36px;
-}
-
-.factory-list__selector {
-	position: relative;
-	height: 36px;
-	font-size: 16px;
-	line-height: 36px;
-	padding-left: 28px;
-	background: url(../../../assets/images/factory-icon.png) 0 / 10% no-repeat;
-}
-
-.factory-list__selector:hover {
-	cursor: pointer;
-	color: #0008;
-}
-
-.factory-list__selector::after {
-	/* content: ''; */
-	position: absolute;
-	top: 16px;
-	right: 12px;
-	display: inline-block;
-	width: 8px;
-	height: 8px;
-	/* background: #5c5c5c; */
-	border-color: #000;
-	border-width: 4px;
-	border-style: solid;
-	border-top-color: transparent;
-	border-right-color: transparent;
-	border-bottom-color: transparent;
-}
-.factory-list__selector:hover::after {
-	/* cursor: pointer; */
-	border-left-color: #0008;
-}
-
-.factory-list__wrapper {
-	visibility: hidden;
-	position: absolute;
-	background: #fff;
-	box-shadow: 0 0 32px 10px #0002;
-	border-radius: 8px;
-	top: 36px;
-	left: 90px;
-	/* max-width: 128px; */
-	height: auto;
-	width: auto;
-	white-space: nowrap;
-	overflow: hidden;
-	/* transition: all 0.3s ease-out; */
-	z-index: 1000;
-}
-
-.factory-list__wrapper.open {
-	visibility: visible;
-}
-
-ul,
-li {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-.factory-list {
-	color: #0008;
-	max-height: 240px;
-	overflow-y: auto;
-}
-
-.factory-list__item {
-	font-size: 16px;
-	line-height: 1;
-	padding: 8px 16px 8px 16px;
-	min-width: 128px;
-	position: relative;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-
-.factory-list__item:hover,
-.factory-list__item.is-current {
-	background: #e3efff;
-	color: #0b58ff;
-}
-
-/* .factory-list__item.is-current::after {
-	content: '√';
-	position: absolute;
-	top: 8px;
-	right: 16px;
-	font-weight: bold;
-} */
-
-.custom-tree-class >>> .el-tree-node__content {
-	width: 100%;
-	height: auto !important;
-	padding: 8px 12px !important;
-}
-.custom-tree-class >>> .el-tree-node__content:hover {
-	background: #e3efff;
-}
-
-.custom-tree-class >>> .el-tree-node__children .el-tree-node__content {
-	padding: 8px 18px !important;
-}
-
-.custom-tree-class
-	>>> .el-tree-node__children
-	.el-tree-node__children
-	.el-tree-node__content {
-	padding: 8px 24px !important;
-}
-</style>
-
-<style>
-.custom-icon-class {
-	margin-right: 8px;
-	width: 20px;
-	height: 20px;
-	background: url('../../../assets/images/Qian.png') center center / contain
-		no-repeat;
-}
-
-.custom-icon-class.el-tree-node__expand-icon.expanded {
-	transform: unset;
-}
-
-.el-tree-node__children .custom-icon-class {
-	background: url('../../../assets/images/tree-icon-2.png') 100% / contain
-		no-repeat;
-}
-
-.el-tree-node__children .el-tree-node__children .custom-icon-class {
-	background: unset;
-}
-</style>
diff --git a/src/views/monitoring/equipmentRecentHours/index.vue b/src/views/monitoring/equipmentRecentHours/index.vue
deleted file mode 100644
index dd615df7..00000000
--- a/src/views/monitoring/equipmentRecentHours/index.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-08-04 14:44:58
-    description: 设备24小时生产记录
--->
-
-<template>
-	<div class="app-container">
-		<SearchBar
-			:formConfigs="[{ label: '设备近24小时生产记录', type: 'title' }]"
-			ref="search-bar" />
-		<el-skeleton v-if="initing" :rows="6" animated />
-		<div v-else :class="{ 'no-data-bg': !list || list.length == 0 }">
-			<base-table
-				v-if="list && list.length > 0"
-				:span-method="mergeColumnHandler"
-				:table-props="tableProps"
-				:table-data="list"
-				:max-height="tableH"
-				@emitFun="handleEmitFun"></base-table>
-			<!-- :page="queryParams.pageNo"
-				:limit="queryParams.pageSize" -->
-		</div>
-	</div>
-</template>
-
-<script>
-import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-
-export default {
-	name: 'QualityRecentHours',
-	components: {},
-	mixins: [tableHeightMixin],
-	props: {},
-	data() {
-		return {
-			initing: false,
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-			},
-			list: [],
-			tableProps: [],
-			spanInfo: {},
-			noData: true,
-		};
-	},
-	computed: {},
-	mounted() {
-		this.getList();
-	},
-	methods: {
-		/** 构建tableProps - 依据第一个元素所提供的信息 */
-		buildProps(item) {
-			const {
-				data: [{ hourData }],
-			} = item;
-
-			const props = [
-				{ prop: 'productLine', label: '产线' },
-				{ prop: 'specification', label: '规格' },
-				{
-					prop: 'equipmentName',
-					width: 180,
-					showOverflowtooltip: true,
-					label: '设备',
-				},
-				{ prop: 'totalQuantity', width: 120, label: '生产总数[片]' },
-			];
-
-			for (const key of Object.keys(hourData).sort()) {
-				const subprop = {
-					// label: 'key',
-					label: moment(key).format('YYYY-MM-DD HH:mm:ss'),
-					children: [
-						{ prop: key + '__in', width: 100, label: '进数据[片]' },
-						{ prop: key + '__out', width: 100, label: '出数据[片]' },
-						{ prop: key + '__nok', width: 100, label: '报废数据[片]' },
-						{
-							prop: key + '__ratio',
-							label: '报废率',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'),
-						},
-					],
-				};
-				props.push(subprop);
-			}
-
-			this.tableProps = props;
-		},
-
-		/** 把 list 里的数据转换成 tableProps 对应的格式 */
-		convertList(list) {
-			this.list.splice(0);
-			let rowIndex = 0;
-			for (const line of list) {
-				const { productLine, specification = [], data } = line;
-
-				// 设置span的行数
-				this.spanInfo[rowIndex] = data.length;
-				for (const equipment of data) {
-					const { equipmentName, totalQuantity } = equipment;
-					let row = {
-						productLine,
-						specification: specification.join('、'),
-						equipmentName,
-						totalQuantity,
-					};
-					rowIndex += 1;
-					for (const [key, hourData] of Object.entries(equipment.hourData)) {
-						const { inQuantity, outQuantity, nokQuantity, scrapRatio } =
-							hourData;
-						row[key + '__in'] = inQuantity;
-						row[key + '__out'] = outQuantity;
-						row[key + '__nok'] = nokQuantity;
-						row[key + '__ratio'] = scrapRatio;
-					}
-					this.list.push(row);
-				}
-			}
-		},
-
-		buildData(data) {
-			this.convertList(data);
-		},
-
-		/** 合并table列的规则 */
-		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
-			if (columnIndex == 0 || columnIndex == 1) {
-				if (this.spanInfo[rowIndex]) {
-					return [
-						this.spanInfo[rowIndex], // row span
-						1, // col span
-					];
-				} else {
-					return [0, 0];
-				}
-			}
-		},
-
-		async getList() {
-			const { data } = await this.$axios({
-				url: '/monitoring/equipment-monitor/recent-24-hours',
-				method: 'get',
-			});
-
-			// const data = this.res.data;
-			// console.log('recent-24', data);
-
-			this.initing = true;
-
-			if (!data || !data.length) {
-				this.initing = false;
-				this.noData = true;
-				return;
-			}
-			this.noData = false;
-			this.buildProps(data[0]);
-			this.buildData(data);
-			this.queryParams.pageSize = this.list.length;
-
-			setTimeout(() => {
-				this.initing = false;
-			}, 1000);
-		},
-
-		handleEmitFun(payload) {
-			console.log('payload', payload);
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-::-webkit-scrollbar {
-	display: none;
-}
-
-pre {
-	margin: 10px;
-	background: #f6f8faf6;
-	border: 1px solid #e1e4e8;
-	padding: 12px;
-	border-radius: 12px;
-	position: fixed;
-	// top: 15vh;
-	top: 10vh;
-	left: 0;
-	max-height: 80vh;
-	overflow-y: auto;
-	z-index: 100000;
-	box-shadow: 0 0 32px 12px #0001;
-}
-
-code {
-	font-family: 'IntelOne Mono', 'Ubuntu', 'Courier New', Courier, monospace;
-}
-</style>
diff --git a/src/views/monitoring/equipmentStatusAndParams/index.vue b/src/views/monitoring/equipmentStatusAndParams/index.vue
deleted file mode 100644
index b5a2e2b2..00000000
--- a/src/views/monitoring/equipmentStatusAndParams/index.vue
+++ /dev/null
@@ -1,301 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick"
-			@select-changed="handleSearchBarItemChange" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<!-- <base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="500px"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
-		</base-dialog> -->
-	</div>
-</template>
-
-<script>
-import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import { publicFormatter } from '@/utils/dict';
-import { getPdList } from '@/api/core/monitoring/auto';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
-import { getFactoryPage } from '@/api/core/base/factory';
-
-export default {
-	name: 'EquipmentStatusAndParams',
-
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			searchBarKeys: ['equipmentId', 'productionLineId'],
-			optionArrUrl: [getFactoryPage, getProductionLinePage],
-			tableBtn: [
-				this.$auth.hasPermi('base:equipment-alarm-log:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-alarm-log:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'factoryName',
-					label: '工厂',
-				},
-				{
-					prop: 'lineName',
-					label: '产线名',
-				},
-				{
-					prop: 'workshopName',
-					label: '工段名',
-					showOverflowtooltip: true,
-				},
-				{
-					width: 200,
-					prop: 'equipmentName',
-					label: '设备名称',
-				},
-				{
-					width: 150,
-					showOverflowtooltip: true,
-					prop: 'equipmentCode',
-					label: '设备编码',
-				},
-				{ width: 128, prop: 'inQuantity', label: '投入数[片]' },
-				{ width: 128, prop: 'outQuantity', label: '产出数[片]' },
-				{
-					width: 128,
-					prop: 'run',
-					label: '是否运行',
-					filter: (val) => (val != null ? (val ? '是' : '否') : '-'),
-				},
-				{
-					width: 128,
-					prop: 'status',
-					label: '状态',
-					filter: (val) =>
-						val != null ? ['正常', '计划停机', '故障'][val] : '-',
-				},
-				// {
-				// 	width: 128,
-				// 	prop: 'error',
-				// 	label: '是否故障',
-				// 	filter: (val) => (val != null ? (val ? '是' : '否') : '-'),
-				// },
-				// {
-				// 	prop: 'quantityRecordTime',
-				// 	label: '生产量记录时间',
-				// 	width: 180,
-				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				// },
-				// {
-				// 	prop: 'statusRecordTime',
-				// 	label: '状态记录时间',
-				// 	width: 180,
-				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				// },
-				{
-					_action: 'params-monitor',
-					label: '操作',
-					width: 56,
-					subcomponent: {
-						props: ['injectData'],
-						render: function (h) {
-							const _this = this;
-							return h(
-								'el-button',
-								{
-									class: 'iconfont icon-detail',
-									props: { type: 'text' },
-									on: {
-										click: function () {
-											_this.$emit('emitData', {
-												action: _this.injectData._action,
-												// value: _this.injectData.id,
-												value: _this.injectData,
-											});
-										},
-									},
-								}
-								// '查看详情'
-							);
-						},
-					},
-				},
-			],
-			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					onchange: true,
-					placeholder: '请选择产线',
-					selectOptions: [],
-					param: 'productionLineId',
-				},
-				{
-					type: 'select',
-					label: '设备',
-					placeholder: '请选择设备',
-					param: 'equipmentId',
-					selectOptions: [],
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				factoryId: null,
-				productionLineId: [],
-				equipmentId: null,
-			},
-			total: 0,
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {},
-		};
-	},
-	created() {
-		this.getArr();
-		this.getList();
-	},
-	methods: {
-		getArr() {
-			const params = {
-				page: 1,
-				limit: 500,
-			};
-			this.optionArrUrl.forEach((item, index) => {
-				item(params).then((response) => {
-					this.searchBarFormConfig[index].selectOptions = response.data.list;
-				});
-			});
-		},
-		/** 根据产线获取设备 */
-		async getEquipmentList(id) {
-			const { data } = await this.$axios({
-				url: '/base/equipment/listByLine',
-				method: 'get',
-				params: { id },
-			});
-			return data;
-		},
-
-		/** 监听 search bar 的产线下拉框改变 */
-		async handleSearchBarItemChange({ param, value: id }) {
-			if (param == 'productionLineId') {
-				if (id == '') {
-					// 清除设备选框里的选项
-					this.searchBarFormConfig[2].selectOptions = [];
-					return;
-				}
-				const list = await this.getEquipmentList(id);
-				this.searchBarFormConfig[2].selectOptions = list.map((eq) => ({
-					name: eq.name,
-					id: eq.id,
-				}));
-			} else if (param == 'factoryId') {
-				// 清除设备选框里的选项
-				this.searchBarFormConfig[2].selectOptions = [];
-				this.queryParams.equipmentId = undefined;
-				this.queryParams.productionLineId = [];
-				this.$refs['search-bar'].formInline.equipmentId = undefined;
-				this.$refs['search-bar'].formInline.productionLineId = undefined;
-				getPdList(id).then((res) => {
-					this.searchBarFormConfig[1].selectOptions = res.data || [];
-				});
-			}
-		},
-
-		handleSearchBarBtnClick(btn) {
-			const { equipmentId, productionLineId,factoryId } = btn;
-			if (equipmentId) this.queryParams.equipmentId = equipmentId;
-			else this.queryParams.equipmentId = null;
-			if (productionLineId)
-				this.queryParams.productionLineId = [productionLineId];
-			else this.queryParams.productionLineId = [];
-			this.queryParams.factoryId = factoryId || null;
-			this.getList();
-		},
-
-		/** 查询列表 */
-		async getList() {
-			this.loading = true;
-			const { data } = await this.$axios({
-				url: '/monitoring/equipment-monitor/realtime-page',
-				method: 'POST',
-				data: this.queryParams,
-			});
-			this.list = data.list;
-			this.total = data.total;
-		},
-
-		handleEmitFun({ action, value }) {
-			if (action == 'params-monitor') {
-				const { equipmentId, equipmentName, equipmentCode } = value;
-				this.$router.push({
-					name: 'equipmentFullParams',
-					params: {
-						equipmentId,
-						equipmentCode,
-						equipmentName,
-					},
-				});
-			}
-		},
-	},
-};
-</script>
diff --git a/src/views/monitoring/equipmentVisualize/index.vue b/src/views/monitoring/equipmentVisualize/index.vue
deleted file mode 100644
index 9a144a58..00000000
--- a/src/views/monitoring/equipmentVisualize/index.vue
+++ /dev/null
@@ -1,300 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2025-02-10 09:15:55
- * @LastEditors: zwq
- * @LastEditTime: 2025-02-25 15:48:59
- * @Description:
--->
-<template>
-	<div class="app-container" style="overflow: auto">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
-			@headBtnClick="buttonClick" />
-		<div class="top-tip">
-			<div class="block" style="background: #5b8ff9" />
-			运行
-			<div class="block" style="background: #f4b183" />
-			停机
-			<div class="block" style="background: #ff4f3e" />
-			故障
-		</div>
-		<div class="canvas-line" v-for="(item, index) in lineArr" :key="index">
-			<div class="title">{{ item.name }}</div>
-			<canvas
-				style="
-					box-shadow: 1px 1px 2px 2px #909399;
-					padding: 0;
-					height: 210px;
-					width: 100%;
-				"
-				@click="getclient($event, index + 1, item.num)"
-				:id="'mycanvas' + (index + 1)"></canvas>
-		</div>
-	</div>
-</template>
-
-<script>
-import { getPdList } from '@/api/core/monitoring/auto';
-import { getFactoryPage, getLineEqStatus } from '@/api/core/base/factory';
-import linePot from './line-pot';
-
-export default {
-	data() {
-		return {
-			listQuery: {
-				factoryId: null,
-				lineId: null,
-			},
-			ctx: '', //canvas
-			lineArr: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'lineId',
-					multiple: true,
-          width: 410
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-			linePot,
-		};
-	},
-	components: {},
-	created() {
-		this.getPdLineList();
-	},
-	methods: {
-		initCanvas(name) {
-			let canvas = document.getElementById(name);
-			canvas.width = canvas.clientWidth;
-			canvas.width = canvas.clientWidth;
-			canvas.height = 210;
-			this.ctx = canvas.getContext('2d');
-			this.ctx.lineWidth = 1;
-			this.ctx.strokeStyle = '#909399';
-			this.ctx.fillStyle = '#5b8ff9';
-			this.ctx.font = '12px 宋体'; //文字大小 字体样式
-			this.ctx.clearRect(0, 0, canvas.clientWidth, 210); //清空画布
-		},
-		//画长方形
-		fillRect(x, y, width, height, name, color) {
-			this.ctx.beginPath(); //开始
-			this.ctx.fillStyle = color ? color : '#5b8ff9'; //填充颜色
-			this.ctx.fillRect(x, y, width, height); //左上角点的坐标(x,y) 宽 高
-			this.ctx.strokeRect(x, y, width, height);
-			this.ctx.fillStyle = '#fff'; //填充颜色
-			if (height === 50) {
-				//判断是否特殊机器 机器文字y轴定位加10
-				this.ctx.fillText(name, x + 5, y + 30);
-			} else {
-				this.ctx.fillText(name, x + 5, y + 20);
-			}
-			this.ctx.closePath(); //结束
-		},
-		//画特殊形
-		fillLRect(LArr, name, color) {
-			this.ctx.beginPath(); //开始
-			LArr.forEach((item, index) => {
-				if (index === 0) {
-					this.ctx.moveTo(item[0], item[1]);
-				} else {
-					this.ctx.lineTo(item[0], item[1]);
-				}
-			});
-			this.ctx.closePath(); //结束   // 闭合路径
-			this.ctx.fillStyle = color ? color : '#5b8ff9'; //填充颜色
-			this.ctx.fill();
-			this.ctx.stroke();
-			this.ctx.fillStyle = '#fff'; //填充颜色
-			if (LArr[0][0] === LArr[1][0]) {
-				//判断L形第一截是竖着还是横着
-				this.ctx.fillText(name, LArr[1][0] + 5, LArr[1][1] + 20); //竖着
-			} else {
-				this.ctx.fillText(name, LArr[0][0] + 5, LArr[0][1] + 20);
-			}
-		},
-		setRect(item, index) {
-			const identifier = 'line' + item.num + 'canvas';
-			this.$nextTick(() => {
-				this.initCanvas('mycanvas' + (index + 1));
-			});
-			this.$nextTick(() => {
-				this.linePot[identifier].forEach((idItem) => {
-					item.children.forEach((eqItem) => {
-						if (eqItem.id === idItem.id) {
-							idItem.color = ['#5b8ff9', '#f4b183', '#ff4f3e'][
-								eqItem.equipmentStatus
-							];
-						}
-					});
-					if (idItem.isL) {
-						this.fillLRect(idItem.line, idItem.name, idItem.color);
-					} else {
-						this.fillRect(
-							idItem.x,
-							idItem.y,
-							idItem.width,
-							idItem.height,
-							idItem.name,
-							idItem.color
-						);
-					}
-				});
-			});
-		},
-		getclient(e, index, num) {
-			let canvas = document.getElementById('mycanvas' + index);
-			const rect = canvas.getBoundingClientRect();
-			const identifier = 'line' + num + 'canvas';
-			this.isEQ(e.clientX - rect.left, e.clientY - rect.top, identifier);
-		},
-		// 检查点击位置是否在设备内
-		isEQ(x, y, identifier) {
-			this.linePot[identifier].forEach((idItem) => {
-				if (idItem.isEQ) {
-					// 检查点击位置是否在矩形内
-					if (
-						x >= idItem.x &&
-						x <= idItem.x + idItem.width &&
-						y >= idItem.y &&
-						y <= idItem.y + idItem.height
-					) {
-						console.log(idItem.name, idItem.id);
-						this.$router.push({
-							path: '/equipment/analysis/timing-diagram/equipment-status',
-							query: { eqid: idItem.id },
-						});
-					}
-				}
-			});
-		},
-		getPdLineList() {
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-			getPdList().then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 100;
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.lineId = val.lineId ? val.lineId : [];
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.lineId = [];
-			this.$refs.searchBarForm.formInline.lineId = undefined;
-			getPdList(value).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
-		getDataList() {
-			// this.lineArr = [
-			// 	{
-			// 		num: 1,
-			// 		name: 'A1',
-			// 		children: [],
-			// 	},
-			// 	{
-			// 		num: 2,
-			// 		name: 'A2',
-			// 		children: [],
-			// 	},
-			// 	{
-			// 		num: 3,
-			// 		name: 'A3',
-			// 		children: [],
-			// 	},
-			// 	{
-			// 		num: 4,
-			// 		name: 'A4',
-			// 		children: [],
-			// 	},
-			// 	{
-			// 		num: 5,
-			// 		name: 'A5',
-			// 		children: [],
-			// 	},
-			// ];
-			getLineEqStatus(this.listQuery).then((response) => {
-				this.lineArr = response.data;
-				this.lineArr.forEach((item, index) => {
-					const num = [
-						'',
-						'1672847052717821953',
-						'1672847052717821954',
-						'1686260211054157825',
-						'1701892552632770122',
-						'1714562503683465331',
-					].indexOf(item.id);
-					if (num > 0) {
-						item.num = num;
-						item.name = item.lineName;
-						this.setRect(item, index);
-					} else {
-						this.$message.warning('没有对应的产线！');
-					}
-				});
-			});
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.top-tip {
-	.block {
-		display: inline-block;
-		width: 20px;
-		height: 10px;
-		margin-left: 20px;
-		margin-right: 3px;
-	}
-}
-.canvas-line {
-	margin-top: 20px;
-	min-width: 1600px;
-	.title {
-		font-size: 20px;
-		font-weight: bolder;
-		&::before {
-			content: '';
-			background: rgb(39, 240, 17);
-			display: inline-block;
-			width: 8px;
-			height: 8px;
-			border-radius: 50%;
-			margin-right: 3px;
-			transform: translateY(-50%);
-		}
-	}
-}
-</style>
diff --git a/src/views/monitoring/equipmentVisualize/line-pot.js b/src/views/monitoring/equipmentVisualize/line-pot.js
deleted file mode 100644
index 91916cad..00000000
--- a/src/views/monitoring/equipmentVisualize/line-pot.js
+++ /dev/null
@@ -1,1810 +0,0 @@
-const linePot = {
-  line1canvas:[],
-  line2canvas:[],
-  line3canvas:[],
-  line4canvas:[],
-  line5canvas:[],
-}
-linePot.line1canvas= [
-  {
-    name: '穿梭机',
-    id:1,
-    isEQ: true, //是否是设备
-    x: 5,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '机械手1',
-    id:2,
-    isEQ: true, //是否是设备
-    x: 70,
-    y: 125,
-    width: 55,
-    height: 30,
-  },
-  {
-    name: '机械手2',
-    id:3,
-    isEQ: true, //是否是设备
-    x: 130,
-    y: 125,
-    width: 55,
-    height: 30,
-  },
-  {
-    name: '机械手3',
-    id:4,
-    isEQ: true, //是否是设备
-    x: 190,
-    y: 125,
-    width: 55,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889846205990629378',
-    isL: true, //是否L形状
-    remark: 'M01-M20',
-    line: [
-      [60, 160],
-      [260, 160],
-      [260, 20],
-      [290, 20],
-      [290, 190],
-      [60, 190],
-    ],
-  },
-  {
-    name: '连线',
-    id: '1889846340208357377',
-    remark: '0M101-0M105',
-    x: 292,
-    y: 20,
-    width: 40,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889846382482747393',
-    remark: '0M201-0M205',
-    x: 292,
-    y: 90,
-    width: 40,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889846424954269698',
-    remark: '0M301-0M305',
-    x: 292,
-    y: 160,
-    width: 40,
-    height: 30,
-  },
-  {
-    name: '磨边机1',
-    id:5,
-    isEQ: true, //是否是设备
-    x: 334,
-    y: 10,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '磨边机2',
-    id:6,
-    isEQ: true, //是否是设备
-    x: 334,
-    y: 80,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '磨边机3',
-    id:7,
-    isEQ: true, //是否是设备
-    x: 334,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机1',
-    id:8,
-    isEQ: true, //是否是设备
-    x: 386,
-    y: 10,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机2',
-    id:9,
-    isEQ: true, //是否是设备
-    x: 386,
-    y: 80,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机3',
-    id:10,
-    isEQ: true, //是否是设备
-    x: 386,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889846469384531970',
-    remark: '1M101-1M111',
-    x: 438,
-    y: 20,
-    width: 50,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889846532479447041',
-    remark: '1M201-1M211',
-    x: 438,
-    y: 90,
-    width: 50,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889846578952335361',
-    remark: '1M301-1M311',
-    x: 438,
-    y: 160,
-    width: 50,
-    height: 30,
-  },
-  {
-    name: '打孔机1',
-    id:11,
-    isEQ: true, //是否是设备
-    x: 490,
-    y: 10,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '打孔机2',
-    id:12,
-    isEQ: true, //是否是设备
-    x: 490,
-    y: 80,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '打孔机3',
-    id:13,
-    isEQ: true, //是否是设备
-    x: 490,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机1',
-    id:14,
-    isEQ: true, //是否是设备
-    x: 542,
-    y: 10,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机2',
-    id:15,
-    isEQ: true, //是否是设备
-    x: 542,
-    y: 80,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机3',
-    id:16,
-    isEQ: true, //是否是设备
-    x: 542,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '丝印机1',
-    id:17,
-    isEQ: true, //是否是设备
-    x: 594,
-    y: 10,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '丝印机2',
-    id:18,
-    isEQ: true, //是否是设备
-    x: 594,
-    y: 80,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '丝印机3',
-    id:19,
-    isEQ: true, //是否是设备
-    x: 594,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '一次固化1',
-    id:20,
-    isEQ: true, //是否是设备
-    x: 646,
-    y: 10,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '一次固化2',
-    id:21,
-    isEQ: true, //是否是设备
-    x: 646,
-    y: 80,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '一次固化3',
-    id:22,
-    isEQ: true, //是否是设备
-    x: 646,
-    y: 150,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889846619888742401',
-    remark: '2M10A-2M108',
-    x: 708,
-    y: 20,
-    width: 200,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889846671734534145',
-    isL: true, //是否L形状
-    remark: '2M20A-2M205',
-    line: [
-      [708, 90],
-      [748, 90],
-      [748, 52],
-      [778, 52],
-      [778, 120],
-      [708, 120],
-    ],
-  },
-  {
-    name: '连线',
-    id: '1889846721319596033',
-    isL: true, //是否L形状
-    remark: '2M30A-2M310',
-    line: [
-      [708, 160],
-      [788, 160],
-      [788, 52],
-      [818, 52],
-      [818, 190],
-      [708, 190],
-    ],
-  },
-  {
-    name: '钢化炉',
-    id:23,
-    isEQ: true, //是否是设备
-    x: 910,
-    y: 10,
-    width: 80,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889846765879881729',
-    remark: '3M102-3M110',
-    x: 992,
-    y: 20,
-    width: 148,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889846813598478337',
-    isL: true, //是否L形状
-    remark: '3M201-3M210(F型)',
-    line: [
-      [1052, 50],
-      [1052, 90],
-      [1070, 90],
-      [1070, 50],
-      [1100, 50],
-      [1100, 90],
-      [1140, 90],
-      [1140, 120],
-      [1022, 120],
-      [1022, 50],
-    ],
-  },
-  {
-    name: '清洗机1',
-    id:24,
-    isEQ: true, //是否是设备
-    x: 1142,
-    y: 10,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机2',
-    id:25,
-    isEQ: true, //是否是设备
-    x: 1142,
-    y: 80,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '铺纸机1',
-    id:26,
-    isEQ: true, //是否是设备
-    x: 1194,
-    y: 10,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '铺纸机2',
-    id:27,
-    isEQ: true, //是否是设备
-    x: 1194,
-    y: 80,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889846856204218369',
-    remark: '4M100-4M116',
-    x: 1246,
-    y: 20,
-    width: 320,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889846900772892674',
-    isL: true, //是否L形状
-    remark: '4M200-4M210(F型)',
-    line: [
-      [1246, 90],
-      [1280, 90],
-      [1280, 50],
-      [1310, 50],
-      [1310, 90],
-      [1330, 90],
-      [1330, 50],
-      [1360, 50],
-      [1360, 120],
-      [1246, 120],
-    ],
-  },
-  {
-    name: '下片机1',
-    id:28,
-    isEQ: true, //是否是设备
-    x: 1365,
-    y: 55,
-    width: 60,
-    height: 30,
-  },
-  {
-    name: '下片机2',
-    id:29,
-    isEQ: true, //是否是设备
-    x: 1430,
-    y: 55,
-    width: 60,
-    height: 30,
-  },
-  {
-    name: '下片机3',
-    id:30,
-    isEQ: true, //是否是设备
-    x: 1495,
-    y: 55,
-    width: 60,
-    height: 30,
-  },
-]
-
-linePot.line2canvas= [
-  {
-    name: '穿梭机',
-    id:34,
-    isEQ: true, //是否是设备
-    x: 5,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '机械手1',
-    id:35,
-    isEQ: true, //是否是设备
-    x: 70,
-    y: 85,
-    width: 55,
-    height: 30,
-  },
-  {
-    name: '机械手2',
-    id:36,
-    isEQ: true, //是否是设备
-    x: 130,
-    y: 85,
-    width: 55,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '152',
-    isL: true, //是否L形状
-    remark: 'M01-M18(异型)',
-    line: [
-      [60, 50],
-      [290, 50],
-      [290, 80],
-      [240, 80],
-      [240, 140],
-      [290, 140],
-      [290, 170],
-      [210, 170],
-      [210, 80],
-      [60, 80],
-    ],
-  },
-  {
-    name: '连线',
-    id: '174',
-    remark: '0M201-0M204',
-    x: 290,
-    y: 50,
-    width: 40,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '170',
-    remark: '0M101-0M104',
-    x: 290,
-    y: 140,
-    width: 40,
-    height: 30,
-  },
-  {
-    name: '磨边机1',
-    id:38,
-    isEQ: true, //是否是设备
-    x: 332,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '磨边机2',
-    id:39,
-    isEQ: true, //是否是设备
-    x: 332,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机1',
-    id:40,
-    isEQ: true, //是否是设备
-    x: 384,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机2',
-    id:41,
-    isEQ: true, //是否是设备
-    x: 384,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '192',
-    remark: '1M201-1M214',
-    x: 436,
-    y: 50,
-    width: 50,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '178',
-    remark: '1M101-1M114',
-    x: 436,
-    y: 140,
-    width: 50,
-    height: 30,
-  },
-  {
-    name: '打孔机1',
-    id:42,
-    isEQ: true, //是否是设备
-    x: 488,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '打孔机2',
-    id:43,
-    isEQ: true, //是否是设备
-    x: 488,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机1',
-    id:44,
-    isEQ: true, //是否是设备
-    x: 540,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机2',
-    id:45,
-    isEQ: true, //是否是设备
-    x: 540,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '丝印机1',
-    id:46,
-    isEQ: true, //是否是设备
-    x: 592,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '丝印机2',
-    id:47,
-    isEQ: true, //是否是设备
-    x: 592,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '预热炉1',
-    id:'1888114426233548801',
-    isEQ: true, //是否是设备
-    x: 644,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '预热炉2',
-    id:'1888114614981423106',
-    isEQ: true, //是否是设备
-    x: 644,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '镀膜机1',
-    id:148,
-    isEQ: true, //是否是设备
-    x: 696,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '镀膜机2',
-    id:149,
-    isEQ: true, //是否是设备
-    x: 696,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '一次固化1',
-    id:48,
-    isEQ: true, //是否是设备
-    x: 748,
-    y: 40,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '一次固化2',
-    id:49,
-    isEQ: true, //是否是设备
-    x: 748,
-    y: 130,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '218',
-    remark: '2M20A-2M205(L)',
-    isL: true, //是否L形状
-    line: [
-      [810, 50],
-      [880, 50],
-      [880, 140],
-      [850, 140],
-      [850, 80],
-      [810, 80],
-    ],
-  },
-  {
-    name: '连线',
-    id: '206',
-    remark: '2M10A-2M106',
-    x: 810,
-    y: 140,
-    width: 100,
-    height: 30,
-  },
-  {
-    name: '钢化炉',
-    id:50,
-    isEQ: true, //是否是设备
-    x: 912,
-    y: 130,
-    width: 80,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '229',
-    remark: '3M101-3M105',
-    x: 994,
-    y: 140,
-    width: 120,
-    height: 30,
-  },
-  {
-    name: '清洗机',
-    id:51,
-    isEQ: true, //是否是设备
-    x: 1116,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '铺纸机',
-    id:52,
-    isEQ: true, //是否是设备
-    x: 1168,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '铺纸机',
-    id:53,
-    isEQ: true, //是否是设备
-    x: 1220,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '234',
-    remark: '4M100-4M109',
-    x: 1272,
-    y: 140,
-    width: 290,
-    height: 30,
-  },
-  {
-    name: '下片机1',
-    id:54,
-    isEQ: true, //是否是设备
-    x: 1365,
-    y: 105,
-    width: 60,
-    height: 30,
-  },
-  {
-    name: '下片机2',
-    id:55,
-    isEQ: true, //是否是设备
-    x: 1430,
-    y: 105,
-    width: 60,
-    height: 30,
-  },
-]
-
-linePot.line3canvas= [
-  {
-    name: '穿梭机',
-    id:59,
-    isEQ: true, //是否是设备
-    x: 5,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '机械手1',
-    id:60,
-    isEQ: true, //是否是设备
-    x: 70,
-    y: 85,
-    width: 55,
-    height: 30,
-  },
-  {
-    name: '机械手2',
-    id:61,
-    isEQ: true, //是否是设备
-    x: 130,
-    y: 85,
-    width: 55,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889919197315657729',
-    isL: true, //是否L形状
-    remark: 'M01-M18(异型)',
-    line: [
-      [60, 50],
-      [290, 50],
-      [290, 80],
-      [240, 80],
-      [240, 140],
-      [290, 140],
-      [290, 170],
-      [210, 170],
-      [210, 80],
-      [60, 80],
-    ],
-  },
-  {
-    name: '连线',
-    id: '1889919267335368706',
-    remark: '0M201-0M204',
-    x: 290,
-    y: 50,
-    width: 40,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889919235127308289',
-    remark: '0M101-0M104',
-    x: 290,
-    y: 140,
-    width: 40,
-    height: 30,
-  },
-  {
-    name: '磨边机1',
-    id:63,
-    isEQ: true, //是否是设备
-    x: 332,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '磨边机2',
-    id:64,
-    isEQ: true, //是否是设备
-    x: 332,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机1',
-    id:65,
-    isEQ: true, //是否是设备
-    x: 384,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机2',
-    id:66,
-    isEQ: true, //是否是设备
-    x: 384,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889919314311573505',
-    remark: '1M101-1M114', //3线比2线这里反了
-    x: 436,
-    y: 50,
-    width: 50,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889919347735982081',
-    remark: '1M201-1M214', //3线比2线这里反了
-    x: 436,
-    y: 140,
-    width: 50,
-    height: 30,
-  },
-  {
-    name: '打孔机1',
-    id:67,
-    isEQ: true, //是否是设备
-    x: 488,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '打孔机2',
-    id:68,
-    isEQ: true, //是否是设备
-    x: 488,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机1',
-    id:69,
-    isEQ: true, //是否是设备
-    x: 540,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机2',
-    id:70,
-    isEQ: true, //是否是设备
-    x: 540,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '丝印机1',
-    id:71,
-    isEQ: true, //是否是设备
-    x: 592,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '丝印机2',
-    id:72,
-    isEQ: true, //是否是设备
-    x: 592,
-    y: 130,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '一次固化1',
-    id:73,
-    isEQ: true, //是否是设备
-    x: 644,
-    y: 40,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '一次固化2',
-    id:74,
-    isEQ: true, //是否是设备
-    x: 644,
-    y: 130,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889919382095720450',
-    remark: '2M101-2M106',
-    x: 706,
-    y: 50,
-    width: 202,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889919416660979714',
-    remark: '2M201-2M205(L)',
-    isL: true, //是否L形状
-    line: [
-      [706, 140],
-      [770, 140],
-      [770, 80],
-      [800, 80],
-      [800, 170],
-      [706, 170],
-    ],
-  },
-  {
-    name: '钢化炉',
-    id:75,
-    isEQ: true, //是否是设备
-    x: 910,
-    y: 40,
-    width: 80,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889919447367479298',
-    remark: '3M101-3M105',
-    x: 992,
-    y: 50,
-    width: 120,
-    height: 30,
-  },
-  {
-    name: '清洗机',
-    id:76,
-    isEQ: true, //是否是设备
-    x: 1114,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '铺纸机',
-    id:77,
-    isEQ: true, //是否是设备
-    x: 1166,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '铺纸机',
-    id:78,
-    isEQ: true, //是否是设备
-    x: 1218,
-    y: 40,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889919487062372353',
-    remark: '4M100-4M109',
-    x: 1270,
-    y: 50,
-    width: 290,
-    height: 30,
-  },
-  {
-    name: '下片机1',
-    id:79,
-    isEQ: true, //是否是设备
-    x: 1365,
-    y: 85,
-    width: 60,
-    height: 30,
-  },
-  {
-    name: '下片机2',
-    id:80,
-    isEQ: true, //是否是设备
-    x: 1430,
-    y: 85,
-    width: 60,
-    height: 30,
-  },
-]
-
-linePot.line4canvas= [
-  {
-    name: '穿梭机',
-    id:84,
-    isEQ: true, //是否是设备
-    x: 5,
-    y: 35,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '机械手1',
-    id:85,
-    isEQ: true, //是否是设备
-    x: 90,
-    y: 10,
-    width: 55,
-    height: 30,
-  },
-  {
-    name: '机械手2',
-    id:86,
-    isEQ: true, //是否是设备
-    x: 150,
-    y: 10,
-    width: 55,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889188182611783682',
-    isL: true, //是否L形状
-    remark: 'M01-M23',
-    line: [
-      [60, 45],
-      [290, 45],
-      [290, 190],
-      [260, 190],
-      [260, 75],
-      [60, 75],
-    ],
-  },
-  {
-    name: '连线',
-    id: '1889188872511877122',
-    remark: '0M201-0M204 ',
-    x: 292,
-    y: 100,
-    width: 40,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889189054058131458',
-    remark: '0M101-0M104 ',
-    x: 292,
-    y: 160,
-    width: 40,
-    height: 30,
-  },
-  {
-    name: '磨边机1',
-    id:88,
-    isEQ: true, //是否是设备
-    x: 333,
-    y: 90,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '磨边机2',
-    id:89,
-    isEQ: true, //是否是设备
-    x: 333,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机1',
-    id:90,
-    isEQ: true, //是否是设备
-    x: 386,
-    y: 90,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机2',
-    id:91,
-    isEQ: true, //是否是设备
-    x: 386,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889190496001126401',
-    remark: '1M201-1M210',
-    x: 438,
-    y: 100,
-    width: 50,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889190685516558338',
-    remark: '1M101-1M110 ',
-    x: 438,
-    y: 160,
-    width: 50,
-    height: 30,
-  },
-  {
-    name: '预热炉1',
-    id: '1889480590645850113',
-    isEQ: true, //是否是设备
-    x: 490,
-    y: 90,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '预热炉2',
-    id: '1889480669632983041',
-    isEQ: true, //是否是设备
-    x: 490,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '镀膜机1',
-    id:92,
-    isEQ: true, //是否是设备
-    x: 542,
-    y: 90,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '镀膜机2',
-    id:93,
-    isEQ: true, //是否是设备
-    x: 542,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '一次固化1',
-    id:94,
-    isEQ: true, //是否是设备
-    x: 594,
-    y: 90,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '一次固化2',
-    id:95,
-    isEQ: true, //是否是设备
-    x: 594,
-    y: 150,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '镀膜机1',
-    id:96,
-    isEQ: true, //是否是设备
-    x: 656,
-    y: 90,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '镀膜机2',
-    id:97,
-    isEQ: true, //是否是设备
-    x: 656,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '二次固化1',
-    id:98,
-    isEQ: true, //是否是设备
-    x: 708,
-    y: 90,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '二次固化2',
-    id:99,
-    isEQ: true, //是否是设备
-    x: 708,
-    y: 150,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889190890148261889',
-    isL: true,
-    remark: '2M201-2M205',
-    line: [
-      [770, 100],
-      [850, 100],
-      [850, 160],
-      [820, 160],
-      [820, 130],
-      [770, 130],
-    ],
-  },
-  {
-    name: '连线',
-    id: '1889191046285422594',
-    remark: '2M101-2M107',
-    x: 770,
-    y: 160,
-    width: 140,
-    height: 30,
-  },
-  {
-    name: '钢化炉',
-    id:100,
-    isEQ: true, //是否是设备
-    x: 912,
-    y: 150,
-    width: 80,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889191286610653185',
-    remark: '3M101-3M105',
-    x: 994,
-    y: 160,
-    width: 120,
-    height: 30,
-  },
-  {
-    name: '清洗机',
-    id:101,
-    isEQ: true, //是否是设备
-    x: 1116,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '铺纸机',
-    id:102,
-    isEQ: true, //是否是设备
-    x: 1169,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '铺纸机',
-    id:103,
-    isEQ: true, //是否是设备
-    x: 1221,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889191426792681474',
-    remark: '4M100-4M109',
-    x: 1273,
-    y: 160,
-    width: 290,
-    height: 30,
-  },
-  {
-    name: '下片机1',
-    id:104,
-    isEQ: true, //是否是设备
-    x: 1365,
-    y: 125,
-    width: 60,
-    height: 30,
-  },
-  {
-    name: '下片机2',
-    id:105,
-    isEQ: true, //是否是设备
-    x: 1430,
-    y: 125,
-    width: 60,
-    height: 30,
-  },
-]
-
-linePot.line5canvas= [
-  {
-    name: '穿梭机',
-    id:109,
-    isEQ: true, //是否是设备
-    x: 5,
-    y: 10,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '机械手1',
-    id:110,
-    isEQ: true, //是否是设备
-    x: 70,
-    y: 55,
-    width: 55,
-    height: 30,
-  },
-  {
-    name: '机械手2',
-    id:111,
-    isEQ: true, //是否是设备
-    x: 130,
-    y: 55,
-    width: 55,
-    height: 30,
-  },
-  {
-    name: '机械手3',
-    id:112,
-    isEQ: true, //是否是设备
-    x: 190,
-    y: 55,
-    width: 55,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889919903443513346',
-    isL: true, //是否L形状
-    remark: 'M01-M27',
-    line: [
-      [60, 20],
-      [290, 20],
-      [290, 190],
-      [260, 190],
-      [260, 50],
-      [60, 50],
-    ],
-  },
-  {
-    name: '连线',
-    id: '1889919931713122306',
-    remark: '0M101-0M106',
-    x: 292,
-    y: 60,
-    width: 40,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889919961962442754',
-    remark: '0M201-0M206',
-    x: 292,
-    y: 110,
-    width: 40,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889919998545162242',
-    remark: '0M301-0M306',
-    x: 292,
-    y: 160,
-    width: 40,
-    height: 30,
-  },
-  {
-    name: '磨边机1',
-    id:114,
-    isEQ: true, //是否是设备
-    x: 334,
-    y: 50,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '磨边机2',
-    id:115,
-    isEQ: true, //是否是设备
-    x: 334,
-    y: 100,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '磨边机3',
-    id:116,
-    isEQ: true, //是否是设备
-    x: 334,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机1',
-    id:117,
-    isEQ: true, //是否是设备
-    x: 386,
-    y: 50,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机2',
-    id:118,
-    isEQ: true, //是否是设备
-    x: 386,
-    y: 100,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机3',
-    id:119,
-    isEQ: true, //是否是设备
-    x: 386,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889920027607494658',
-    remark: '1M101-1M110',
-    x: 438,
-    y: 60,
-    width: 50,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889920058062336001',
-    remark: '1M201-1M210',
-    x: 438,
-    y: 110,
-    width: 50,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889920089926463489',
-    remark: '1M301-1M310',
-    x: 438,
-    y: 160,
-    width: 50,
-    height: 30,
-  },
-  {
-    name: '预热炉1',
-    id:'1891715839681425409',
-    isEQ: true, //是否是设备
-    x: 490,
-    y: 50,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '预热炉2',
-    id:'1891715916583989249',
-    isEQ: true, //是否是设备
-    x: 490,
-    y: 100,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '预热炉3',
-    id:'1891715982178709505',
-    isEQ: true, //是否是设备
-    x: 490,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '镀膜机1',
-    id:120,
-    isEQ: true, //是否是设备
-    x: 542,
-    y: 50,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '镀膜机2',
-    id:121,
-    isEQ: true, //是否是设备
-    x: 542,
-    y: 100,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '镀膜机3',
-    id:122,
-    isEQ: true, //是否是设备
-    x: 542,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '一次固化1',
-    id:123,
-    isEQ: true, //是否是设备
-    x: 594,
-    y: 50,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '一次固化2',
-    id:124,
-    isEQ: true, //是否是设备
-    x: 594,
-    y: 100,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '一次固化3',
-    id:125,
-    isEQ: true, //是否是设备
-    x: 594,
-    y: 150,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '镀膜机1',
-    id:126,
-    isEQ: true, //是否是设备
-    x: 656,
-    y: 50,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '镀膜机2',
-    id:127,
-    isEQ: true, //是否是设备
-    x: 656,
-    y: 100,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '镀膜机3',
-    id:128,
-    isEQ: true, //是否是设备
-    x: 656,
-    y: 150,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '二次固化1',
-    id:129,
-    isEQ: true, //是否是设备
-    x: 708,
-    y: 50,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '二次固化2',
-    id:130,
-    isEQ: true, //是否是设备
-    x: 708,
-    y: 100,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '二次固化3',
-    id:131,
-    isEQ: true, //是否是设备
-    x: 708,
-    y: 150,
-    width: 60,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889920119957680130',
-    remark: '2M101-2M108',
-    x: 770,
-    y: 60,
-    width: 138,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889920151746310145',
-    isL: true, //是否L形状
-    remark: '2M201-2M205',
-    line: [
-      [770, 110],
-      [810, 110],
-      [810, 92],
-      [840, 92],
-      [840, 140],
-      [770, 140],
-    ],
-  },
-  {
-    name: '连线',
-    id: '1889920183572688897',
-    isL: true, //是否L形状
-    remark: '2M30A-2M310',
-    line: [
-      [770, 160],
-      [850, 160],
-      [850, 92],
-      [880, 92],
-      [880, 190],
-      [770, 190],
-    ],
-  },
-  {
-    name: '钢化炉',
-    id:132,
-    isEQ: true, //是否是设备
-    x: 910,
-    y: 50,
-    width: 80,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889920232033677313',
-    remark: '3M101-3M110',
-    x: 992,
-    y: 60,
-    width: 148,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889920268360544257',
-    isL: true, //是否L形状
-    remark: '3M201-3M210(F型)',
-    line: [
-      [1052, 90],
-      [1052, 130],
-      [1070, 130],
-      [1070, 90],
-      [1100, 90],
-      [1100, 130],
-      [1140, 130],
-      [1140, 160],
-      [1022, 160],
-      [1022, 90],
-    ],
-  },
-  {
-    name: '清洗机1',
-    id:133,
-    isEQ: true, //是否是设备
-    x: 1142,
-    y: 50,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '清洗机2',
-    id:134,
-    isEQ: true, //是否是设备
-    x: 1142,
-    y: 120,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '铺纸机1',
-    id:135,
-    isEQ: true, //是否是设备
-    x: 1194,
-    y: 50,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '铺纸机2',
-    id:136,
-    isEQ: true, //是否是设备
-    x: 1194,
-    y: 120,
-    width: 50,
-    height: 50,
-  },
-  {
-    name: '连线',
-    id: '1889920296726622209',
-    remark: '4M100-4M116',
-    x: 1246,
-    y: 60,
-    width: 320,
-    height: 30,
-  },
-  {
-    name: '连线',
-    id: '1889920333451948034',
-    isL: true, //是否L形状
-    remark: '4M200-4M210(F型)',
-    line: [
-      [1246, 130],
-      [1280, 130],
-      [1280, 90],
-      [1310, 90],
-      [1310, 130],
-      [1330, 130],
-      [1330, 90],
-      [1360, 90],
-      [1360, 160],
-      [1246, 160],
-    ],
-  },
-  {
-    name: '下片机1',
-    id:137,
-    isEQ: true, //是否是设备
-    x: 1365,
-    y: 95,
-    width: 60,
-    height: 30,
-  },
-  {
-    name: '下片机2',
-    id:138,
-    isEQ: true, //是否是设备
-    x: 1430,
-    y: 95,
-    width: 60,
-    height: 30,
-  },
-  {
-    name: '下片机3',
-    id:139,
-    isEQ: true, //是否是设备
-    x: 1495,
-    y: 95,
-    width: 60,
-    height: 30,
-  },
-]
-
-export default linePot
diff --git a/src/views/mp/account/index.vue b/src/views/mp/account/index.vue
deleted file mode 100644
index 3d72acec..00000000
--- a/src/views/mp/account/index.vue
+++ /dev/null
@@ -1,290 +0,0 @@
-<template>
-  <div class="app-container">
-    <doc-alert title="公众号接入" url="https://doc.iocoder.cn/mp/account/" />
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入名称" clearable
-                  @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['mp:account:create']">新增
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="名称" align="center" prop="name"/>
-      <el-table-column label="微信号" align="center" prop="account" width="180"/>
-      <el-table-column label="appId" align="center" prop="appId" width="180"/>
-<!--      <el-table-column label="appSecret" align="center" prop="appSecret" width="180"/>-->
-<!--      <el-table-column label="token" align="center" prop="token"/>-->
-<!--      <el-table-column label="消息加解密密钥" align="center" prop="aesKey"/>-->
-      <el-table-column label="服务器地址(URL)" align="center" prop="appId" width="360">
-        <template v-slot="scope">
-          {{ 'http://服务端地址/mp/open/' + scope.row.appId }}
-        </template>
-      </el-table-column>
-      <el-table-column label="二维码" align="center" prop="qrCodeUrl">
-        <template v-slot="scope">
-          <img v-if="scope.row.qrCodeUrl" :src="scope.row.qrCodeUrl" alt="二维码" style="height: 100px;" />
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark"/>
-<!--      <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
-<!--        <template v-slot="scope">-->
-<!--          <span>{{ parseTime(scope.row.createTime) }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['mp:account:update']">修改
-          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['mp:account:delete']">删除
-          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-refresh" @click="handleGenerateQrCode(scope.row)"
-                     v-hasPermi="['mp:account:qr-code']">生成二维码
-          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-share" @click="handleCleanQuota(scope.row)"
-                     v-hasPermi="['mp:account:clear-quota']">清空 API 配额
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入名称"/>
-        </el-form-item>
-        <el-form-item label="微信号" prop="account">
-         <span slot="label">
-           <el-tooltip content="在微信公众平台（mp.weixin.qq.com）的菜单 [设置与开发 - 公众号设置 - 账号详情] 中能找到「微信号」" placement="top">
-              <i class="el-icon-question" />
-           </el-tooltip>
-           微信号
-          </span>
-          <el-input v-model="form.account" placeholder="请输入微信号"/>
-        </el-form-item>
-        <el-form-item label="appId" prop="appId">
-          <span slot="label">
-            <el-tooltip content="在微信公众平台（mp.weixin.qq.com）的菜单 [设置与开发 - 公众号设置 - 基本设置] 中能找到「开发者ID(AppID)」" placement="top">
-              <i class="el-icon-question" />
-            </el-tooltip>
-            appId
-          </span>
-          <el-input v-model="form.appId" placeholder="请输入公众号 appId"/>
-        </el-form-item>
-        <el-form-item label="appSecret" prop="appSecret">
-          <span slot="label">
-            <el-tooltip content="在微信公众平台（mp.weixin.qq.com）的菜单 [设置与开发 - 公众号设置 - 基本设置] 中能找到「开发者密码(AppSecret)」" placement="top">
-              <i class="el-icon-question" />
-            </el-tooltip>
-            appSecret
-          </span>
-          <el-input v-model="form.appSecret" placeholder="请输入公众号 appSecret"/>
-        </el-form-item>
-        <el-form-item label="token" prop="token">
-          <el-input v-model="form.token" placeholder="请输入公众号token"/>
-        </el-form-item>
-        <el-form-item label="消息加解密密钥" prop="aesKey">
-          <el-input v-model="form.aesKey" placeholder="请输入消息加解密密钥"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input type="textarea" v-model="form.remark" placeholder="请输入备注"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  clearAccountQuota,
-  createAccount,
-  deleteAccount,
-  generateAccountQrCode,
-  getAccount,
-  getAccountPage,
-  updateAccount
-} from '@/api/mp/account'
-
-export default {
-  name: 'MpAccount',
-  components: {},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 公众号账号列表
-      list: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        name: null,
-        account: null,
-        appId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        name: [{required: true, message: '名称不能为空', trigger: 'blur'}],
-        account: [{required: true, message: '公众号账号不能为空', trigger: 'blur'}],
-        appId: [{required: true, message: '公众号 appId 不能为空', trigger: 'blur'}],
-        appSecret: [{required: true, message: '公众号密钥不能为空', trigger: 'blur'}],
-        token: [{required: true, message: '公众号 token 不能为空', trigger: 'blur'}],
-      },
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true
-      // 处理查询参数
-      let params = {...this.queryParams}
-      // 执行查询
-      getAccountPage(params).then(response => {
-        this.list = response.data.list
-        this.total = response.data.total
-        this.loading = false
-      })
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        name: undefined,
-        account: undefined,
-        appId: undefined,
-        appSecret: undefined,
-        token: undefined,
-        aesKey: undefined,
-        remark: undefined,
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRangeCreateTime = []
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加公众号账号'
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      const id = row.id
-      getAccount(id).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改公众号账号'
-      })
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs['form'].validate(valid => {
-        if (!valid) {
-          return
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateAccount(this.form).then(response => {
-            this.$modal.msgSuccess('修改成功')
-            this.open = false
-            this.getList()
-          })
-          return
-        }
-        // 添加的提交
-        createAccount(this.form).then(response => {
-          this.$modal.msgSuccess('新增成功')
-          this.open = false
-          this.getList()
-        })
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id
-      this.$modal.confirm('是否确认删除公众号账号编号为"' + row.name + '"的数据项?').then(function () {
-        return deleteAccount(id)
-      }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess('删除成功')
-      }).catch(() => {
-      })
-    },
-    /** 生成二维码的按钮操作 */
-    handleGenerateQrCode(row) {
-      const id = row.id
-      this.$modal.confirm('是否确认生成公众号账号编号为"' + row.name + '"的二维码?').then(function () {
-        return generateAccountQrCode(id)
-      }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess('生成二维码成功')
-      }).catch(() => {
-      })
-    },
-    /** 清空二维码 API 配额的按钮操作 */
-    handleCleanQuota(row) {
-      const id = row.id
-      this.$modal.confirm('是否确认清空生成公众号账号编号为"' + row.name + '"的 API 配额?').then(function () {
-        return clearAccountQuota(id)
-      }).then(() => {
-        this.$modal.msgSuccess('清空 API 配额成功')
-      }).catch(() => {
-      })
-    },
-  }
-}
-</script>
diff --git a/src/views/mp/autoReply/index.vue b/src/views/mp/autoReply/index.vue
deleted file mode 100644
index 5a33d180..00000000
--- a/src/views/mp/autoReply/index.vue
+++ /dev/null
@@ -1,384 +0,0 @@
-<!--
-MIT License
-
-Copyright (c) 2020 www.joolun.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-  芋道源码：
-  ① 移除 avue 框架，使用 element-ui 重写
-  ② 重写代码，保持和现有项目保持一致
--->
-<template>
-  <div class="app-container">
-    <doc-alert title="自动回复" url="https://doc.iocoder.cn/mp/auto-reply/" />
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公众号" prop="accountId">
-        <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- tab 切换 -->
-    <el-tabs v-model="type" @tab-click="handleClick">
-      <!-- 操作工具栏 -->
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                     v-hasPermi="['mp:auto-reply:create']" v-if="type !== '1' || list.length <= 0">新增
-          </el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
-      </el-row>
-      <!-- tab 项 -->
-      <el-tab-pane name="1">
-        <span slot="label"><i class="el-icon-star-off"></i> 关注时回复</span>
-      </el-tab-pane>
-      <el-tab-pane name="2">
-        <span slot="label"><i class="el-icon-chat-line-round"></i> 消息回复</span>
-      </el-tab-pane>
-      <el-tab-pane name="3">
-        <span slot="label"><i class="el-icon-news"></i> 关键词回复</span>
-      </el-tab-pane>
-    </el-tabs>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="请求消息类型" align="center" prop="requestMessageType" v-if="type === '2'" />
-      <el-table-column label="关键词" align="center" prop="requestKeyword" v-if="type === '3'" />
-      <el-table-column label="匹配类型" align="center" prop="requestMatch" v-if="type === '3'">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.MP_AUTO_REPLY_REQUEST_MATCH" :value="scope.row.requestMatch"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="回复消息类型" align="center">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.MP_MESSAGE_TYPE" :value="scope.row.responseMessageType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="回复内容" align="center">
-        <template v-slot="scope">
-          <div v-if="scope.row.responseMessageType === 'text'">{{ scope.row.responseContent }}</div>
-          <div v-else-if="scope.row.responseMessageType === 'voice'">
-            <wx-voice-player :url="scope.row.responseMediaUrl" />
-          </div>
-          <div v-else-if="scope.row.responseMessageType === 'image'">
-            <a target="_blank" :href="scope.row.responseMediaUrl">
-              <img :src="scope.row.responseMediaUrl" style="width: 100px">
-            </a>
-          </div>
-          <div v-else-if="scope.row.responseMessageType === 'video' || scope.row.responseMessageType === 'shortvideo'">
-            <wx-video-player :url="scope.row.responseMediaUrl" style="margin-top: 10px" />
-          </div>
-          <div v-else-if="scope.row.responseMessageType === 'news'">
-            <wx-news :articles="scope.row.responseArticles" />
-          </div>
-          <div v-else-if="scope.row.responseMessageType === 'music'">
-            <wx-music :title="scope.row.responseTitle" :description="scope.row.responseDescription"
-                      :thumb-media-url="scope.row.responseThumbMediaUrl"
-                      :music-url="scope.row.responseMusicUrl" :hq-music-url="scope.row.responseHqMusicUrl" />
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['mp:auto-reply:update']">修改
-          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['mp:auto-reply:delete']">删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 添加或修改自动回复的对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="消息类型" prop="requestMessageType" v-if="type === '2'">
-          <el-select v-model="form.requestMessageType" placeholder="请选择">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.MP_MESSAGE_TYPE)"
-                       :key="dict.value" :label="dict.label" :value="dict.value"
-                       v-if="requestMessageTypes.includes(dict.value)"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="匹配类型" prop="requestMatch" v-if="type === '3'">
-          <el-select v-model="form.requestMatch" placeholder="请选择匹配类型" clearable size="small">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.MP_AUTO_REPLY_REQUEST_MATCH)"
-                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="关键词" prop="requestKeyword" v-if="type === '3'">
-          <el-input v-model="form.requestKeyword" placeholder="请输入内容" clearable />
-        </el-form-item>
-        <el-form-item label="回复消息">
-          <wx-reply-select :objData="objData" v-if="hackResetWxReplySelect" />
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="handleSubmit">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue';
-import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue';
-import WxMsg from '@/views/mp/components/wx-msg/main.vue';
-import WxLocation from '@/views/mp/components/wx-location/main.vue';
-import WxMusic from '@/views/mp/components/wx-music/main.vue';
-import WxNews from '@/views/mp/components/wx-news/main.vue';
-import WxReplySelect from '@/views/mp/components/wx-reply/main.vue'
-import { getSimpleAccounts } from "@/api/mp/account";
-import { createAutoReply, deleteAutoReply, getAutoReply, getAutoReplyPage, updateAutoReply } from "@/api/mp/autoReply";
-
-export default {
-  name: 'MpAutoReply',
-  components: {
-    WxVideoPlayer,
-    WxVoicePlayer,
-    WxMsg,
-    WxLocation,
-    WxMusic,
-    WxNews,
-    WxReplySelect
-  },
-  data() {
-    return {
-      // tab 类型（1、关注时回复；2、消息回复；3、关键词回复）
-      type: '3',
-      // 允许选择的请求消息类型
-      requestMessageTypes: ['text', 'image', 'voice', 'video', 'shortvideo', 'location', 'link'],
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 自动回复列表
-      list: [],
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        accountId: undefined,
-      },
-
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 表单参数
-      form: {},
-      // 回复消息
-      objData: {
-        type : 'text'
-      },
-      // 表单校验
-      rules: {
-        requestKeyword: [{ required: true, message: "请求的关键字不能为空", trigger: "blur" }],
-        requestMatch: [{ required: true, message: "请求的关键字的匹配不能为空", trigger: "blur" }],
-      },
-      hackResetWxReplySelect: false, // 重置 WxReplySelect 组件，解决无法清除的问题
-
-      // 公众号账号列表
-      accounts: []
-    }
-  },
-  created() {
-    getSimpleAccounts().then(response => {
-      this.accounts = response.data;
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.queryParams.accountId = this.accounts[0].id;
-      }
-      // 加载数据
-      this.getList();
-    })
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      // 如果没有选中公众号账号，则进行提示。
-      if (!this.queryParams.accountId) {
-        this.$message.warning('未选中公众号，无法查询自动回复')
-        return false
-      }
-
-      this.loading = false
-      // 处理查询参数
-      let params = {
-        ...this.queryParams,
-        type: this.type
-      }
-      // 执行查询
-      getAutoReplyPage(params).then(response => {
-        this.list = response.data.list
-        this.total = response.data.total
-        this.loading = false
-      })
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.queryParams.accountId = this.accounts[0].id;
-      }
-      this.handleQuery()
-    },
-    handleClick(tab, event) {
-      this.type = tab.name
-      this.handleQuery()
-    },
-
-    /** 新增按钮操作 */
-    handleAdd(){
-      this.reset();
-      this.resetEditor();
-      // 打开表单，并设置初始化
-      this.open = true
-      this.title = '新增自动回复';
-      this.objData = {
-        type : 'text',
-        accountId: this.queryParams.accountId,
-      }
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.resetEditor();
-      const id = row.id;
-      getAutoReply(id).then(response => {
-        // 设置属性
-        this.form = {...response.data}
-        this.$delete(this.form, 'responseMessageType');
-        this.$delete(this.form, 'responseContent');
-        this.$delete(this.form, 'responseMediaId');
-        this.$delete(this.form, 'responseMediaUrl');
-        this.$delete(this.form, 'responseDescription');
-        this.$delete(this.form, 'responseArticles');
-        this.objData = {
-          type: response.data.responseMessageType,
-          accountId: this.queryParams.accountId,
-          content: response.data.responseContent,
-          mediaId: response.data.responseMediaId,
-          url: response.data.responseMediaUrl,
-          title: response.data.responseTitle,
-          description: response.data.responseDescription,
-          thumbMediaId: response.data.responseThumbMediaId,
-          thumbMediaUrl: response.data.responseThumbMediaUrl,
-          articles: response.data.responseArticles,
-          musicUrl: response.data.responseMusicUrl,
-          hqMusicUrl: response.data.responseHqMusicUrl,
-        }
-
-        // 打开表单
-        this.open = true
-        this.title = '修改自动回复';
-      })
-    },
-    handleSubmit() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 处理回复消息
-        const form = {...this.form};
-        form.responseMessageType = this.objData.type;
-        form.responseContent = this.objData.content;
-        form.responseMediaId = this.objData.mediaId;
-        form.responseMediaUrl = this.objData.url;
-        form.responseTitle = this.objData.title;
-        form.responseDescription = this.objData.description;
-        form.responseThumbMediaId = this.objData.thumbMediaId;
-        form.responseThumbMediaUrl = this.objData.thumbMediaUrl;
-        form.responseArticles = this.objData.articles;
-        form.responseMusicUrl = this.objData.musicUrl;
-        form.responseHqMusicUrl = this.objData.hqMusicUrl;
-
-        if (this.form.id !== undefined) {
-          updateAutoReply(form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-        } else {
-          createAutoReply(form).then(response => {
-            this.$modal.msgSuccess("新增成功");
-            this.open = false;
-            this.getList();
-          });
-        }
-      });
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        accountId: this.queryParams.accountId,
-        type: this.type,
-        requestKeyword: undefined,
-        requestMatch: this.type === '3' ? 1 : undefined,
-        requestMessageType: undefined,
-      };
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单 Editor 重置
-    resetEditor() {
-      this.hackResetWxReplySelect = false // 销毁组件
-      this.$nextTick(() => {
-        this.hackResetWxReplySelect = true // 重建组件
-      })
-    },
-    handleDelete: function(row) {
-      const ids = row.id;
-      this.$modal.confirm('是否确认删除此数据?').then(function() {
-        return deleteAutoReply(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-  }
-}
-</script>
diff --git a/src/views/mp/components/wx-editor/WxEditor.vue b/src/views/mp/components/wx-editor/WxEditor.vue
deleted file mode 100644
index bedd624f..00000000
--- a/src/views/mp/components/wx-editor/WxEditor.vue
+++ /dev/null
@@ -1,230 +0,0 @@
-<!--
-  - Copyright (C) 2018-2019
-  - All rights reserved, Designed By www.joolun.com
-  芋道源码：
-  ① 调整 uploadData 属性，只需要传入 accountId 即可
--->
-<template>
-  <div id="wxEditor">
-    <div v-loading="quillUpdateImg" element-loading-text="请稍等，图片上传中">
-      <!-- 图片上传组件辅助-->
-      <el-upload class="avatar-uploader" name="file" :action="actionUrl" :headers="headers"
-                 :show-file-list="false" :data="uploadData"
-                 :on-success="uploadSuccess" :on-error="uploadError" :before-upload="beforeUpload">
-      </el-upload>
-      <quill-editor class="editor" v-model="content" ref="myQuillEditor" :options="editorOption"
-              @change="onEditorChange($event)">
-      </quill-editor>
-    </div>
-  </div>
-</template>
-
-<script>
-// 工具栏配置
-const toolbarOptions = [
-  ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线
-  ["blockquote", "code-block"], // 引用  代码块
-  [{ header: 1 }, { header: 2 }], // 1、2 级标题
-  [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表
-  [{ script: "sub" }, { script: "super" }], // 上标/下标
-  [{ indent: "-1" }, { indent: "+1" }], // 缩进
-  // [{'direction': 'rtl'}],                         // 文本方向
-  [{ size: ["small", false, "large", "huge"] }], // 字体大小
-  [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
-  [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
-  [{ font: [] }], // 字体种类
-  [{ align: [] }], // 对齐方式
-  ["clean"], // 清除文本格式
-  ["link", "image", "video"] // 链接、图片、视频
-]
-
-import { quillEditor } from "vue-quill-editor"
-import "quill/dist/quill.core.css"
-import "quill/dist/quill.snow.css"
-import "quill/dist/quill.bubble.css"
-import { getAccessToken } from "@/utils/auth";
-
-export default {
-  props: {
-    /* 公众号账号编号 */
-    accountId: {
-      type: Number,
-      required: true
-    },
-    /* 编辑器的内容 */
-    value: {
-      type: String
-    },
-    /* 图片大小 */
-    maxSize: {
-      type: Number,
-      default: 4000 // kb
-    }
-  },
-  name: 'wxEditor',
-  components: {
-    quillEditor
-  },
-  data() {
-    return {
-      editorType: '1',
-      content: this.value.replace(/data-src/g, "src"),
-
-      quillUpdateImg: false, // 根据图片上传状态来确定是否显示loading动画，刚开始是false,不显示
-      editorOption: {
-        theme: "snow", // or 'bubble'
-        placeholder: "请输入文章内容",
-        modules: {
-          toolbar: {
-            container: toolbarOptions,
-            // container: "#toolbar",
-            handlers: {
-              image: function(value) {
-                if (value) {
-                  // 触发input框选择图片文件
-                  document.querySelector(".avatar-uploader input").click();
-                } else {
-                  this.quill.format("image", false);
-                }
-              },
-              link: function(value) {
-                if (value) {
-                  const href = prompt('注意！只支持公众号图文链接');
-                  this.quill.format("link", href);
-                } else {
-                  this.quill.format("link", false);
-                }
-              },
-            }
-          }
-        }
-      },
-      actionUrl: process.env.VUE_APP_BASE_API +'/admin-api/mp/material/upload-news-image', // 这里写你要上传的图片服务器地址
-      headers: { Authorization: "Bearer " + getAccessToken() }, // 设置上传的请求头部
-      uploadData: {
-        "type": 'image', // TODO 芋艿：试试要不要换成 thumb
-        "accountId": this.accountId,
-      },
-    }
-  },
-  methods: {
-    onEditorChange(editor) {
-      //内容改变事件
-      this.$emit("input", this.content)
-    },
-
-    // 富文本图片上传前
-    beforeUpload() {
-      // 显示 loading 动画
-      this.quillUpdateImg = true
-    },
-
-    // 图片上传成功
-    // 注意！由于微信公众号的图片有访问限制，所以会显示“此图片来自微信公众号，未经允许不可引用”
-    uploadSuccess(res, file) {
-      // res为图片服务器返回的数据
-      // 获取富文本组件实例
-      let quill = this.$refs.myQuillEditor.quill
-      // 如果上传成功
-      const link = res.data
-      if (link){
-        // 获取光标所在位置
-        let length = quill.getSelection().index;
-        // 插入图片  res.info为服务器返回的图片地址
-        quill.insertEmbed(length, 'image', link)
-        // 调整光标到最后
-        quill.setSelection(length + 1)
-      } else {
-        this.$message.warning('图片插入失败')
-      }
-      // loading 动画消失
-      this.quillUpdateImg = false;
-    },
-    // 富文本图片上传失败
-    uploadError() {
-      // loading 动画消失
-      this.quillUpdateImg = false;
-      this.$message.warning("图片插入失败");
-    }
-  }
-}
-</script>
-
-<style>
-.editor {
-  line-height: normal !important;
-  height: 500px;
-}
-.ql-snow .ql-tooltip[data-mode=link]::before {
-  content: "请输入链接地址:";
-}
-.ql-snow .ql-tooltip.ql-editing a.ql-action::after {
-  border-right: 0;
-  content: '保存';
-  padding-right: 0;
-}
-
-.ql-snow .ql-tooltip[data-mode=video]::before {
-  content: "请输入视频地址:";
-}
-
-.ql-snow .ql-picker.ql-size .ql-picker-label::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item::before {
-  content: '14px';
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value=small]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=small]::before {
-  content: '10px';
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value=large]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=large]::before {
-  content: '18px';
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value=huge]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=huge]::before {
-  content: '32px';
-}
-
-.ql-snow .ql-picker.ql-header .ql-picker-label::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item::before {
-  content: '文本';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
-  content: '标题1';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
-  content: '标题2';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
-  content: '标题3';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
-  content: '标题4';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
-  content: '标题5';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
-  content: '标题6';
-}
-
-.ql-snow .ql-picker.ql-font .ql-picker-label::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item::before {
-  content: '标准字体';
-}
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=serif]::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=serif]::before {
-  content: '衬线字体';
-}
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=monospace]::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=monospace]::before {
-  content: '等宽字体';
-}
-</style>
-
diff --git a/src/views/mp/components/wx-location/main.vue b/src/views/mp/components/wx-location/main.vue
deleted file mode 100644
index 385d46d5..00000000
--- a/src/views/mp/components/wx-location/main.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  【微信消息 - 定位】
--->
-<template>
-  <div>
-    <el-link type="primary" target="_blank" :href="'https://map.qq.com/?type=marker&isopeninfowin=1&markertype=1&pointx=' + locationY + '&pointy=' + locationX + '&name=' + label + '&ref=yudao'">
-      <img :src="'https://apis.map.qq.com/ws/staticmap/v2/?zoom=10&markers=color:blue|label:A|' + locationX + ',' + locationY + '&key=' + qqMapKey + '&size=250*180'">
-      <p/><i class="el-icon-map-location"></i>{{label}}
-    </el-link>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "wxLocation",
-  props: {
-    locationX: {
-      required: true,
-      type: Number
-    },
-    locationY: {
-      required: true,
-      type: Number
-    },
-    label: { // 地名
-      required: true,
-      type: String
-    },
-    qqMapKey: { // QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
-      required: false,
-      type: String,
-      default: 'TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E' // 需要自定义
-    }
-  }
-};
-</script>
diff --git a/src/views/mp/components/wx-material-select/main.vue b/src/views/mp/components/wx-material-select/main.vue
deleted file mode 100644
index 4d1f48e7..00000000
--- a/src/views/mp/components/wx-material-select/main.vue
+++ /dev/null
@@ -1,247 +0,0 @@
-<!--
-  - Copyright (C) 2018-2019
-  - All rights reserved, Designed By www.joolun.com
-  芋道源码：
-  ① 移除 avue 组件，使用 ElementUI 原生组件
--->
-<template>
-  <!-- 类型：图片 -->
-  <div v-if="objData.type === 'image'">
-    <div class="waterfall" v-loading="loading">
-      <div class="waterfall-item" v-for="item in list" :key="item.mediaId">
-        <img class="material-img" :src="item.url">
-        <p class="item-name">{{item.name}}</p>
-        <el-row class="ope-row">
-          <el-button size="mini" type="success" @click="selectMaterial(item)">选择
-            <i class="el-icon-circle-check el-icon--right"></i>
-          </el-button>
-        </el-row>
-      </div>
-    </div>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getMaterialPage"/>
-  </div>
-  <!-- 类型：语音 -->
-  <div v-else-if="objData.type === 'voice'">
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="编号" align="center" prop="mediaId" />
-      <el-table-column label="文件名" align="center" prop="name" />
-      <el-table-column label="语音" align="center">
-        <template v-slot="scope">
-          <wx-voice-player :url="scope.row.url" />
-        </template>
-      </el-table-column>
-      <el-table-column label="上传时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-circle-plus"
-                     @click="selectMaterial(scope.row)">选择</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getPage"/>
-  </div>
-  <div v-else-if="objData.type === 'video'">
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="编号" align="center" prop="mediaId" />
-      <el-table-column label="文件名" align="center" prop="name" />
-      <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="介绍" align="center" prop="introduction" />
-      <el-table-column label="视频" align="center">
-        <template v-slot="scope">
-          <wx-video-player :url="scope.row.url" />
-        </template>
-      </el-table-column>
-      <el-table-column label="上传时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-circle-plus"
-                     @click="selectMaterial(scope.row)">选择</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getMaterialPage"/>
-  </div>
-  <div v-else-if="objData.type === 'news'">
-    <div class="waterfall" v-loading="loading">
-      <div class="waterfall-item" v-for="item in list" :key="item.mediaId" v-if="item.content && item.content.newsItem">
-        <wx-news :articles="item.content.newsItem" />
-        <el-row class="ope-row">
-          <el-button size="mini" type="success" @click="selectMaterial(item)">
-            选择<i class="el-icon-circle-check el-icon--right"></i>
-          </el-button>
-        </el-row>
-      </div>
-    </div>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getMaterialPage"/>
-  </div>
-</template>
-
-<script>
-import WxNews from '@/views/mp/components/wx-news/main.vue';
-import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue';
-import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue';
-import { getMaterialPage } from "@/api/mp/material";
-import { getFreePublishPage } from "@/api/mp/freePublish";
-import { getDraftPage } from "@/api/mp/draft";
-
-export default {
-  name: "wxMaterialSelect",
-  components: {
-    WxNews,
-    WxVoicePlayer,
-    WxVideoPlayer
-  },
-  props: {
-    objData: {
-      type: Object, // type - 类型；accountId - 公众号账号编号
-      required: true
-    },
-    newsType:{ // 图文类型：1、已发布图文；2、草稿箱图文
-      type: String,
-      default: "1"
-    },
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 总条数
-      total: 0,
-      // 数据列表
-      list: [],
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        accountId: this.objData.accountId,
-      },
-    }
-  },
-  created() {
-    this.getPage()
-  },
-  methods:{
-    selectMaterial(item) {
-      this.$emit('selectMaterial', item)
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1
-      this.getPage()
-    },
-    getPage() {
-      this.loading = true
-      if (this.objData.type === 'news' && this.newsType === '1') { // 【图文】+ 【已发布】
-        this.getFreePublishPage();
-      } else if (this.objData.type === 'news' && this.newsType === '2') { // 【图文】+ 【草稿】
-        this.getDraftPage();
-      } else { // 【素材】
-        this.getMaterialPage();
-      }
-    },
-    getMaterialPage() {
-      getMaterialPage({
-        ...this.queryParams,
-        type: this.objData.type
-      }).then(response => {
-        this.list = response.data.list
-        this.total = response.data.total
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    getFreePublishPage() {
-      getFreePublishPage(this.queryParams).then(response => {
-        // 将 thumbUrl 转成 picUrl，保证 wx-news 组件可以预览封面
-        response.data.list.forEach(item => {
-          const newsItem = item.content.newsItem;
-          newsItem.forEach(article => {
-            article.picUrl = article.thumbUrl;
-          })
-        })
-        this.list = response.data.list
-        this.total = response.data.total
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    getDraftPage() {
-      getDraftPage((this.queryParams)).then(response => {
-        // 将 thumbUrl 转成 picUrl，保证 wx-news 组件可以预览封面
-        response.data.list.forEach(item => {
-          const newsItem = item.content.newsItem;
-          newsItem.forEach(article => {
-            article.picUrl = article.thumbUrl;
-          })
-        })
-        this.list = response.data.list
-        this.total = response.data.total
-      }).finally(() => {
-        this.loading = false
-      })
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-/*瀑布流样式*/
-.waterfall {
-  width: 100%;
-  column-gap:10px;
-  column-count: 5;
-  margin: 0 auto;
-}
-.waterfall-item {
-  padding: 10px;
-  margin-bottom: 10px;
-  break-inside: avoid;
-  border: 1px solid #eaeaea;
-}
-.material-img {
-  width: 100%;
-}
-p {
-  line-height: 30px;
-}
-@media (min-width: 992px) and (max-width: 1300px) {
-  .waterfall {
-    column-count: 3;
-  }
-  p {
-    color:red;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .waterfall {
-    column-count: 2;
-  }
-  p {
-    color: orange;
-  }
-}
-@media (max-width: 767px) {
-  .waterfall {
-    column-count: 1;
-  }
-}
-/*瀑布流样式*/
-</style>
diff --git a/src/views/mp/components/wx-msg/card.scss b/src/views/mp/components/wx-msg/card.scss
deleted file mode 100644
index 67ac9219..00000000
--- a/src/views/mp/components/wx-msg/card.scss
+++ /dev/null
@@ -1,101 +0,0 @@
-.avue-card{
-  &__item{
-    margin-bottom: 16px;
-    border: 1px solid #e8e8e8;
-    background-color: #fff;
-    box-sizing: border-box;
-    color: rgba(0,0,0,.65);
-    font-size: 14px;
-    font-variant: tabular-nums;
-    line-height: 1.5;
-    list-style: none;
-    font-feature-settings: "tnum";
-    cursor: pointer;
-    height:200px;
-    &:hover{
-      border-color: rgba(0,0,0,.09);
-      box-shadow: 0 2px 8px rgba(0,0,0,.09);
-    }
-    &--add{
-      border:1px dashed #000;
-      width: 100%;
-      color: rgba(0,0,0,.45);
-      background-color: #fff;
-      border-color: #d9d9d9;
-      border-radius: 2px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 16px;
-      i{
-        margin-right: 10px;
-      }
-      &:hover{
-        color: #40a9ff;
-        background-color: #fff;
-        border-color: #40a9ff;
-      }
-    }
-  }
-  &__body{
-    display: flex;
-    padding: 24px;
-  }
-  &__detail{
-    flex:1
-  }
-  &__avatar{
-    width: 48px;
-    height: 48px;
-    border-radius: 48px;
-    overflow: hidden;
-    margin-right: 12px;
-    img{
-      width: 100%;
-      height: 100%;
-    }
-  }
-  &__title{
-    color: rgba(0,0,0,.85);
-    margin-bottom: 12px;
-    font-size: 16px;
-    &:hover{
-      color:#1890ff;
-    }
-  }
-  &__info{
-    color: rgba(0,0,0,.45);
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 3;
-    overflow: hidden;
-    height: 64px;
-  }
-  &__menu{
-    display: flex;
-    justify-content:space-around;
-    height: 50px;
-    background: #f7f9fa;
-    color: rgba(0,0,0,.45);
-    text-align: center;
-    line-height: 50px;
-    &:hover{
-      color:#1890ff;
-    }
-  }
-}
-
-/** joolun 额外加的 */
-.avue-comment__main {
-  flex: unset!important;
-  border-radius: 5px!important;
-  margin: 0 8px!important;
-}
-.avue-comment__header {
-  border-top-left-radius: 5px;
-  border-top-right-radius: 5px;
-}
-.avue-comment__body {
-  border-bottom-right-radius: 5px;
-  border-bottom-left-radius: 5px;
-}
diff --git a/src/views/mp/components/wx-msg/comment.scss b/src/views/mp/components/wx-msg/comment.scss
deleted file mode 100644
index 3f1341b2..00000000
--- a/src/views/mp/components/wx-msg/comment.scss
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 来自 https://github.com/nmxiaowei/avue/blob/master/styles/src/element-ui/comment.scss  */
-.avue-comment{
-  margin-bottom: 30px;
-  display: flex;
-  align-items: flex-start;
-  &--reverse{
-    flex-direction:row-reverse;
-    .avue-comment__main{
-      &:before,&:after{
-        left: auto;
-        right: -8px;
-        border-width: 8px 0 8px 8px;
-      }
-      &:before{
-        border-left-color: #dedede;
-      }
-      &:after{
-        border-left-color: #f8f8f8;
-        margin-right: 1px;
-        margin-left: auto;
-      }
-    }
-  }
-  &__avatar{
-    width: 48px;
-    height: 48px;
-    border-radius: 50%;
-    border: 1px solid transparent;
-    box-sizing: border-box;
-    vertical-align: middle;
-  }
-  &__header{
-    padding: 5px 15px;
-    background: #f8f8f8;
-    border-bottom: 1px solid #eee;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  &__author{
-    font-weight: 700;
-    font-size: 14px;
-    color: #999;
-  }
-  &__main{
-    flex:1;
-    margin: 0 20px;
-    position: relative;
-    border: 1px solid #dedede;
-    border-radius: 2px;
-    &:before,&:after{
-      position: absolute;
-      top: 10px;
-      left: -8px;
-      right: 100%;
-      width: 0;
-      height: 0;
-      display: block;
-      content: " ";
-      border-color: transparent;
-      border-style: solid solid outset;
-      border-width: 8px 8px 8px 0;
-      pointer-events: none;
-    }
-    &:before {
-      border-right-color: #dedede;
-      z-index: 1;
-    }
-    &:after{
-      border-right-color: #f8f8f8;
-      margin-left: 1px;
-      z-index: 2;
-    }
-  }
-  &__body{
-    padding: 15px;
-    overflow: hidden;
-    background: #fff;
-    font-family: Segoe UI,Lucida Grande,Helvetica,Arial,Microsoft YaHei,FreeSans,Arimo,Droid Sans,wenquanyi micro hei,Hiragino Sans GB,Hiragino Sans GB W3,FontAwesome,sans-serif;color: #333;
-    font-size: 14px;
-  }
-  blockquote{
-    margin:0;
-    font-family: Georgia,Times New Roman,Times,Kai,Kaiti SC,KaiTi,BiauKai,FontAwesome,serif;
-    padding: 1px 0 1px 15px;
-    border-left: 4px solid #ddd;
-  }
-}
diff --git a/src/views/mp/components/wx-msg/main.vue b/src/views/mp/components/wx-msg/main.vue
deleted file mode 100644
index c6155eae..00000000
--- a/src/views/mp/components/wx-msg/main.vue
+++ /dev/null
@@ -1,294 +0,0 @@
-<!--
-  - Copyright (C) 2018-2019
-  - All rights reserved, Designed By www.joolun.com
-  芋道源码：
-  ① 移除暂时用不到的 websocket
-  ② 代码优化，补充注释，提升阅读性
--->
-<template>
-  <div class="msg-main">
-    <div class="msg-div" :id="'msg-div' + nowStr">
-      <!-- 加载更多 -->
-      <div v-loading="loading"></div>
-      <div v-if="!loading">
-        <div class="el-table__empty-block" v-if="loadMore" @click="loadingMore"><span class="el-table__empty-text">点击加载更多</span></div>
-        <div class="el-table__empty-block" v-if="!loadMore"><span class="el-table__empty-text">没有更多了</span></div>
-      </div>
-      <!-- 消息列表 -->
-      <div class="execution" v-for="item in list" :key='item.id'>
-        <div class="avue-comment" :class="item.sendFrom === 2 ? 'avue-comment--reverse' : ''">
-          <div class="avatar-div">
-            <img :src="item.sendFrom === 1 ? user.avatar : mp.avatar" class="avue-comment__avatar">
-            <div class="avue-comment__author">{{item.sendFrom === 1 ? user.nickname : mp.nickname }}</div>
-          </div>
-          <div class="avue-comment__main">
-            <div class="avue-comment__header">
-              <div class="avue-comment__create_time">{{ parseTime(item.createTime) }}</div>
-            </div>
-            <div class="avue-comment__body" :style="item.sendFrom === 2 ? 'background: #6BED72;' : ''">
-              <!-- 【事件】区域 -->
-              <div v-if="item.type === 'event' && item.event === 'subscribe'">
-                <el-tag type="success" size="mini">关注</el-tag>
-              </div>
-              <div v-else-if="item.type === 'event' && item.event === 'unsubscribe'">
-                <el-tag type="danger" size="mini">取消关注</el-tag>
-              </div>
-              <div v-else-if="item.type === 'event' && item.event === 'CLICK'">
-                <el-tag size="mini">点击菜单</el-tag>【{{ item.eventKey }}】
-              </div>
-              <div v-else-if="item.type === 'event' && item.event === 'VIEW'">
-                <el-tag size="mini">点击菜单链接</el-tag>【{{ item.eventKey }}】
-              </div>
-              <div v-else-if="item.type === 'event' && item.event === 'scancode_waitmsg'">
-                <el-tag size="mini">扫码结果</el-tag>【{{ item.eventKey }}】
-              </div>
-              <div v-else-if="item.type === 'event' && item.event === 'scancode_push'">
-                <el-tag size="mini">扫码结果</el-tag>【{{ item.eventKey }}】
-              </div>
-              <div v-else-if="item.type === 'event' && item.event === 'pic_sysphoto'">
-                <el-tag size="mini">系统拍照发图</el-tag>
-              </div>
-              <div v-else-if="item.type === 'event' && item.event === 'pic_photo_or_album'">
-                <el-tag size="mini">拍照或者相册</el-tag>
-              </div>
-              <div v-else-if="item.type === 'event' && item.event === 'pic_weixin'">
-                <el-tag size="mini">微信相册</el-tag>
-              </div>
-              <div v-else-if="item.type === 'event' && item.event === 'location_select'">
-                <el-tag size="mini">选择地理位置</el-tag>
-              </div>
-              <div v-else-if="item.type === 'event'">
-                <el-tag type="danger" size="mini">未知事件类型</el-tag>
-              </div>
-              <!-- 【消息】区域 -->
-              <div v-else-if="item.type === 'text'">{{ item.content }}</div>
-              <div v-else-if="item.type === 'voice'">
-                <wx-voice-player :url="item.mediaUrl" :content="item.recognition" />
-              </div>
-              <div v-else-if="item.type === 'image'">
-                <a target="_blank" :href="item.mediaUrl">
-                  <img :src="item.mediaUrl" style="width: 100px">
-                </a>
-              </div>
-              <div v-else-if="item.type === 'video' || item.type === 'shortvideo'" style="text-align: center">
-                <wx-video-player :url="item.mediaUrl" />
-              </div>
-              <div v-else-if="item.type === 'link'" class="avue-card__detail">
-                <el-link type="success" :underline="false" target="_blank" :href="item.url">
-                  <div class="avue-card__title"><i class="el-icon-link"></i>{{ item.title }}</div>
-                </el-link>
-                <div class="avue-card__info" style="height: unset">{{item.description}}</div>
-              </div>
-              <!-- TODO 芋艿：待完善 -->
-              <div v-else-if="item.type === 'location'">
-                <wx-location :label="item.label" :location-y="item.locationY" :location-x="item.locationX" />
-              </div>
-              <div v-else-if="item.type === 'news'" style="width: 300px"> <!-- TODO 芋艿：待测试；详情页也存在类似的情况 -->
-                <wx-news :articles="item.articles" />
-              </div>
-              <div v-else-if="item.type === 'music'">
-                <wx-music :title="item.title" :description="item.description" :thumb-media-url="item.thumbMediaUrl"
-                  :music-url="item.musicUrl" :hq-music-url="item.hqMusicUrl" />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="msg-send" v-loading="sendLoading">
-      <wx-reply-select ref="replySelect" :objData="objData" />
-      <el-button type="success" size="small" class="send-but" @click="sendMsg">发送(S)</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getMessagePage, sendMessage } from '@/api/mp/message'
-  import WxReplySelect from '@/views/mp/components/wx-reply/main.vue'
-  import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue';
-  import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue';
-  import WxNews from '@/views/mp/components/wx-news/main.vue';
-  import WxLocation from '@/views/mp/components/wx-location/main.vue';
-  import WxMusic from '@/views/mp/components/wx-music/main.vue';
-import { getUser } from "@/api/mp/mpuser";
-
-export default {
-  name: "wxMsg",
-  components: {
-    WxReplySelect,
-    WxVideoPlayer,
-    WxVoicePlayer,
-    WxNews,
-    WxLocation,
-    WxMusic
-  },
-  props: {
-    userId: {
-      type: Number,
-      required: true
-    },
-  },
-  data() {
-    return {
-      nowStr: new Date().getTime(), // 当前的时间戳，用于每次消息加载后，回到原位置；具体见 :id="'msg-div' + nowStr" 处
-      loading: false, // 消息列表是否正在加载中
-      loadMore: true, // 是否可以加载更多
-      list: [], // 消息列表
-      queryParams: {
-        pageNo: 1, // 当前页数
-        pageSize: 14, // 每页显示多少条
-        accountId: undefined,
-      },
-      user: { // 由于微信不再提供昵称，直接使用“用户”展示
-        nickname: '用户',
-        avatar: require("@/assets/images/profile.jpg"),
-        accountId: 0, // 公众号账号编号
-      },
-      mp: {
-        nickname: '公众号',
-        avatar: require("@/assets/images/wechat.png"),
-      },
-
-      // ========= 消息发送 =========
-      sendLoading: false, // 发送消息是否加载中
-      objData: { // 微信发送消息
-        type: 'text',
-      },
-    }
-  },
-  created() {
-    // 获得用户信息
-    getUser(this.userId).then(response => {
-      this.user.nickname = response.data.nickname && response.data.nickname.length > 0 ?
-          response.data.nickname : this.user.nickname;
-      this.user.avatar = response.data.avatar && this.user.avatar.length > 0 ?
-          response.data.avatar : this.user.avatar;
-      this.user.accountId = response.data.accountId;
-      // 设置公众号账号编号
-      this.queryParams.accountId = response.data.accountId;
-      this.objData.accountId = response.data.accountId;
-
-      // 加载消息
-      console.log(this.queryParams)
-      this.refreshChange()
-    })
-  },
-  methods:{
-    sendMsg(){
-      if (!this.objData) {
-        return;
-      }
-      // 公众号限制：客服消息，公众号只允许发送一条
-      if (this.objData.type === 'news'
-        && this.objData.articles.length > 1) {
-        this.objData.articles = [this.objData.articles[0]]
-        this.$message({
-          showClose: true,
-          message: '图文消息条数限制在 1 条以内，已默认发送第一条',
-          type: 'success'
-        })
-      }
-
-      // 执行发送
-      this.sendLoading = true
-      sendMessage(Object.assign({
-        userId: this.userId
-      }, {
-        ...this.objData
-      })).then(response => {
-        this.sendLoading = false
-        // 添加到消息列表，并滚动
-        this.list = [...this.list , ...[response.data] ]
-        this.scrollToBottom()
-        // 重置 objData 状态
-        this.$refs['replySelect'].deleteObj(); // 重置，避免 tab 的数据未清理
-      }).catch(() => {
-        this.sendLoading = false
-      })
-    },
-    loadingMore() {
-      this.queryParams.pageNo++
-      this.getPage(this.queryParams)
-    },
-    getPage(page, params) {
-      this.loading = true
-      getMessagePage(Object.assign({
-        pageNo: page.pageNo,
-        pageSize: page.pageSize,
-        userId: this.userId,
-        accountId: page.accountId,
-      }, params)).then(response => {
-        // 计算当前的滚动高度
-        const msgDiv = document.getElementById('msg-div' + this.nowStr);
-        let scrollHeight = 0
-        if(msgDiv){
-          scrollHeight = msgDiv.scrollHeight
-        }
-
-        // 处理数据
-        const data = response.data.list.reverse();
-        this.list = [...data, ...this.list]
-        this.loading = false
-        if (data.length < this.queryParams.pageSize || data.length === 0){
-          this.loadMore = false
-        }
-        this.queryParams.pageNo = page.pageNo
-        this.queryParams.pageSize = page.pageSize
-
-        // 滚动到原来的位置
-        if(this.queryParams.pageNo === 1) { // 定位到消息底部
-          this.scrollToBottom()
-        } else if (data.length !== 0) { // 定位滚动条
-          this.$nextTick(() => {
-            if (scrollHeight !== 0){
-              msgDiv.scrollTop = document.getElementById('msg-div'+this.nowStr).scrollHeight - scrollHeight - 100
-            }
-          })
-        }
-      })
-    },
-    /**
-     * 刷新回调
-     */
-    refreshChange() {
-      this.getPage(this.queryParams)
-    },
-    /** 定位到消息底部 */
-    scrollToBottom: function () {
-      this.$nextTick(() => {
-        let div = document.getElementById('msg-div' + this.nowStr)
-        div.scrollTop = div.scrollHeight
-      })
-    },
-  }
-};
-</script>
-<style lang="scss" scoped>
-/* 因为 joolun 实现依赖 avue 组件，该页面使用了 comment.scss、card.scc  */
-@import './comment.scss';
-@import './card.scss';
-
-.msg-main {
-  margin-top: -30px;
-  padding: 10px;
-}
-.msg-div {
-  height: 50vh;
-  overflow: auto;
-  background-color: #eaeaea;
-  margin-left: 10px;
-  margin-right: 10px;
-}
-.msg-send {
-  padding: 10px;
-}
-.avatar-div {
-  text-align: center;
-  width: 80px;
-}
-.send-but {
-  float: right;
-  margin-top: 8px!important;
-}
-</style>
-
diff --git a/src/views/mp/components/wx-music/main.vue b/src/views/mp/components/wx-music/main.vue
deleted file mode 100644
index 5b2676e1..00000000
--- a/src/views/mp/components/wx-music/main.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-  【微信消息 - 音乐】
--->
-<template>
-  <div>
-    <el-link type="success" :underline="false" target="_blank" :href="hqMusicUrl ? hqMusicUrl : musicUrl">
-      <div class="avue-card__body" style="padding:10px;background-color: #fff;border-radius: 5px">
-        <div class="avue-card__avatar">
-          <img :src="thumbMediaUrl" alt=""/>
-        </div>
-        <div class="avue-card__detail">
-          <div class="avue-card__title" style="margin-bottom:unset">{{ title }}</div>
-          <div class="avue-card__info" style="height: unset">{{ description }}</div>
-        </div>
-      </div>
-    </el-link>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "wxMusic",
-  props: {
-    title: {
-      required: false,
-      type: String
-    },
-    description: {
-      required: false,
-      type: String
-    },
-    musicUrl: {
-      required: false,
-      type: String
-    },
-    hqMusicUrl: {
-      required: false,
-      type: String
-    },
-    thumbMediaUrl: {
-      required: true,
-      type: String
-    },
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-/* 因为 joolun 实现依赖 avue 组件，该页面使用了 card.scc  */
-@import '../wx-msg/card.scss';
-</style>
diff --git a/src/views/mp/components/wx-news/main.vue b/src/views/mp/components/wx-news/main.vue
deleted file mode 100644
index bc09dca4..00000000
--- a/src/views/mp/components/wx-news/main.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<!--
-  - Copyright (C) 2018-2019
-  - All rights reserved, Designed By www.joolun.com
-  【微信消息 - 图文】
-  芋道源码：
-  ① 代码优化，补充注释，提升阅读性
--->
-<template>
-  <div class="news-home">
-    <div v-for="(article, index) in articles" :key="index" class="news-div">
-      <!-- 头条 -->
-      <a target="_blank" :href="article.url" v-if="index === 0">
-        <div class="news-main">
-          <div class="news-content">
-            <img class="material-img" :src="article.picUrl" width="280px" height="120px"/>
-            <div class="news-content-title">
-              <span>{{article.title}}</span>
-            </div>
-          </div>
-        </div>
-      </a>
-      <!-- 二条/三条等等 -->
-      <a target="_blank" :href="article.url" v-else>
-        <div class="news-main-item">
-          <div class="news-content-item">
-            <div class="news-content-item-title">{{article.title}}</div>
-            <div class="news-content-item-img">
-              <img class="material-img" :src="article.picUrl" height="100%"/>
-            </div>
-          </div>
-        </div>
-      </a>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "wxNews",
-  props: {
-    articles: {
-      type: Array // title - 标题；description - 描述；picUrl - 图片连接；url - 跳转链接
-    }
-  },
-  // created() {
-  //   console.log(this.articles)
-  // },
-};
-</script>
-
-<style lang="scss" scoped>
-  .news-home {
-    background-color: #FFFFFF;
-    width: 100%;
-    margin: auto;
-  }
-  .news-main {
-    width: 100%;
-    margin: auto;
-  }
-  .news-content {
-    background-color: #acadae;
-    width: 100%;
-    position: relative;
-  }
-  .news-content-title {
-    display: inline-block;
-    font-size: 12px;
-    color: #FFFFFF;
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    background-color: black;
-    width: 98%;
-    padding: 1%;
-    opacity: 0.65;
-    white-space: normal;
-    box-sizing: unset!important
-  }
-  .news-main-item {
-    background-color: #FFFFFF;
-    padding: 5px 0;
-    border-top: 1px solid #eaeaea;
-  }
-  .news-content-item {
-    position: relative;
-  }
-  .news-content-item-title {
-    display: inline-block;
-    font-size: 10px;
-    width: 70%;
-    margin-left: 1%;
-    white-space: normal
-  }
-  .news-content-item-img {
-    display: inline-block;
-    width: 25%;
-    background-color: #acadae;
-    margin-right: 1%;
-  }
-  .material-img {
-    width: 100%;
-  }
-</style>
diff --git a/src/views/mp/components/wx-reply/main.vue b/src/views/mp/components/wx-reply/main.vue
deleted file mode 100644
index ff7b37f6..00000000
--- a/src/views/mp/components/wx-reply/main.vue
+++ /dev/null
@@ -1,547 +0,0 @@
-<!--
-  - Copyright (C) 2018-2019
-  - All rights reserved, Designed By www.joolun.com
-  芋道源码：
-  ① 移除多余的 rep 为前缀的变量，让 message 消息更简单
-  ② 代码优化，补充注释，提升阅读性
-  ③ 优化消息的临时缓存策略，发送消息时，只清理被发送消息的 tab，不会强制切回到 text 输入
-  ④ 支持发送【视频】消息时，支持新建视频
--->
-<template>
-  <el-tabs type="border-card" v-model="objData.type" @tab-click="handleClick">
-    <!-- 类型 1：文本 -->
-    <el-tab-pane name="text">
-      <span slot="label"><i class="el-icon-document"></i> 文本</span>
-      <el-input type="textarea" :rows="5" placeholder="请输入内容" v-model="objData.content" @input="inputContent" />
-    </el-tab-pane>
-    <!-- 类型 2：图片 -->
-    <el-tab-pane name="image">
-      <span slot="label"><i class="el-icon-picture"></i> 图片</span>
-      <el-row>
-        <!-- 情况一：已经选择好素材、或者上传好图片 -->
-        <div class="select-item" v-if="objData.url">
-          <img class="material-img" :src="objData.url">
-          <p class="item-name" v-if="objData.name">{{objData.name}}</p>
-          <el-row class="ope-row">
-            <el-button type="danger" icon="el-icon-delete" circle @click="deleteObj"></el-button>
-          </el-row>
-        </div>
-        <!-- 情况二：未做完上述操作 -->
-        <div v-else>
-          <el-row style="text-align: center">
-            <!-- 选择素材 -->
-            <el-col :span="12" class="col-select">
-              <el-button type="success" @click="openMaterial">
-                素材库选择<i class="el-icon-circle-check el-icon--right"></i>
-              </el-button>
-              <el-dialog title="选择图片" :visible.sync="dialogImageVisible" width="90%" append-to-body>
-                <wx-material-select :obj-data="objData" @selectMaterial="selectMaterial" />
-              </el-dialog>
-            </el-col>
-            <!-- 文件上传 -->
-            <el-col :span="12" class="col-add">
-              <el-upload :action="actionUrl" :headers="headers" multiple :limit="1" :file-list="fileList" :data="uploadData"
-                         :before-upload="beforeImageUpload" :on-success="handleUploadSuccess">
-                <el-button type="primary">上传图片</el-button>
-                <div slot="tip" class="el-upload__tip">支持 bmp/png/jpeg/jpg/gif 格式，大小不超过 2M</div>
-              </el-upload>
-            </el-col>
-          </el-row>
-        </div>
-      </el-row>
-    </el-tab-pane>
-    <!-- 类型 3：语音 -->
-    <el-tab-pane name="voice">
-      <span slot="label"><i class="el-icon-phone"></i> 语音</span>
-      <el-row>
-        <div class="select-item2" v-if="objData.url">
-          <p class="item-name">{{objData.name}}</p>
-          <div class="item-infos">
-            <wx-voice-player :url="objData.url" />
-          </div>
-          <el-row class="ope-row">
-            <el-button type="danger" icon="el-icon-delete" circle @click="deleteObj"></el-button>
-          </el-row>
-        </div>
-        <div v-else>
-          <el-row style="text-align: center">
-            <!-- 选择素材 -->
-            <el-col :span="12" class="col-select">
-              <el-button type="success" @click="openMaterial">
-                素材库选择<i class="el-icon-circle-check el-icon--right"></i>
-              </el-button>
-              <el-dialog title="选择语音" :visible.sync="dialogVoiceVisible" width="90%" append-to-body>
-                <WxMaterialSelect :objData="objData" @selectMaterial="selectMaterial"></WxMaterialSelect>
-              </el-dialog>
-            </el-col>
-            <!-- 文件上传 -->
-            <el-col :span="12" class="col-add">
-              <el-upload :action="actionUrl" :headers="headers" multiple :limit="1" :file-list="fileList" :data="uploadData"
-                         :before-upload="beforeVoiceUpload" :on-success="handleUploadSuccess">
-                <el-button type="primary">点击上传</el-button>
-                <div slot="tip" class="el-upload__tip">格式支持 mp3/wma/wav/amr，文件大小不超过 2M，播放长度不超过 60s</div>
-              </el-upload>
-            </el-col>
-          </el-row>
-        </div>
-      </el-row>
-    </el-tab-pane>
-    <!-- 类型 4：视频 -->
-    <el-tab-pane name="video">
-      <span slot="label"><i class="el-icon-share"></i> 视频</span>
-      <el-row>
-        <el-input v-model="objData.title" placeholder="请输入标题" @input="inputContent" />
-        <div style="margin: 20px 0;"></div>
-        <el-input v-model="objData.description" placeholder="请输入描述" @input="inputContent" />
-        <div style="margin: 20px 0;"></div>
-        <div style="text-align: center;">
-          <wx-video-player v-if="objData.url" :url="objData.url" />
-        </div>
-        <div style="margin: 20px 0;"></div>
-        <el-row style="text-align: center">
-          <!-- 选择素材 -->
-          <el-col :span="12">
-            <el-button type="success" @click="openMaterial">
-              素材库选择<i class="el-icon-circle-check el-icon--right"></i>
-            </el-button>
-            <el-dialog title="选择视频" :visible.sync="dialogVideoVisible" width="90%" append-to-body>
-              <wx-material-select :objData="objData" @selectMaterial="selectMaterial" />
-            </el-dialog>
-          </el-col>
-          <!-- 文件上传 -->
-          <el-col :span="12">
-            <el-upload :action="actionUrl" :headers="headers" multiple :limit="1" :file-list="fileList" :data="uploadData"
-                       :before-upload="beforeVideoUpload" :on-success="handleUploadSuccess">
-              <el-button type="primary">新建视频<i class="el-icon-upload el-icon--right"></i></el-button>
-            </el-upload>
-          </el-col>
-        </el-row>
-      </el-row>
-    </el-tab-pane>
-    <!-- 类型 5：图文 -->
-    <el-tab-pane name="news">
-      <span slot="label"><i class="el-icon-news"></i> 图文</span>
-      <el-row>
-        <div class="select-item" v-if="objData.articles">
-          <wx-news :articles="objData.articles" />
-          <el-row class="ope-row">
-            <el-button type="danger" icon="el-icon-delete" circle @click="deleteObj" />
-          </el-row>
-        </div>
-        <!-- 选择素材 -->
-        <div v-if="!objData.content">
-          <el-row style="text-align: center">
-            <el-col :span="24">
-              <el-button type="success" @click="openMaterial">{{newsType === '1' ? '选择已发布图文' : '选择草稿箱图文'}}<i class="el-icon-circle-check el-icon--right"></i></el-button>
-            </el-col>
-          </el-row>
-        </div>
-        <el-dialog title="选择图文" :visible.sync="dialogNewsVisible" width="90%" append-to-body>
-          <wx-material-select :objData="objData" @selectMaterial="selectMaterial" :newsType="newsType" />
-        </el-dialog>
-      </el-row>
-    </el-tab-pane>
-    <!-- 类型 6：音乐 -->
-    <el-tab-pane name="music">
-      <span slot="label"><i class="el-icon-service"></i> 音乐</span>
-      <el-row>
-        <el-col :span="6">
-          <div class="thumb-div">
-            <img style="width: 100px" v-if="objData.thumbMediaUrl" :src="objData.thumbMediaUrl">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-            <div class="thumb-but">
-              <el-upload :action="actionUrl" :headers="headers" multiple :limit="1" :file-list="fileList" :data="uploadData"
-                         :before-upload="beforeThumbImageUpload" :on-success="handleUploadSuccess">
-                <el-button slot="trigger" size="mini" type="text">本地上传</el-button>
-                <el-button size="mini" type="text" @click="openMaterial" style="margin-left: 5px">素材库选择</el-button>
-              </el-upload>
-            </div>
-          </div>
-          <el-dialog title="选择图片" :visible.sync="dialogThumbVisible" width="80%" append-to-body>
-            <wx-material-select :objData="{type:'image', accountId: objData.accountId}" @selectMaterial="selectMaterial" />
-          </el-dialog>
-        </el-col>
-        <el-col :span="18">
-          <el-input v-model="objData.title" placeholder="请输入标题" @input="inputContent" />
-          <div style="margin: 20px 0;"></div>
-          <el-input v-model="objData.description" placeholder="请输入描述" @input="inputContent" />
-        </el-col>
-      </el-row>
-      <div style="margin: 20px 0;"></div>
-      <el-input v-model="objData.musicUrl" placeholder="请输入音乐链接" @input="inputContent" />
-      <div style="margin: 20px 0;"></div>
-      <el-input v-model="objData.hqMusicUrl" placeholder="请输入高质量音乐链接" @input="inputContent" />
-    </el-tab-pane>
-  </el-tabs>
-</template>
-
-<script>
-import WxNews from '@/views/mp/components/wx-news/main.vue'
-import WxMaterialSelect from '@/views/mp/components/wx-material-select/main.vue'
-import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue';
-import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue';
-
-import { getAccessToken } from '@/utils/auth'
-
-export default {
-  name: "wxReplySelect",
-  components: {
-    WxNews,
-    WxMaterialSelect,
-    WxVoicePlayer,
-    WxVideoPlayer
-  },
-  props: {
-    objData: { // 消息对象。
-      type: Object, // 设置为 Object 的原因，方便属性的传递
-      required: true,
-    },
-    newsType:{ // 图文类型：1、已发布图文；2、草稿箱图文
-      type: String,
-      default: "1"
-    },
-  },
-  data() {
-    return {
-      tempPlayerObj: {
-        type: '2'
-      },
-
-      tempObj: new Map().set( // 临时缓存，切换消息类型的 tab 的时候，可以保存对应的数据；
-          this.objData.type, // 消息类型
-          Object.assign({}, this.objData)), // 消息内容
-
-      // ========== 素材选择的弹窗，是否可见 ==========
-      dialogNewsVisible: false, // 图文
-      dialogImageVisible: false, // 图片
-      dialogVoiceVisible: false, // 语音
-      dialogVideoVisible: false, // 视频
-      dialogThumbVisible: false, // 缩略图
-
-      // ========== 文件上传（图片、语音、视频） ==========
-      fileList: [], // 文件列表
-      uploadData: {
-        "accountId": undefined,
-        "type": this.objData.type,
-        "title":'',
-        "introduction":''
-      },
-      actionUrl: process.env.VUE_APP_BASE_API + '/admin-api/mp/material/upload-temporary',
-      headers: { Authorization: "Bearer " + getAccessToken() }, // 设置上传的请求头部
-    }
-  },
-  methods:{
-    beforeThumbImageUpload(file){
-      const isType = file.type === 'image/jpeg'
-          || file.type === 'image/png'
-          || file.type === 'image/gif'
-          || file.type === 'image/bmp'
-          || file.type === 'image/jpg';
-      if (!isType) {
-        this.$message.warning('上传图片格式不对!');
-        return false;
-      }
-      const isLt = file.size / 1024 / 1024 < 2;
-      if (!isLt) {
-        this.$message.warning('上传图片大小不能超过 2M!');
-        return false;
-      }
-      this.uploadData.accountId = this.objData.accountId;
-      return true;
-    },
-    beforeVoiceUpload(file){
-      // 校验格式
-      const isType = file.type === 'audio/mp3'
-          || file.type === 'audio/mpeg'
-          || file.type === 'audio/wma'
-          || file.type === 'audio/wav'
-          || file.type === 'audio/amr';
-      if (!isType) {
-        this.$message.warning('上传语音格式不对!' + file.type);
-        return false;
-      }
-      // 校验大小
-      const isLt = file.size / 1024 / 1024 < 2;
-      if (!isLt) {
-        this.$message.warning('上传语音大小不能超过 2M!');
-        return false;
-      }
-      this.uploadData.accountId = this.objData.accountId;
-      return true;
-    },
-    beforeImageUpload(file) {
-      // 校验格式
-      const isType = file.type === 'image/jpeg'
-          || file.type === 'image/png'
-          || file.type === 'image/gif'
-          || file.type === 'image/bmp'
-          || file.type === 'image/jpg';
-      if (!isType) {
-        this.$message.warning('上传图片格式不对!');
-        return false;
-      }
-      // 校验大小
-      const isLt = file.size / 1024 / 1024 < 2;
-      if (!isLt) {
-        this.$message.warning('上传图片大小不能超过 2M!');
-        return false;
-      }
-      this.uploadData.accountId = this.objData.accountId;
-      return true;
-    },
-    beforeVideoUpload(file){
-      // 校验格式
-      const isType = file.type === 'video/mp4';
-      if (!isType) {
-        this.$message.warning('上传视频格式不对!');
-        return false;
-      }
-      // 校验大小
-      const isLt = file.size / 1024 / 1024 < 10;
-      if (!isLt) {
-        this.$message.warning('上传视频大小不能超过 10M!');
-        return false;
-      }
-      this.uploadData.accountId = this.objData.accountId;
-      return true;
-    },
-    handleUploadSuccess(response, file, fileList) {
-      if (response.code !== 0) {
-        this.$message.warning('上传出错：' + response.msg)
-        return false;
-      }
-
-      // 清空上传时的各种数据
-      this.fileList = []
-      this.uploadData.title = ''
-      this.uploadData.introduction = ''
-
-      // 上传好的文件，本质是个素材，所以可以进行选中
-      let item = response.data
-      this.selectMaterial(item)
-    },
-    /**
-     * 切换消息类型的 tab
-     *
-     * @param tab tab
-     */
-    handleClick(tab) {
-      // 设置后续文件上传的文件类型
-      this.uploadData.type = this.objData.type;
-      if (this.uploadData.type === 'music') { // 【音乐】上传的是缩略图
-        this.uploadData.type = 'thumb';
-      }
-
-      // 从 tempObj 临时缓存中，获取对应的数据，并设置回 objData
-      let tempObjItem = this.tempObj.get(this.objData.type)
-      if (tempObjItem) {
-        this.objData.content = tempObjItem.content ? tempObjItem.content : null
-        this.objData.mediaId = tempObjItem.mediaId ? tempObjItem.mediaId : null
-        this.objData.url = tempObjItem.url ? tempObjItem.url : null
-        this.objData.name = tempObjItem.url ? tempObjItem.name : null
-        this.objData.title = tempObjItem.title ? tempObjItem.title : null
-        this.objData.description = tempObjItem.description ? tempObjItem.description : null
-        return;
-      }
-      // 如果获取不到，需要把 objData 复原
-      // 必须使用 $set 赋值，不然 input 无法输入内容
-      this.$set(this.objData, 'content', '');
-      this.$delete(this.objData, 'mediaId');
-      this.$delete(this.objData, 'url');
-      this.$set(this.objData, 'title', '');
-      this.$set(this.objData, 'description', '');
-
-    },
-    /**
-     * 选择素材，将设置设置到 objData 变量
-     *
-     * @param item 素材
-     */
-    selectMaterial(item) {
-      // 选择好素材，所以隐藏弹窗
-      this.closeMaterial();
-
-      // 创建 tempObjItem 对象，并设置对应的值
-      let tempObjItem = {}
-      tempObjItem.type = this.objData.type;
-      if (this.objData.type === 'news') {
-        tempObjItem.articles = item.content.newsItem
-        this.objData.articles = item.content.newsItem
-      } else if (this.objData.type === 'music') { // 音乐需要特殊处理，因为选择的是图片的缩略图
-        tempObjItem.thumbMediaId = item.mediaId
-        this.objData.thumbMediaId = item.mediaId
-        tempObjItem.thumbMediaUrl = item.url
-        this.objData.thumbMediaUrl = item.url
-        // title、introduction、musicUrl、hqMusicUrl：从 objData 到 tempObjItem，避免上传素材后，被覆盖掉
-        tempObjItem.title = this.objData.title || ''
-        tempObjItem.introduction = this.objData.introduction  || ''
-        tempObjItem.musicUrl = this.objData.musicUrl  || ''
-        tempObjItem.hqMusicUrl = this.objData.hqMusicUrl  || ''
-      } else if (this.objData.type === 'image'
-          || this.objData.type === 'voice') {
-        tempObjItem.mediaId = item.mediaId
-        this.objData.mediaId = item.mediaId
-        tempObjItem.url = item.url;
-        this.objData.url = item.url;
-        tempObjItem.name = item.name
-        this.objData.name = item.name
-      } else if (this.objData.type === 'video') {
-        tempObjItem.mediaId = item.mediaId
-        this.objData.mediaId = item.mediaId
-        tempObjItem.url = item.url;
-        this.objData.url = item.url;
-        tempObjItem.name = item.name
-        this.objData.name = item.name
-        // title、introduction：从 item 到 tempObjItem，因为素材里有 title、introduction
-        if (item.title) {
-          this.objData.title = item.title || ''
-          tempObjItem.title = item.title || ''
-        }
-        if (item.introduction) {
-          this.objData.description = item.introduction || '' // 消息使用的是 description，素材使用的是 introduction，所以转换下
-          tempObjItem.description = item.introduction || ''
-        }
-      } else if (this.objData.type === 'text') {
-        this.objData.content = item.content || ''
-      }
-      // 最终设置到临时缓存
-      this.tempObj.set(this.objData.type, tempObjItem)
-    },
-    openMaterial() {
-      if (this.objData.type === 'news') {
-        this.dialogNewsVisible = true
-      } else if(this.objData.type === 'image') {
-        this.dialogImageVisible = true
-      } else if(this.objData.type === 'voice') {
-        this.dialogVoiceVisible = true
-      } else if(this.objData.type === 'video') {
-        this.dialogVideoVisible = true
-      } else if(this.objData.type === 'music') {
-        this.dialogThumbVisible = true
-      }
-    },
-    closeMaterial() {
-      this.dialogNewsVisible = false
-      this.dialogImageVisible = false
-      this.dialogVoiceVisible = false
-      this.dialogVideoVisible = false
-      this.dialogThumbVisible = false
-    },
-    deleteObj() {
-      if (this.objData.type === 'news') {
-        this.$delete(this.objData, 'articles');
-      } else if(this.objData.type === 'image') {
-        this.objData.mediaId = null
-        this.$delete(this.objData, 'url');
-        this.objData.name = null
-      } else if(this.objData.type === 'voice') {
-        this.objData.mediaId = null
-        this.$delete(this.objData, 'url');
-        this.objData.name = null
-      } else if(this.objData.type === 'video') {
-        this.objData.mediaId = null
-        this.$delete(this.objData, 'url');
-        this.objData.name = null
-        this.objData.title = null
-        this.objData.description = null
-      } else if(this.objData.type === 'music') {
-        this.objData.thumbMediaId = null
-        this.objData.thumbMediaUrl = null
-        this.objData.title = null
-        this.objData.description = null
-        this.objData.musicUrl = null
-        this.objData.hqMusicUrl = null
-      } else if(this.objData.type === 'text') {
-        this.objData.content = null
-      }
-      // 覆盖缓存
-      this.tempObj.set(this.objData.type, Object.assign({}, this.objData));
-    },
-    /**
-     * 输入时，缓存每次 objData 到 tempObj 中
-     *
-     * why？不确定为什么 v-model="objData.content" 不能自动缓存，所以通过这样的方式
-     */
-    inputContent(str) {
-      // 覆盖缓存
-      this.tempObj.set(this.objData.type, Object.assign({}, this.objData));
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.public-account-management{
-  .el-input{
-    width: 70%;
-    margin-right: 2%;
-  }
-}
-.pagination{
-  text-align: right;
-  margin-right: 25px;
-}
-.select-item{
-  width: 280px;
-  padding: 10px;
-  margin: 0 auto 10px auto;
-  border: 1px solid #eaeaea;
-}
-.select-item2{
-  padding: 10px;
-  margin: 0 auto 10px auto;
-  border: 1px solid #eaeaea;
-}
-.ope-row{
-  padding-top: 10px;
-  text-align: center;
-}
-.item-name{
-  font-size: 12px;
-  overflow: hidden;
-  text-overflow:ellipsis;
-  white-space: nowrap;
-  text-align: center;
-}
-.el-form-item__content{
-  line-height:unset!important;
-}
-.col-select{
-  border: 1px solid rgb(234, 234, 234);
-  padding: 50px 0px;
-  height: 160px;
-  width: 49.5%;
-}
-.col-select2{
-  border: 1px solid rgb(234, 234, 234);
-  padding: 50px 0px;
-  height: 160px;
-}
-.col-add{
-  border: 1px solid rgb(234, 234, 234);
-  padding: 50px 0px;
-  height: 160px;
-  width: 49.5%;
-  float: right
-}
-.avatar-uploader-icon {
-  border: 1px solid #d9d9d9;
-  font-size: 28px;
-  color: #8c939d;
-  width: 100px!important;
-  height: 100px!important;
-  line-height: 100px!important;
-  text-align: center;
-}
-.material-img {
-  width: 100%;
-}
-.thumb-div{
-  display: inline-block;
-  text-align: center;
-}
-.item-infos{
-  width: 30%;
-  margin: auto
-}
-</style>
diff --git a/src/views/mp/components/wx-video-play/main.vue b/src/views/mp/components/wx-video-play/main.vue
deleted file mode 100644
index d306f40d..00000000
--- a/src/views/mp/components/wx-video-play/main.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<!--
-  - Copyright (C) 2018-2019
-  - All rights reserved, Designed By www.joolun.com
-  【微信消息 - 视频】
-  芋道源码：
-  ① bug 修复：
-    1）joolun 的做法：使用 mediaId 从微信公众号，下载对应的 mp4 素材，从而播放内容；
-      存在的问题：mediaId 有效期是 3 天，超过时间后无法播放
-    2）重构后的做法：后端接收到微信公众号的视频消息后，将视频消息的 media_id 的文件内容保存到文件服务器中，这样前端可以直接使用 URL 播放。
-  ② 体验优化：弹窗关闭后，自动暂停视频的播放
--->
-<template>
-  <div>
-    <!-- 提示 -->
-    <div @click="playVideo()">
-      <i class="el-icon-video-play" style="font-size: 40px!important;" ></i>
-      <p>点击播放视频</p>
-    </div>
-
-    <!-- 弹窗播放 -->
-    <el-dialog title="视频播放" :visible.sync="dialogVideo" width="40%" append-to-body @close="closeDialog">
-      <video-player v-if="playerOptions.sources[0].src" class="video-player vjs-custom-skin" ref="videoPlayer"
-                    :playsinline="true" :options="playerOptions"
-                    @play="onPlayerPlay($event)" @pause="onPlayerPause($event)">
-      </video-player>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-// 引入 videoPlayer 相关组件。教程：https://juejin.cn/post/6923056942281654285
-import { videoPlayer } from 'vue-video-player'
-require('video.js/dist/video-js.css')
-require('vue-video-player/src/custom-theme.css')
-
-export default {
-  name: "wxVideoPlayer",
-  props: {
-    url: { // 视频地址，例如说：https://www.iocoder.cn/xxx.mp4
-      type: String,
-      required: true
-    },
-  },
-  components: {
-    videoPlayer
-  },
-  data() {
-    return {
-      dialogVideo:false,
-      playerOptions: {
-        playbackRates: [0.5, 1.0, 1.5, 2.0], // 播放速度
-        autoplay: false, // 如果 true,浏览器准备好时开始回放。
-        muted: false, // 默认情况下将会消除任何音频。
-        loop: false, // 导致视频一结束就重新开始。
-        preload: 'auto', // 建议浏览器在 <video> 加载元素后是否应该开始下载视频数据。auto 浏览器选择最佳行为,立即开始加载视频（如果浏览器支持）
-        language: 'zh-CN',
-        aspectRatio: '16:9', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
-        fluid: true, // 当true时，Video.js player 将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
-        sources: [{
-          type: "video/mp4",
-          src: "" // 你的视频地址（必填）【重要】
-        }],
-        poster: "", // 你的封面地址
-        width: document.documentElement.clientWidth,
-        notSupportedMessage: '此视频暂无法播放，请稍后再试', //允许覆盖 Video.js 无法播放媒体源时显示的默认信息。
-        controlBar: {
-          timeDivider: true,
-          durationDisplay: true,
-          remainingTimeDisplay: false,
-          fullscreenToggle: true  //全屏按钮
-        }
-      }
-    }
-  },
-  methods: {
-    playVideo(){
-      this.dialogVideo = true
-      // 设置地址
-      this.$set(this.playerOptions.sources[0], 'src', this.url)
-    },
-    closeDialog(){
-      // 暂停播放
-      this.$refs.videoPlayer.player.pause()
-    },
-    onPlayerPlay(player) {
-    },
-    onPlayerPause(player) {
-    },
-  }
-};
-</script>
diff --git a/src/views/mp/components/wx-voice-play/main.vue b/src/views/mp/components/wx-voice-play/main.vue
deleted file mode 100644
index c48ff1fa..00000000
--- a/src/views/mp/components/wx-voice-play/main.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--
-  - Copyright (C) 2018-2019
-  - All rights reserved, Designed By www.joolun.com
-  【微信消息 - 语音】
-   芋道源码：
-  ① bug 修复：
-    1）joolun 的做法：使用 mediaId 从微信公众号，下载对应的 mp4 素材，从而播放内容；
-      存在的问题：mediaId 有效期是 3 天，超过时间后无法播放
-    2）重构后的做法：后端接收到微信公众号的视频消息后，将视频消息的 media_id 的文件内容保存到文件服务器中，这样前端可以直接使用 URL 播放。
-  ② 代码优化：将 props 中的 objData 调成为 data 中对应的属性，并补充相关注释
--->
-<template>
-  <div class="wx-voice-div" @click="playVoice">
-    <i :class="playing !== true ? 'el-icon-video-play': 'el-icon-video-pause'">
-      <span class="amr-duration" v-if="duration">{{ duration }} 秒</span>
-    </i>
-    <div v-if="content">
-      <el-tag type="success" size="mini">语音识别</el-tag>
-      {{ content }}
-    </div>
-  </div>
-</template>
-
-<script>
-// 因为微信语音是 amr 格式，所以需要用到 amr 解码器：https://www.npmjs.com/package/benz-amr-recorder
-const BenzAMRRecorder = require('benz-amr-recorder')
-
-export default {
-  name: "wxVoicePlayer",
-  props: {
-    url: { // 语音地址，例如说：https://www.iocoder.cn/xxx.amr
-      type: String,
-      required: true
-    },
-    content: { // 语音文本
-      type: String,
-      required: false
-    }
-  },
-  data() {
-    return {
-      amr: undefined, // BenzAMRRecorder 对象
-      playing: false, // 是否在播放中
-      duration: undefined, // 播放时长
-    }
-  },
-  methods:{
-    playVoice() {
-      debugger
-      // 情况一：未初始化，则创建 BenzAMRRecorder
-      if (this.amr === undefined){
-        this.amrInit();
-        return;
-      }
-
-      if (this.amr.isPlaying()) {
-        this.amrStop();
-      } else {
-        this.amrPlay();
-      }
-    },
-    amrInit() {
-      const amr = new BenzAMRRecorder();
-      this.amr = amr;
-      // 设置播放
-      const that = this
-      amr.initWithUrl(this.url).then(function() {
-        that.amrPlay()
-        that.duration = amr.getDuration();
-      })
-      // 监听暂停
-      amr.onEnded(function() {
-        that.playing = false;
-      })
-    },
-    amrPlay() {
-      this.playing = true;
-      this.amr.play()
-    },
-    amrStop() {
-      this.playing = false;
-      this.amr.stop()
-    },
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-  .wx-voice-div {
-    padding: 5px;
-    background-color: #eaeaea;
-    border-radius: 10px;
-  }
-  .amr-duration {
-    font-size: 11px;
-    margin-left: 5px;
-  }
-</style>
diff --git a/src/views/mp/draft/index.vue b/src/views/mp/draft/index.vue
deleted file mode 100644
index 9f8813d7..00000000
--- a/src/views/mp/draft/index.vue
+++ /dev/null
@@ -1,700 +0,0 @@
-<!--
-MIT License
-
-Copyright (c) 2020 www.joolun.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-  芋道源码：
-  ① 优化代码，和项目的代码保持一致
-  ② 清理冗余代码，保证代码整洁
-  ③ 增加注释，提升可读性
--->
-<template>
-  <div class="app-container">
-    <doc-alert title="公众号图文" url="https://doc.iocoder.cn/mp/article/" />
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公众号" prop="accountId">
-        <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['mp:draft:create']">新增
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <div class="waterfall" v-loading="loading">
-      <div v-if="item.content && item.content.newsItem" class="waterfall-item" v-for="item in list"
-           :key='item.articleId'>
-        <wx-news :articles="item.content.newsItem" />
-        <!-- 操作按钮 -->
-        <el-row class="ope-row">
-          <el-button type="success" circle @click="handlePublish(item)" v-hasPermi="['mp:free-publish:submit']">发布</el-button>
-          <el-button type="primary" icon="el-icon-edit" circle @click="handleUpdate(item)" v-hasPermi="['mp:draft:update']" />
-          <el-button type="danger" icon="el-icon-delete" circle @click="handleDelete(item)" v-hasPermi="['mp:draft:delete']" />
-        </el-row>
-      </div>
-    </div>
-    <!-- 分页记录 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 添加或修改草稿对话框 -->
-    <el-dialog :title="operateMaterial === 'add' ? '新建图文' : '修改图文'"
-               append-to-body width="80%" top="20px" :visible.sync="dialogNewsVisible"
-               :before-close="dialogNewsClose" :close-on-click-modal="false">
-      <div class="left">
-        <div class="select-item">
-          <div v-for="(news, index) in articlesAdd" :key='news.id'>
-            <div class="news-main father" v-if="index === 0" :class="{'activeAddNews': isActiveAddNews === index}"
-                 @click="activeNews(index)">
-              <div class="news-content">
-                <img class="material-img" v-if="news.thumbUrl" :src="news.thumbUrl"/>
-                <div class="news-content-title">{{news.title}}</div>
-              </div>
-              <div class="child" v-if="articlesAdd.length>1">
-                <el-button type="mini" icon="el-icon-sort-down" @click="downNews(index)">下移</el-button>
-                <el-button v-if="operateMaterial === 'add'" type="mini" icon="el-icon-delete"
-                           @click="minusNews(index)">删除
-                </el-button>
-              </div>
-            </div>
-            <div class="news-main-item father" v-if="index>0" :class="{'activeAddNews': isActiveAddNews === index}"
-                 @click="activeNews(index)">
-              <div class="news-content-item">
-                <div class="news-content-item-title ">{{news.title}}</div>
-                <div class="news-content-item-img">
-                  <img class="material-img" v-if="news.thumbUrl" :src="news.thumbUrl" height="100%"/>
-                </div>
-              </div>
-              <div class="child">
-                <el-button v-if="articlesAdd.length > index+1" type="mini" icon="el-icon-sort-down"
-                           @click="downNews(index)">下移
-                </el-button>
-                <el-button type="mini" icon="el-icon-sort-up" @click="upNews(index)">上移</el-button>
-                <el-button v-if="operateMaterial=== 'add'" type="mini" icon="el-icon-delete"
-                           @click="minusNews(index)">删除
-                </el-button>
-              </div>
-            </div>
-          </div>
-          <div class="news-main-plus" @click="plusNews" v-if="articlesAdd.length<8 && operateMaterial==='add'">
-            <i class="el-icon-circle-plus icon-plus"></i>
-          </div>
-        </div>
-      </div>
-      <div class="right" v-loading="addMaterialLoading" v-if="articlesAdd.length > 0">
-        <br /> <br /> <br /> <br />
-        <!-- 标题、作者、原文地址 -->
-        <el-input v-model="articlesAdd[isActiveAddNews].title" placeholder="请输入标题（必填）" />
-        <el-input v-model="articlesAdd[isActiveAddNews].author" placeholder="请输入作者" style="margin-top: 5px;" />
-        <el-input v-model="articlesAdd[isActiveAddNews].contentSourceUrl" placeholder="请输入原文地址" style="margin-top: 5px;" />
-        <!-- 封面和摘要 -->
-        <div class="input-tt">封面和摘要：</div>
-        <div>
-          <div class="thumb-div">
-            <img class="material-img" v-if="articlesAdd[isActiveAddNews].thumbUrl"
-                 :src="articlesAdd[isActiveAddNews].thumbUrl" :class="isActiveAddNews === 0 ? 'avatar':'avatar1'">
-            <i v-else class="el-icon-plus avatar-uploader-icon"
-               :class="isActiveAddNews === 0 ? 'avatar':'avatar1'"></i>
-            <div class="thumb-but">
-              <el-upload :action="actionUrl" :headers="headers" multiple :limit="1" :file-list="fileList" :data="uploadData"
-                         :before-upload="beforeThumbImageUpload" :on-success="handleUploadSuccess">
-                <el-button slot="trigger" size="mini" type="primary">本地上传</el-button>
-                <el-button size="mini" type="primary" @click="openMaterial" style="margin-left: 5px">素材库选择</el-button>
-                <div slot="tip" class="el-upload__tip">支持 bmp/png/jpeg/jpg/gif 格式，大小不超过 2M</div>
-              </el-upload>
-            </div>
-            <el-dialog title="选择图片" :visible.sync="dialogImageVisible" width="80%" append-to-body>
-              <wx-material-select ref="materialSelect" :objData="{type: 'image', accountId: this.queryParams.accountId}"
-                                  @selectMaterial="selectMaterial" />
-            </el-dialog>
-          </div>
-          <el-input :rows="8" type="textarea" v-model="articlesAdd[isActiveAddNews].digest" placeholder="请输入摘要"
-                    class="digest" maxlength="120" style="float: right" />
-        </div>
-        <!--富文本编辑器组件-->
-        <el-row>
-          <wx-editor v-model="articlesAdd[isActiveAddNews].content" :account-id="this.uploadData.accountId"
-                     v-if="hackResetEditor"/>
-        </el-row>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogNewsVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm">提 交</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import WxEditor from '@/views/mp/components/wx-editor/WxEditor.vue';
-import WxNews from '@/views/mp/components/wx-news/main.vue';
-import WxMaterialSelect from '@/views/mp/components/wx-material-select/main.vue'
-import { getAccessToken } from '@/utils/auth'
-import {createDraft, deleteDraft, getDraftPage, updateDraft} from "@/api/mp/draft";
-import { getSimpleAccounts } from "@/api/mp/account";
-import {deleteFreePublish, submitFreePublish} from "@/api/mp/freePublish";
-
-export default {
-  name: 'MpDraft',
-  components: {
-    WxEditor,
-    WxNews,
-    WxMaterialSelect
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 数据列表
-      list: [],
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        accountId: undefined,
-      },
-
-      // ========== 文件上传 ==========
-      actionUrl: process.env.VUE_APP_BASE_API + "/admin-api/mp/material/upload-permanent", // 上传永久素材的地址
-      headers: { Authorization: "Bearer " + getAccessToken() }, // 设置上传的请求头部
-      fileList: [],
-      uploadData: {
-        "type": 'image',
-        // "accountId": 1,
-      },
-
-      // ========== 草稿新建 or 修改 ==========
-      dialogNewsVisible: false,
-      addMaterialLoading: false, // 添加草稿的 loading 标识
-      articlesAdd: [],
-      isActiveAddNews: 0,
-      dialogImageVisible: false,
-      operateMaterial: 'add',
-      articlesMediaId: '',
-      hackResetEditor: false,
-
-      // 公众号账号列表
-      accounts: [],
-    }
-  },
-  created() {
-    getSimpleAccounts().then(response => {
-      this.accounts = response.data;
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.setAccountId(this.accounts[0].id);
-      }
-      // 加载数据
-      this.getList();
-    })
-  },
-  methods: {
-    // ======================== 列表查询 ========================
-    /** 设置账号编号 */
-    setAccountId(accountId) {
-      this.queryParams.accountId = accountId;
-      this.uploadData.accountId = accountId;
-    },
-    /** 查询列表 */
-    getList() {
-      // 如果没有选中公众号账号，则进行提示。
-      if (!this.queryParams.accountId) {
-        this.$message.warning('未选中公众号，无法查询草稿箱')
-        return false
-      }
-
-      this.loading = true
-      getDraftPage(this.queryParams).then(response => {
-        // 将 thumbUrl 转成 picUrl，保证 wx-news 组件可以预览封面
-        response.data.list.forEach(item => {
-          const newsItem = item.content.newsItem;
-          newsItem.forEach(article => {
-            article.picUrl = article.thumbUrl;
-          })
-        })
-        this.list = response.data.list
-        this.total = response.data.total
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1
-      // 默认选中第一个
-      if (this.queryParams.accountId) {
-        this.setAccountId(this.queryParams.accountId)
-      }
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.setAccountId(this.accounts[0].id)
-      }
-      this.handleQuery()
-    },
-
-    // ======================== 新增/修改草稿 ========================
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.resetEditor();
-      this.reset();
-      // 打开表单，并设置初始化
-      this.operateMaterial = 'add'
-      this.dialogNewsVisible = true
-    },
-    /** 更新按钮操作 */
-    handleUpdate(item){
-      this.resetEditor();
-      this.reset();
-      this.articlesMediaId = item.mediaId
-      this.articlesAdd = JSON.parse(JSON.stringify(item.content.newsItem))
-      // 打开表单，并设置初始化
-      this.operateMaterial = 'edit'
-      this.dialogNewsVisible = true
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.addMaterialLoading = true
-      if (this.operateMaterial === 'add') {
-        createDraft(this.queryParams.accountId, this.articlesAdd).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.dialogNewsVisible = false;
-          this.getList()
-        }).finally(() => {
-          this.addMaterialLoading = false
-        })
-      } else {
-        updateDraft(this.queryParams.accountId, this.articlesMediaId, this.articlesAdd).then(response => {
-          this.$modal.msgSuccess("更新成功");
-          this.dialogNewsVisible = false;
-          this.getList()
-        }).finally(() => {
-          this.addMaterialLoading = false
-        })
-      }
-    },
-    // 关闭弹窗
-    dialogNewsClose(done) {
-      this.$modal.confirm('修改内容可能还未保存，确定关闭吗?').then(() => {
-       this.reset()
-        this.resetEditor()
-        done()
-      }).catch(() => {})
-    },
-    // 表单重置
-    reset() {
-      this.isActiveAddNews = 0
-      this.articlesAdd = [this.buildEmptyArticle()]
-    },
-    // 表单 Editor 重置
-    resetEditor() {
-      this.hackResetEditor = false // 销毁组件
-      this.$nextTick(() => {
-        this.hackResetEditor = true // 重建组件
-      })
-    },
-    // 将图文向下移动
-    downNews(index) {
-      let temp = this.articlesAdd[index]
-      this.articlesAdd[index] = this.articlesAdd[index+1]
-      this.articlesAdd[index + 1] = temp
-      this.isActiveAddNews = index + 1
-    },
-    // 将图文向上移动
-    upNews(index) {
-      let temp = this.articlesAdd[index]
-      this.articlesAdd[index] = this.articlesAdd[index - 1]
-      this.articlesAdd[index - 1] = temp
-      this.isActiveAddNews = index - 1
-    },
-    // 选中指定 index 的图文
-    activeNews(index) {
-      this.resetEditor();
-      this.isActiveAddNews = index
-    },
-    // 删除指定 index 的图文
-    minusNews(index) {
-      this.$modal.confirm('确定删除该图文吗?').then(() => {
-        this.articlesAdd.splice(index,1);
-        if (this.isActiveAddNews ===  index) {
-          this.isActiveAddNews = 0
-        }
-      }).catch(() => {})
-    },
-    // 添加一个图文
-    plusNews() {
-      this.articlesAdd.push(this.buildEmptyArticle())
-      this.isActiveAddNews = this.articlesAdd.length - 1
-    },
-    // 创建空的 article
-    buildEmptyArticle() {
-      return {
-        "title": '',
-        "thumbMediaId": '',
-        "author": '',
-        "digest": '',
-        "showCoverPic": '',
-        "content": '',
-        "contentSourceUrl": '',
-        "needOpenComment":'',
-        "onlyFansCanComment":'',
-        "thumbUrl":''
-      }
-    },
-
-    // ======================== 文件上传 ========================
-    beforeThumbImageUpload(file) {
-      this.addMaterialLoading = true
-      const isType = file.type === 'image/jpeg'
-          || file.type === 'image/png'
-          || file.type === 'image/gif'
-          || file.type === 'image/bmp'
-          || file.type === 'image/jpg';
-      if (!isType) {
-        this.$message.warning('上传图片格式不对!')
-        this.addMaterialLoading = false
-        return false;
-      }
-      const isLt = file.size / 1024 / 1024 < 2
-      if (!isLt) {
-        this.$message.warning('上传图片大小不能超过 2M!')
-        this.addMaterialLoading = false
-        return false;
-      }
-      // 校验通过
-      return true;
-    },
-    handleUploadSuccess(response, file, fileList) {
-      this.addMaterialLoading = false // 关闭 loading
-      if (response.code !== 0) {
-        this.$message.warning('上传出错：' + response.msg)
-        return false;
-      }
-
-      // 重置上传文件的表单
-      this.fileList = []
-
-      // 设置草稿的封面字段
-      this.articlesAdd[this.isActiveAddNews].thumbMediaId = response.data.mediaId
-      this.articlesAdd[this.isActiveAddNews].thumbUrl = response.data.url
-    },
-    // 选择 or 上传完素材，设置回草稿
-    selectMaterial(item) {
-      this.dialogImageVisible = false
-      this.articlesAdd[this.isActiveAddNews].thumbMediaId = item.mediaId
-      this.articlesAdd[this.isActiveAddNews].thumbUrl = item.url
-    },
-    // 打开素材选择
-    openMaterial() {
-      this.dialogImageVisible = true
-      try {
-        this.$refs['materialSelect'].queryParams.accountId = this.queryParams.accountId // 强制设置下 accountId，避免二次查询不对
-        this.$refs['materialSelect'].handleQuery(); // 刷新列表，失败也无所谓
-      } catch (e) {}
-    },
-
-    // ======================== 草稿箱发布 ========================
-    handlePublish(item) {
-      const accountId = this.queryParams.accountId;
-      const mediaId = item.mediaId;
-      const content = '你正在通过发布的方式发表内容。 发布不占用群发次数，一天可多次发布。已发布内容不会推送给用户，也不会展示在公众号主页中。 发布后，你可以前往发表记录获取链接，也可以将发布内容添加到自定义菜单、自动回复、话题和页面模板中。';
-      this.$modal.confirm(content).then(function() {
-        return submitFreePublish(accountId, mediaId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("发布成功");
-      }).catch(() => {});
-    },
-    handleDelete(item) {
-      const accountId = this.queryParams.accountId;
-      const mediaId = item.mediaId;
-      this.$modal.confirm('此操作将永久删除该草稿, 是否继续?').then(function() {
-        return deleteDraft(accountId, mediaId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.pagination {
-  float: right;
-  margin-right: 25px;
-}
-
-.add_but {
-  padding: 10px;
-}
-
-.ope-row {
-  margin-top: 5px;
-  text-align: center;
-  border-top: 1px solid #eaeaea;
-  padding-top: 5px;
-}
-
-.item-name {
-  font-size: 12px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  text-align: center;
-}
-
-.el-upload__tip {
-  margin-left: 5px;
-}
-
-/*新增图文*/
-.left {
-  display: inline-block;
-  width: 35%;
-  vertical-align: top;
-  margin-top: 200px;
-}
-
-.right {
-  display: inline-block;
-  width: 60%;
-  margin-top: -40px;
-}
-
-.avatar-uploader {
-  width: 20%;
-  display: inline-block;
-}
-
-.avatar-uploader .el-upload {
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  text-align: unset !important;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #165dff;
-}
-
-.avatar-uploader-icon {
-  border: 1px solid #d9d9d9;
-  font-size: 28px;
-  color: #8c939d;
-  width: 120px;
-  height: 120px;
-  line-height: 120px;
-  text-align: center;
-}
-
-.avatar {
-  width: 230px;
-  height: 120px;
-}
-
-.avatar1 {
-  width: 120px;
-  height: 120px;
-}
-
-.digest {
-  width: 60%;
-  display: inline-block;
-  vertical-align: top;
-}
-
-/*新增图文*/
-/*瀑布流样式*/
-.waterfall {
-  width: 100%;
-  column-gap: 10px;
-  column-count: 5;
-  margin: 0 auto;
-}
-
-.waterfall-item {
-  padding: 10px;
-  margin-bottom: 10px;
-  break-inside: avoid;
-  border: 1px solid #eaeaea;
-}
-
-p {
-  line-height: 30px;
-}
-
-@media (min-width: 992px) and (max-width: 1300px) {
-  .waterfall {
-    column-count: 3;
-  }
-  p {
-    color: red;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .waterfall {
-    column-count: 2;
-  }
-  p {
-    color: orange;
-  }
-}
-
-@media (max-width: 767px) {
-  .waterfall {
-    column-count: 1;
-  }
-}
-
-/*瀑布流样式*/
-.news-main {
-  background-color: #FFFFFF;
-  width: 100%;
-  margin: auto;
-  height: 120px;
-}
-
-.news-content {
-  background-color: #acadae;
-  width: 100%;
-  height: 120px;
-  position: relative;
-}
-
-.news-content-title {
-  display: inline-block;
-  font-size: 15px;
-  color: #FFFFFF;
-  position: absolute;
-  left: 0px;
-  bottom: 0px;
-  background-color: black;
-  width: 98%;
-  padding: 1%;
-  opacity: 0.65;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  height: 25px;
-}
-
-.news-main-item {
-  background-color: #FFFFFF;
-  padding: 5px 0px;
-  border-top: 1px solid #eaeaea;
-  width: 100%;
-  margin: auto;
-}
-
-.news-content-item {
-  position: relative;
-  margin-left: -3px
-}
-
-.news-content-item-title {
-  display: inline-block;
-  font-size: 12px;
-  width: 70%;
-}
-
-.news-content-item-img {
-  display: inline-block;
-  width: 25%;
-  background-color: #acadae
-}
-
-.input-tt {
-  padding: 5px;
-}
-
-.activeAddNews {
-  border: 5px solid #2bb673;
-}
-
-.news-main-plus {
-  width: 280px;
-  text-align: center;
-  margin: auto;
-  height: 50px;
-}
-
-.icon-plus {
-  margin: 10px;
-  font-size: 25px;
-}
-
-.select-item {
-  width: 60%;
-  padding: 10px;
-  margin: 0 auto 10px auto;
-  border: 1px solid #eaeaea;
-}
-
-.father .child {
-  display: none;
-  text-align: center;
-  position: relative;
-  bottom: 25px;
-}
-
-.father:hover .child {
-  display: block;
-}
-
-.thumb-div {
-  display: inline-block;
-  width: 30%;
-  text-align: center;
-}
-
-.thumb-but {
-  margin: 5px;
-}
-
-.material-img {
-  width: 100%;
-  height: 100%;
-}
-</style>
diff --git a/src/views/mp/freePublish/index.vue b/src/views/mp/freePublish/index.vue
deleted file mode 100644
index 569e65ae..00000000
--- a/src/views/mp/freePublish/index.vue
+++ /dev/null
@@ -1,395 +0,0 @@
-<!--
-MIT License
-
-Copyright (c) 2020 www.joolun.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-  芋道源码：
-  ① 优化代码，和项目的代码保持一致
--->
-<template>
-  <div class="app-container">
-    <doc-alert title="公众号图文" url="https://doc.iocoder.cn/mp/article/" />
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公众号" prop="accountId">
-        <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 列表 -->
-    <div class="waterfall" v-loading="loading">
-      <div v-if="item.content && item.content.newsItem" class="waterfall-item" v-for="item in list"
-           :key='item.articleId'>
-        <wx-news :articles="item.content.newsItem" />
-        <!-- 操作 -->
-        <el-row class="ope-row">
-          <el-button type="danger" icon="el-icon-delete" circle @click="handleDelete(item)"
-                     v-hasPermi="['mp:free-publish:delete']" />
-        </el-row>
-      </div>
-    </div>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-  </div>
-</template>
-
-<script>
-import { getFreePublishPage, deleteFreePublish } from "@/api/mp/freePublish";
-import { getSimpleAccounts } from "@/api/mp/account";
-import WxNews from '@/views/mp/components/wx-news/main.vue';
-
-export default {
-  name: 'MpFreePublish',
-  components: {
-    WxNews
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 已发表列表
-      list: [],
-      // 查询参数
-      queryParams: {
-        total: 0, // 总页数
-        currentPage: 1, // 当前页数
-        queryParamsSize: 10 // 每页显示多少条
-      },
-
-      // 公众号账号列表
-      accounts: [],
-    }
-  },
-  created() {
-    getSimpleAccounts().then(response => {
-      this.accounts = response.data;
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.queryParams.accountId = this.accounts[0].id;
-      }
-      // 加载数据
-      this.getList();
-    })
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      // 如果没有选中公众号账号，则进行提示。
-      if (!this.queryParams.accountId) {
-        this.$message.warning('未选中公众号，无法查询已发表图文')
-        return false
-      }
-
-      this.loading = true;
-      getFreePublishPage(this.queryParams).then(response => {
-        // 将 thumbUrl 转成 picUrl，保证 wx-news 组件可以预览封面
-        response.data.list.forEach(item => {
-          const newsItem = item.content.newsItem;
-          newsItem.forEach(article => {
-            article.picUrl = article.thumbUrl;
-          })
-        })
-        this.list = response.data.list
-        this.total = response.data.total
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.queryParams.accountId = this.accounts[0].id;
-      }
-      this.handleQuery();
-    },
-    /** 删除按钮操作 */
-    handleDelete(item){
-      const articleId = item.articleId;
-      const accountId = this.queryParams.accountId;
-      this.$modal.confirm('删除后用户将无法访问此页面，确定删除？').then(function() {
-        return deleteFreePublish(accountId, articleId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .pagination {
-    float: right;
-    margin-right: 25px;
-  }
-
-  .add_but {
-    padding: 10px;
-  }
-
-  .ope-row {
-    margin-top: 5px;
-    text-align: center;
-    border-top: 1px solid #eaeaea;
-    padding-top: 5px;
-  }
-
-  .item-name {
-    font-size: 12px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    text-align: center;
-  }
-
-  .el-upload__tip {
-    margin-left: 5px;
-  }
-
-  /*新增图文*/
-  .left {
-    display: inline-block;
-    width: 35%;
-    vertical-align: top;
-    margin-top: 200px;
-  }
-
-  .right {
-    display: inline-block;
-    width: 60%;
-    margin-top: -40px;
-  }
-
-  .avatar-uploader {
-    width: 20%;
-    display: inline-block;
-  }
-
-  .avatar-uploader .el-upload {
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-    text-align: unset !important;
-  }
-
-  .avatar-uploader .el-upload:hover {
-    border-color: #165dff;
-  }
-
-  .avatar-uploader-icon {
-    border: 1px solid #d9d9d9;
-    font-size: 28px;
-    color: #8c939d;
-    width: 120px;
-    height: 120px;
-    line-height: 120px;
-    text-align: center;
-  }
-
-  .avatar {
-    width: 230px;
-    height: 120px;
-  }
-
-  .avatar1 {
-    width: 120px;
-    height: 120px;
-  }
-
-  .digest {
-    width: 60%;
-    display: inline-block;
-    vertical-align: top;
-  }
-
-  /*新增图文*/
-  /*瀑布流样式*/
-  .waterfall {
-    width: 100%;
-    column-gap: 10px;
-    column-count: 5;
-    margin: 0 auto;
-  }
-
-  .waterfall-item {
-    padding: 10px;
-    margin-bottom: 10px;
-    break-inside: avoid;
-    border: 1px solid #eaeaea;
-  }
-
-  p {
-    line-height: 30px;
-  }
-
-  @media (min-width: 992px) and (max-width: 1300px) {
-    .waterfall {
-      column-count: 3;
-    }
-    p {
-      color: red;
-    }
-  }
-
-  @media (min-width: 768px) and (max-width: 991px) {
-    .waterfall {
-      column-count: 2;
-    }
-    p {
-      color: orange;
-    }
-  }
-
-  @media (max-width: 767px) {
-    .waterfall {
-      column-count: 1;
-    }
-  }
-
-  /*瀑布流样式*/
-  .news-main {
-    background-color: #FFFFFF;
-    width: 100%;
-    margin: auto;
-    height: 120px;
-  }
-
-  .news-content {
-    background-color: #acadae;
-    width: 100%;
-    height: 120px;
-    position: relative;
-  }
-
-  .news-content-title {
-    display: inline-block;
-    font-size: 15px;
-    color: #FFFFFF;
-    position: absolute;
-    left: 0px;
-    bottom: 0px;
-    background-color: black;
-    width: 98%;
-    padding: 1%;
-    opacity: 0.65;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    height: 25px;
-  }
-
-  .news-main-item {
-    background-color: #FFFFFF;
-    padding: 5px 0px;
-    border-top: 1px solid #eaeaea;
-    width: 100%;
-    margin: auto;
-  }
-
-  .news-content-item {
-    position: relative;
-    margin-left: -3px
-  }
-
-  .news-content-item-title {
-    display: inline-block;
-    font-size: 12px;
-    width: 70%;
-  }
-
-  .news-content-item-img {
-    display: inline-block;
-    width: 25%;
-    background-color: #acadae
-  }
-
-  .input-tt {
-    padding: 5px;
-  }
-
-  .activeAddNews {
-    border: 5px solid #2bb673;
-  }
-
-  .news-main-plus {
-    width: 280px;
-    text-align: center;
-    margin: auto;
-    height: 50px;
-  }
-
-  .icon-plus {
-    margin: 10px;
-    font-size: 25px;
-  }
-
-  .select-item {
-    width: 60%;
-    padding: 10px;
-    margin: 0 auto 10px auto;
-    border: 1px solid #eaeaea;
-  }
-
-  .father .child {
-    display: none;
-    text-align: center;
-    position: relative;
-    bottom: 25px;
-  }
-
-  .father:hover .child {
-    display: block;
-  }
-
-  .thumb-div {
-    display: inline-block;
-    width: 30%;
-    text-align: center;
-  }
-
-  .thumb-but {
-    margin: 5px;
-  }
-
-  .material-img {
-    width: 100%;
-    height: 100%;
-  }
-</style>
diff --git a/src/views/mp/material/index.vue b/src/views/mp/material/index.vue
deleted file mode 100644
index 091eee74..00000000
--- a/src/views/mp/material/index.vue
+++ /dev/null
@@ -1,440 +0,0 @@
-<!--
-MIT License
-
-Copyright (c) 2020 www.joolun.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-  芋道源码：
-  ① 清理冗余 css 内容，清理冗余 data 变量
-  ② 美化样式，支持播放，提升使用体验
-  ③ 优化代码，特别是方法名和变量，提升可读性
--->
-<template>
-  <div class="app-container">
-    <doc-alert title="公众号素材" url="https://doc.iocoder.cn/mp/material/" />
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公众号" prop="accountId">
-        <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-tabs v-model="type" @tab-click="handleClick">
-      <!-- tab 1：图片  -->
-      <el-tab-pane name="image">
-        <span slot="label"><i class="el-icon-picture"></i> 图片</span>
-        <div class="add_but" v-hasPermi="['mp:material:upload-permanent']">
-          <el-upload :action="actionUrl" :headers="headers" multiple :limit="1" :file-list="fileList" :data="uploadData"
-                     :before-upload="beforeImageUpload" :on-success="handleUploadSuccess">
-            <el-button size="mini" type="primary">点击上传</el-button>
-            <sapn slot="tip" class="el-upload__tip" style="margin-left: 5px">支持 bmp/png/jpeg/jpg/gif 格式，大小不超过 2M</sapn>
-          </el-upload>
-        </div>
-        <div class="waterfall" v-loading="loading">
-          <div class="waterfall-item" v-for="item in list" :key='item.id'>
-            <a target="_blank" :href="item.url">
-              <img class="material-img" :src="item.url">
-              <div class="item-name">{{item.name}}</div>
-            </a>
-            <el-row class="ope-row">
-              <el-button type="danger" icon="el-icon-delete" circle @click="handleDelete(item)"
-                         v-hasPermi="['mp:material:delete']"/>
-            </el-row>
-          </div>
-        </div>
-        <!-- 分页组件 -->
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                    @pagination="getList"/>
-      </el-tab-pane>
-
-      <!-- tab 2：语音  -->
-      <el-tab-pane name="voice">
-        <span slot="label"><i class="el-icon-microphone"></i> 语音</span>
-        <div class="add_but" v-hasPermi="['mp:material:upload-permanent']">
-          <el-upload :action="actionUrl" :headers="headers" multiple :limit="1" :file-list="fileList" :data="uploadData"
-                  :on-success="handleUploadSuccess" :before-upload="beforeVoiceUpload">
-            <el-button size="mini" type="primary">点击上传</el-button>
-            <span slot="tip" class="el-upload__tip" style="margin-left: 5px">格式支持 mp3/wma/wav/amr，文件大小不超过 2M，播放长度不超过 60s</span>
-          </el-upload>
-        </div>
-        <el-table :data="list" stripe border v-loading="loading" style="margin-top: 10px;">
-          <el-table-column label="编号" align="center" prop="mediaId" />
-          <el-table-column label="文件名" align="center" prop="name" />
-          <el-table-column label="语音" align="center">
-            <template v-slot="scope">
-              <wx-voice-player :url="scope.row.url" />
-            </template>
-          </el-table-column>
-          <el-table-column label="上传时间" align="center" prop="createTime" width="180">
-            <template v-slot="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template v-slot="scope">
-              <el-button type="text" icon="el-icon-download" size="small" plain @click="handleDownload(scope.row)">下载</el-button>
-              <el-button type="text" icon="el-icon-delete" size="small" plain @click="handleDelete(scope.row)"
-                         v-hasPermi="['mp:material:delete']">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!-- 分页组件 -->
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                    @pagination="getList"/>
-      </el-tab-pane>
-
-      <!-- tab 3：视频 -->
-      <el-tab-pane name="video">
-        <span slot="label"><i class="el-icon-video-play"></i> 视频</span>
-        <div class="add_but" v-hasPermi="['mp:material:upload-permanent']">
-          <el-button size="mini" type="primary" @click="handleAddVideo">新建视频</el-button>
-        </div>
-        <!-- 新建视频的弹窗 -->
-        <el-dialog title="新建视频" :visible.sync="dialogVideoVisible" append-to-body width="600px"
-                   v-loading="addMaterialLoading">
-          <el-upload :action="actionUrl" :headers="headers" multiple :limit="1" :file-list="fileList" :data="uploadData"
-                     :before-upload="beforeVideoUpload" :on-success="handleUploadSuccess"
-                     ref="uploadVideo" :auto-upload="false">
-            <el-button slot="trigger" size="mini" type="primary">选择视频</el-button>
-            <span class="el-upload__tip" style="margin-left: 10px;">格式支持 MP4，文件大小不超过 10MB</span>
-          </el-upload>
-          <el-form :model="uploadData" :rules="uploadRules" ref="uploadForm" label-width="80px">
-            <el-row>
-              <el-form-item label="标题" prop="title">
-                <el-input v-model="uploadData.title" placeholder="标题将展示在相关播放页面，建议填写清晰、准确、生动的标题" />
-              </el-form-item>
-            </el-row>
-            <el-row>
-              <el-form-item label="描述" prop="introduction">
-                <el-input :rows="3" type="textarea" v-model="uploadData.introduction"
-                          placeholder="介绍语将展示在相关播放页面，建议填写简洁明确、有信息量的内容" />
-              </el-form-item>
-            </el-row>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="cancelVideo">取 消</el-button>
-            <el-button type="primary" @click="submitVideo">提 交</el-button>
-          </div>
-        </el-dialog>
-        <el-table :data="list" stripe border v-loading="loading" style="margin-top: 10px;">
-          <el-table-column label="编号" align="center" prop="mediaId" />
-          <el-table-column label="文件名" align="center" prop="name" />
-          <el-table-column label="标题" align="center" prop="title" />
-          <el-table-column label="介绍" align="center" prop="introduction" />
-          <el-table-column label="视频" align="center">
-            <template v-slot="scope">
-              <wx-video-player :url="scope.row.url" />
-            </template>
-          </el-table-column>
-          <el-table-column label="上传时间" align="center" prop="createTime" width="180">
-            <template v-slot="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
-            <template v-slot="scope">
-              <el-button type="text" icon="el-icon-download" size="small" plain @click="handleDownload(scope.row)">下载</el-button>
-              <el-button type="text" icon="el-icon-delete" size="small" plain @click="handleDelete(scope.row)"
-                         v-hasPermi="['mp:material:delete']">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!-- 分页组件 -->
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                    @pagination="getList"/>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue';
-import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue';
-import { getSimpleAccounts } from "@/api/mp/account";
-import { getMaterialPage, deletePermanentMaterial } from "@/api/mp/material";
-import { getAccessToken } from '@/utils/auth'
-
-export default {
-  name: 'MpMaterial',
-  components: {
-    WxVoicePlayer,
-    WxVideoPlayer
-  },
-  data() {
-    return {
-      type: 'image',
-      // 遮罩层
-      loading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 数据列表
-      list: [],
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        accountId: undefined,
-        permanent: true,
-      },
-
-      actionUrl: process.env.VUE_APP_BASE_API  + '/admin-api/mp/material/upload-permanent',
-      headers: { Authorization: "Bearer " + getAccessToken() }, // 设置上传的请求头部
-      fileList:[],
-      uploadData: {
-        "type": 'image',
-        "title":'',
-        "introduction":''
-      },
-      // === 视频上传，独有变量 ===
-      dialogVideoVisible: false,
-      addMaterialLoading: false,
-      uploadRules: { // 视频上传的校验规则
-        title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
-        introduction: [{ required: true, message: '请输入描述', trigger: 'blur' }],
-      },
-
-      // 公众号账号列表
-      accounts: [],
-    }
-  },
-  created() {
-    getSimpleAccounts().then(response => {
-      this.accounts = response.data;
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.setAccountId(this.accounts[0].id);
-      }
-      // 加载数据
-      this.getList();
-    })
-  },
-  methods: {
-    // ======================== 列表查询 ========================
-    /** 设置账号编号 */
-    setAccountId(accountId) {
-      this.queryParams.accountId = accountId;
-      this.uploadData.accountId = accountId;
-    },
-    /** 查询列表 */
-    getList() {
-      // 如果没有选中公众号账号，则进行提示。
-      if (!this.queryParams.accountId) {
-        this.$message.warning('未选中公众号，无法查询草稿箱')
-        return false
-      }
-
-      this.loading = true
-      getMaterialPage({
-        ...this.queryParams,
-        type: this.type
-      }).then(response => {
-        this.list = response.data.list
-        this.total = response.data.total
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1
-      // 默认选中第一个
-      if (this.queryParams.accountId) {
-        this.setAccountId(this.queryParams.accountId)
-      }
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.setAccountId(this.accounts[0].id)
-      }
-      this.handleQuery()
-    },
-    handleClick(tab, event) {
-      // 设置 type
-      this.uploadData.type = tab.name
-      // 从第一页开始查询
-      this.handleQuery();
-    },
-
-    // ======================== 文件上传 ========================
-    beforeImageUpload(file) {
-      const isType = file.type === 'image/jpeg'
-          || file.type === 'image/png'
-          || file.type === 'image/gif'
-          || file.type === 'image/bmp'
-          || file.type === 'image/jpg';
-      if (!isType) {
-        this.$message.warning('上传图片格式不对!')
-        return false;
-      }
-      const isLt = file.size / 1024 / 1024 < 2
-      if (!isLt) {
-        this.$message.warning('上传图片大小不能超过 2M!')
-        return false;
-      }
-      this.loading = true
-      return true;
-    },
-    beforeVoiceUpload(file){
-      const isType = file.type === 'audio/mp3'
-          || file.type === 'audio/wma'
-          || file.type === 'audio/wav'
-          || file.type === 'audio/amr';
-      const isLt = file.size / 1024 / 1024 < 2
-      if (!isType) {
-        this.$message.warning('上传语音格式不对!')
-        return false;
-      }
-      if (!isLt) {
-        this.$message.warning('上传语音大小不能超过 2M!')
-        return false;
-      }
-      this.loading = true
-      return true;
-    },
-    beforeVideoUpload(file){
-      const isType = file.type === 'video/mp4'
-      if (!isType) {
-        this.$message.warning('上传视频格式不对!')
-        return false;
-      }
-      const isLt = file.size / 1024 / 1024 < 10
-      if (!isLt) {
-        this.$message.warning('上传视频大小不能超过 10M!')
-        return false
-      }
-      this.addMaterialLoading = true
-      return  true
-    },
-    handleUploadSuccess(response, file, fileList) {
-      this.loading = false
-      this.addMaterialLoading = false
-      if (response.code !== 0) {
-        this.$message.warning('上传出错：' + response.msg)
-        return false;
-      }
-
-      // 清空上传时的各种数据
-      this.dialogVideoVisible = false
-      this.fileList = []
-      this.uploadData.title = ''
-      this.uploadData.introduction = ''
-
-      // 加载数据
-      this.getList()
-    },
-    // 下载文件
-    handleDownload(row) {
-      window.open(row.url,'_blank')
-    },
-    // 提交 video 新建的表单
-    submitVideo() {
-      this.$refs['uploadForm'].validate((valid) => {
-        if (!valid) {
-          return false;
-        }
-        this.$refs.uploadVideo.submit()
-      })
-    },
-    handleAddVideo() {
-      this.resetVideo();
-      this.dialogVideoVisible = true
-    },
-    /** 取消按钮 */
-    cancelVideo() {
-      this.dialogVideoVisible = false;
-      this.resetVideo();
-    },
-    /** 表单重置 */
-    resetVideo() {
-      this.fileList = []
-      this.uploadData.title = ''
-      this.uploadData.introduction = ''
-      this.resetForm("uploadForm");
-    },
-
-    // ======================== 其它操作 ========================
-    handleDelete(item) {
-      const id = item.id
-      this.$modal.confirm('此操作将永久删除该文件, 是否继续?').then(function() {
-        return deletePermanentMaterial(id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-/*瀑布流样式*/
-.waterfall {
-  width: 100%;
-  column-gap:10px;
-  column-count: 5;
-  margin-top: 10px; /* 芋道源码：增加 10px，避免顶着上面 */
-}
-.waterfall-item {
-  padding: 10px;
-  margin-bottom: 10px;
-  break-inside: avoid;
-  border: 1px solid #eaeaea;
-}
-.material-img {
-  width: 100%;
-}
-p {
-  line-height: 30px;
-}
-@media (min-width: 992px) and (max-width: 1300px) {
-  .waterfall {
-    column-count: 3;
-  }
-  p {
-    color:red;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .waterfall {
-    column-count: 2;
-  }
-  p {
-    color: orange;
-  }
-}
-@media (max-width: 767px) {
-  .waterfall {
-    column-count: 1;
-  }
-}
-/*瀑布流样式*/
-</style>
diff --git a/src/views/mp/menu/assets/demo.png b/src/views/mp/menu/assets/demo.png
deleted file mode 100644
index 49c9a020f7b71b1191b9067a63313c0eeac8c3ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38335
zcmeFZXH=8T_bwdu0TodmMMR`3O^To(y-M#j2~wjHdg#3b5JZ&TdlBgg5b4qdr1uh9
zfG92WNG~C9g1`SM>#X&DJLl7R@5P5?oXovv&&=NYy7nGF>u4$8rg%gF003^Qswn6I
z0A%a{z%`#6<fIm_6W((GfCZqc@CxXau{q}(!LXcpLBP-QHxCU63JZU(yaMZ=;Z=Tk
z7&G;wyKSVCet3udh4{UhTv2&|A&X8-a0Cr6__r1G%G-ri+8wG&y2b3a?WNTiMfo2$
z39kKo;h7I1E-!vzBCI+WF<#rr`r4-TNCdJT=}Y=6z@k2R71WcS4FOR0x%80!^PIaR
zsV<)zs&8uy{__za>;E|6pZ|RRms?Ktzglyi{Qr#r!2fN9a1S0*XmC<fQ+Eb*@}CYF
zpdiV}$y2D8mqKS}C-jYz4*AEA)!0xAn43mtbzN6im!g!a6iPNCpyRM|vgIDGTwzH2
zsG{SLK>}r=nSaz_m1NwPRhFH45I{yordLEX00N&{SXc<;ew8ECDuhvl=T%iHtn{a`
zS6TvX_h{CKz<b6Qt(cI(K^W@l<;s6}=MRV17(BN55EuVkT$qD;ky=1lnnS*wb#x5F
z1D_=12fWd_Fx5nr6vY?{TB@k3mLEcjfnczjs&n~$8XDENZ*y36SWE!B@uyeYPd!Zt
zjxaaiM`b0bo12D2bc7u)@ygow;oMAP^8Mk8#u5$g-ahC=Kb@YjDSOAvi9$&7`imoP
zvP)3{O@Pne&fR8xO!FWjDx&wta17;bDs=;Gl-Y@>fWQ;7kPshseMQB(gro!&)z1j0
zukMn8`+AA!^$fv0;^d^KY1zTS8jiz#K2^dusXtxNxVKj=zoZJ7oiucXJu&X`6}uh4
zk_5H{4OzG(cOX#n8|siwvmCS>htNn9bN!f*oVcOMgT@15ZX@h&fDCPbwp6Q-q#~UP
z+ieD^JYIgD#IW667|L?>2KyD#XiK-`dTdDZ1X4X7@-&M%Z++a<Q*G;0>abb*uRu0W
z3}A`FT}`Au=HUbnH%P~@C=+2hSd?&5Ep*zl?w3UMzYOxm+WIx$zDdFuPJEvu2DG=b
zPOL3XKW_UfC&ZvwV{jL6Rkz(CGBR>wPRnGgp}@cgDR`dz;Mwyu@8l#)UmC$MoqHsC
zWSdzMGTO+=Lzng{tq%O3fUq%p8@7?H)(__%{CN50YVS_@%_bYqqmFQa=g*&tyzEaV
z+uPV*$FF&1vHm^$G5j~!3t7;#m>&J?zLP<|Vq|gbNi|w8gHx0K$`U`iks#+8y>C{}
z3o)wFX>L3wC#t8cefXd6ell(h4n`Mo%w%Vaak>kkNsFxb@FokMk}A5pE=p@{qlK^b
zY``F|z_#o@%>%9QUe*7YpOYXRfv)0OadGhisyD8?sKUI)Mw3VD5e4CZm?2<5J>u3a
z8kPCRC3OMU6-u})syO0*ytDu9;^N}zr>g8sF`lMmRClBZZ-Swqm8EYrfW@jv=6Z6~
zp1C%joivlU)A~ony!_b}p!g5}*$iYk&?vq4P%DGzjIG8m*JCR!2Zxo%vk)RPfEZPT
z>QTtH197(Q_#=67nxHbpty`5%Mymf^Q3dawifu{gGB7eGQU{!9kcWm^_}iC~&V@!p
zD+7Qf6PWzq7XA9N5!U@=uXyYf@WwW8d-Ps?{pBtM<aJfuVZR>wacNP8DZV$1qVDah
z;DqNfw*mir<z~h8XXOXP=90J7d6a59oc1Q?eQlJ)ATRw3AcefZ%(pSH%vxmlx{UOb
zJv&?I-S=#OJcUdNTI@HSu&RIyud^YSY7{>P`Pamgeqj2vSiBn;{POIGIl3o~|5=i^
zD{k164WJRUzWep9e`bHWh;mfcaivMUi{kDViFcRpktNqe>gX{KugE259QSdZr1N8+
z3i9w&HmL!g+XDwOc@Es&U3O8~eak!sH#siP0)Q)BIA`hj_=6i{GjV7rE1Cb9S>6%r
zO@InNdI)OoUY()Sx&#XP>uqFh3lyIgJB0c2Lz0FDGvY&T-_|n&CvAbQ2HMySZcghN
z>*q)J!<T1-{;U5essFTR6Xg7Cn%1YXtvAf&H0GZ`O1;9Vx=Nf12rYRsRy?$v=5gn*
zl33{Ur4tyKm||JGw0qC$jZ(#O<7Dpv<i2QC@2&JF(IpD*`}<ud53L~0hV%q-LDfRz
z5Iw)T0?vSVEbOp9^`E#D7m__*^0^2!*=XPkmY07S+>s#IQlr$X*0+Sp&Q6LQ8G)hh
zT>kt`*wag!-dPxMio8#otfGl-grO*6UZQCsp4uoT4Q_5A>M4KniMx=VkzU+#^|c^f
z!dBbIlilgH%2DSW;|Kh(?nCasDl7=(GUl2d^HrsCZ?3W?IczeOnd)X~WtQS1?w<4a
zSEQ!s=yDb)^+TC7CWewLGimo-1usPaeAejE(K|5pIO8u|>ZEswX=~#;c@Wdp+10f?
zy37+LJL=%%q(jAN(;HcwS5g8*;06-;2i;c*{C|JFqfw{e=myg`-#ww78Nf?&O*#a<
zFIEbPH8)>$#;q|k#5l{TYP<mLMU=ht@!{`VE%IFbJM}<;Wx1Ytb%TAi9z>lh-4waL
z-j||S$$R=bIUZVNC}iR-Dca?k18D^O@AR4rfKSClU-DWFdaBsFC*G%}weWQhO!(_W
zbkF2bjg1;qUV+6*pl?G(B?)C&>Jgo{F9rM~WTAuwYZ~&K)t6is7qsgCqIORotot^n
zKUGLwNl8gE-8nfaX*K5#LA0RYDlt5_#s55H+$@`uwAz-C%Pn!0n~1$IRtvcB<@%C+
z*eIl{`?%e6j=eqL;%M3|F(O?cF|NIx)n&!6a2}T4YX2NPkSf*Z3gP2<miY0+{c_#%
zg|2aEZ%qn;K)W5&d(GFxFK6U5daXx3G%rS009Cw&I=ogbqv5IlRZs6gePSA2YM=@R
zgQ27us_G}2lT3Q=rlH`nPe4mVWc0>+sG_%6jzmES=`5-kXp?Me-4k~-dfJSUG%O3Q
zm_n6CWkk@|Umw%*tp$Q*F7T~hO1Qy}{)EBtyY(!D+_EA6WRw5>`|FkdtjsMmK;Ydg
zc+=Uzo}iwTXV!i8Rb?8|INhFP|HM5nCbBT6{n7s1@H6U`sZV0wqqA#(=R*ByV)EmF
zS*fPviY9JSUqB#3{9aC;Z9V+duaFm3RH$|jP>^z3Z?wfQpJUK??Xt_8o)eu4+^9uU
zbknW?g6+y1gf2Rc6ezfq;(bVa^|DKhyo+?gSsxD4eU|p<vI~VCgc~%J&O=+zZ|MuV
z>;e#DE4*G`H!s5y9NaG8dssp`EdUlp+k_KAoJ1a~1!4&XTl%__ItDiCo^5gFANSFW
z+{`96P@XTeT$LtB=$)_6SqfnSBZ#}-?n^?6^IW;n__*KQevl;R142`@dWXEoXAoHU
zoX}<Qt>et1&!f0e9X1q>+7Csk{kE#X5p+>?TE^RgsNPSDCo)Mv7hXyq=c&H?Rr^EE
zHBKSN$$4hV+2_MBx?9K1|0a$l#?3V~>6r>?QxwPj6Ue3R-lD5#!fSv!wD>!rz(zeC
zV}7#C3%=Z~nSf088GL2DNe~4yHmUpy0e{`X<l;n{i?9=&ziBq9PkzqEdg@9JU1${A
zk<jy>WT0z#t{fI{%osg6!gR5-sCUm11U$wG4G~biQ|R=(pEa{_oc_EWE>m<W2wcl4
z0+@C|GepbP$aCtuY<loy4<B`2Ml@*dI1$gaqE-D2XS~72$!^8Njs}Q8GNkxL;1;Tv
zOY>Y6;n>rBeua*ic{1JYay7dH(b)Jf$9Xm~3-%}SU@5F;o?EI=yNt^6#qssK#GP<~
zLnO{(RhE2Wao#vzXRv#f(7AyO>kE=;d3FtTri9Wd@%pNNA+`>I{$Zqf<dA$76*vU8
zC~n~~P%L;w7UoGfE8~{Rj(y*i8_l85RlEXvT=1KN%liPNENWCDr{xU#_#`LeHaq&u
z4fYOpANSiN51B4ymy{vxt5s&&!slu^!hW43XUyH}{@mBD1JQ4*BkI!Wl#3|38Y~u4
z`$0!Evo$IlQIf2zmR?USS&AuJ{(NWJ1)U#*>B>=yB>e?i?;*pKeV-R4l`kM7B)8Kh
z3k^MVY^C1y*9P?urdX~-{TRvRs%3J~a!B0O8szYoO6Kdyn67;IiyTn!e&OpAE^gkq
z_pOirhA1q&p8m?c7l&Ud&xZn%<1TQjT*vKw0%y7_keW9hA>E2w)y(y(9DHtSzYUlZ
zdJUMX241k32V|9sgd|y+(ReR(>FuJevB|L%T_>n8G*6RmrZrG<eW2oCy~k&gCq0_~
z6Ie=|`-xPxdA*a)DKmDNkhNbh?<rPT$HUPjvv;BKFAt}DPx+2BJa3{ygtz|?0RW83
z!drnx2va%AJH1m=DI`N`;hT7QaMm1^s_&=JnUIXa{WGCe>fGSj`$lgU<dt+@A0x_t
zv@v5#kDiJB-r3x_IF7%MLMDxLG1r3ZI*W(>mg%w)TAc7dk1%-Z8VU{b6RMvO**-ox
zVnx$*jn81Pp4Ws?)Q)d!?3CpcP^|!>^)W6uSpKx7Ls6{G2M~C_KU2`S%%qN+WEb=d
zUp>7^5@)F_Ahxxug8@YNa=+*so>Azu=9DPN1suzMQRu51Jam>VlhnppqrPlln)uoB
zBD@z$c*FY#@k8TJ#&6nrVe(Zm6gOW0tNhUGoC1n>2E9M|tKE04A8F-7PnV(Vlcczy
zS4}<tTTB54@Z6LH4!VcCKV2dR3q|i5gUdZ6TR?P9-fwwFyjQ3<>iX*u|KRY8I<+3_
zgTn0`gZ$mc(bG@H>@_<=)Os|!dvtae^7{llw;8zJd;kMdgu}wZ_eW}#m6R&~V<>|j
zen*H5@i`Hh3_@OrS5uy;DwQ-dADlBv4A4oEFWeM$iflOXa7m0qoQ??v4$4<roDI3=
zIUUl(P8%>j&dtPq5#{Q?R+w>%U0GS#!pTd;av+U{<#Cr=PTD4f6oQo<QLPdOXlQ9w
zEfn)fq1H1JoSQb20@&z$A)>xEnn(;1ETC>R3HNcc*({{Vz42K)26jeKuF6C)pJ;Qf
zsw~tUfz?~l;XW#b*hKy!kL8!(F)N`jk@gi7tffvvkHiRcH01MEgMau1yr2!h=6X{K
zrtH}pzf_O7iUoN%&_0Ow_F2c}_syi9Ub}Ec0*h9rY=5M8uVR&$;}vP<)m=oe6JlA>
zUM|~FPF_%;l5(UD#aK2XZGEkY&7jN-?H}cj{d)KwIa$_23SNq{L=092GFd}_gID#<
zEG$AIA|kp|JR+#oF5xGg$AXA}U)!<sz5yZL$F|2lT%pYW(Mi*<z8Sn#z%y1o{?>c+
zG~mIc@-EK~Fmugjoc}amqRd$oWedxoCEA&NTTr0hFIk0pM+*+fdgbcE2CPB|fh-CU
z`&DU<%BLA_&-&1Q^gVrb5^_QU$VZ9Q-vY&Z*0jjtOr@Ggek+YNrYb!pWmsNa$OT2g
zachb{kgK#R56B0p<IXjI&qtzm001_7g}gs~db=`aQKbvv-&uAfK=s-bj^Ce{4~?h4
z{~f6D>9D~}(<}ZyX)knc!e6epG|&Yviz04=+`k@tdnW4k5*gJ#=O-af1aW1d{MQq7
zo9MnbU8va4+*-%J(foOEkoNPJ#Er5ya{1C?OZ#<q>L#%Kq|pAxmjW>~u%QyEjtbLI
z*t#XcXH-NLn4oIDxF{eh`p`NvNUy;;CYN{BFFv1JtFKQjKkw(o5OoaKy7nMMnqZQ2
zK5#Ep&=;%(*^slcT1X{LC6M8T-DDXF`n&X3Z(*(tNwhRe?`Vi|6mqkp2iCh+i|*6X
zP^)OU+8Q63wlImF>F*&q=G}#a=!`j=Tq+xs%OLp4_MSC0M&o4?$<R{9vG|z(SHYpo
zLALlLaxu+S>QY}zg&FI4+CsPu=7$NRdfeX&BxnG4s5mDx?I942=zne8w@%&bCOqLr
z*W<z{f`B47Z4-Q1=(&4&pw?c{8D_i7F#rK#G-?RlWROnBuj^ykwgsD$(Rs`u!$eht
zoIsb4V0Te-^TxCp*-~*_+&el(`T^wP-&pZif__dO6VT?u;B|~XGK5m+nQ%O#rZE{^
zDlp9o&TDzP_s?0;xdsV)-TVvTS)!MLr-cYM5Q`y@0p{ebVagq&QImRJk}4=zCH%3@
z)e@(fShn7Us;L*pAm2-Z40X#q6Q67C*<T9TZ7i1fqez+^J+-Z<3LbvDuA4JOit_UD
zJ}nXC)=8$XU&rjk`h<svFMkZVJ?gp>M|u0UYSqU+(*e*Mt;!1?rm@Y7`fOUq>1~UX
zCd;prhel<H8-D?siiKiGS0MnJMR5`OF*JU=?QaDA9KHm6Y9q94{&M2%i&7xCb%}((
z7Qq_Dh~6}Wcg{-`7*+nInQswwZK?9=Rtgw?L;L3k97#~w^R%L(n6~#<%Hnd8X(Dm2
z9_wl)vLV!ZzRIOJ;BL`K8<1i&kSp$3I30`*M}zhR%-C<TNUl?roL0Q`i&(*s#t5`H
zE^B}`R_Hw)>vi;DDc-tn8<4W?QlRGo^D`k?EfqsU8&a(CSg%z9-B>3eFY)X2lwd)k
zw5Yhl!ou>tel<xqdz_!2ucvar`@A&aesXtr(Tl4h=$*^4yZ>M>n$8{9@B#c}*RC0w
z(L=)#F$`wa+!Zn!R$|m@h@4u|n&mZ?NMh`QVv1$IUV?=@ke~z7K!N7<JuqNQUsw0-
zmvbmdPl0}4gNpoa<O0~O<W$j_ORL>Q_rWW`aF-7%WHAW2dq4IINhVC|4EWas$@=%E
z{-bl->x+YqO~Ea|*yT<hslCZ|sc;sVWsRrBMLK%lUy%i_Y0FFsma&kU0ZYi)o9vuF
ztvkC!^)J5z06(gdBy#c|2B-h4dX+T(q^jOu*9Y+CDf|z`LFzNcoWu6FGayjs?%#Kl
zzTKetzt9MB{!8|<#QrY7YC{~;5Suc5oJ@YAMM4EE2K_wD$qgIVp?jKeJ)@VgTj<vN
za+kuoq*1VWG9i*^ZiOvzUg)sguB>QMB1!no&4ef6;=m@~qY2C*0XAhzQFxQ^h@|F>
z0&dc|IXO1{=aNpTQ!>pi-gxQWR8WQqBn5R>0J2*8nl%?F<69L?r0#%E@}{Wb4Pln2
zmkNm)12V?}RY*QyN!Yzf35!)B_q|2xM0);@DCfCq6LTY5BtKKkeBhXQhIL|RQoOU}
zYOJT3pXz+wL#L4OU16b~dFm@TD%k-3bfe|hrw=Y;6_)7Bm5H&ho#msSIXoth?=s4Y
zp9>A<+sxaXbC!h?g{OVgxp{K04s%G2!)BpmIh+;&dt8R-@uz)yhD-N%x@GJK4*w!5
z?_5y~4{2urzjBj{2xsqlEhWHa#~;B?PwhvWmn|_L(k(Uy(G>w*Ow-MOlq>8sHJ4(|
zpK0zYU~IiDuq%M~zf`9iY@#;}WDqfx&*mG|mx?E|libnec$@Y?OPc^;aVz|F`x$}i
z6G!CE>%V}UEt<rO1+oE4y^UrjMGMz*=36C}ORWslL4j*`5vkP(+bXf~vy7L*4OWsY
z+OV*}Lb>)SZWYk)@5+Z=|77veQgt6H8!M(Uja*a3`3lHsa^|Y(O%tu-HxEs$U;fJ2
z6+f4mK5q|*-@9VfvPke<E^pcMS)%sd%0Ab0@cZq3VkzHfQ!ec=&wbs%`&q5L|3N!$
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

diff --git a/src/views/mp/menu/assets/iphone_backImg.png b/src/views/mp/menu/assets/iphone_backImg.png
deleted file mode 100644
index bb09591a7912730aab07287e0bb2bc4e3383abc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34272
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

diff --git a/src/views/mp/menu/assets/logo.png b/src/views/mp/menu/assets/logo.png
deleted file mode 100644
index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6849
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

diff --git a/src/views/mp/menu/assets/menu_foot.png b/src/views/mp/menu/assets/menu_foot.png
deleted file mode 100644
index 4a89d4bd254f65f3111f18aa550e32bdfd4d1a24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1348
zcmeAS@N?(olHy`uVBq!ia0y~yU~~YojX0Qq<f8nk%|J@B#5JNMI6tkVJh3R1!7(L2
zDOJHUH!(dmC^a#qvhZZ84FdzSLS{%rNrbPDRdRl=ULr`1UPW#JP&WgEjeSKyVsdtB
zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tbhjO
zrj{fsROII56<bx<DuK<l0<uBE`br95B_-LmN)Sgy_y#CA=NF|anCcnmCL5R;D3}@Q
z85*0Io15z>7#SEE=o=X68ye{vnp+tgSs558K!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EV
zetCJhUb(Seeo?x<p{1oI$P6PRU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal
z@=Hr>m4GgVcp<j{ZfssLG?;(^reBd*pl_&W0P+${p|3A~rMbCq)x{-2sR;LCHMlsW
zvLIDID784hv?v)EacRmRs|u`~i&7Iy@{2<9^K)RK7?6=)l3$#WU!dR|Y^o5RnU|7Z
zUJO?4>ucqiS6q^qmz?V9Vygtyua}vbVr6J*;^buLXku>WW@2dQYU*fd;OJ=PYT@W&
zWNu+<X$;frlAm0fo0?Yw)0=|OYl>4ZC?Vt)0Bv?jEy^rQO>ryA&s6|>*eVmZTa0j;
z2i2Q`+bza8_38s1qYsK!q-cf-0n-kM2~V^@4m{bX<^j`s5in63MQrc{=CEC!E{-7;
zx8B^@?IjZ^bKqg=MuXNxPC^A+BMJ?34TM}5|KJg8%1==Jq0ltde}Sh<Fe{U$u&e44
zvCSG{aUZzi0wSgPxs;SRXC|gg{IFYQvHHXz`MNp9F58y{t$Y#`syE$xX%OF!`buR6
zMrI~979J4hkPt8cVTA;N0-mX}XMd1TRatNL?EHIqnR9h<9NiZuKD@p@PD&#sjor@5
zZst#u`pQbtc^f$Nc}0viGe7_QbK${%$3Yz7g5u!h3LZhD$`+upA<sGXZrr)`*X#1=
zY{hfcbLP$6`%<TLi+HcJ5N}29-}5g{6#Uu#)8f19feBv(cP-raug=iYRCZp*>jhgc
zBwd^Eh40UUSHG-2NqJa45HBsAc->*@l|O%r7uM_O@qhV#tbX=<Z*BQsRrCH%JKx%t
zb+>VTN5OB_OZHB?|2jQmF8j?|o=~3P@tBV%<p;;y-M?k8+UM_lC}L}9m$oB;oo&&(
z1J=8%{r3swX4~5DH^}y|dho71e}CQYe;>pzUd(y_X5agFMj+9?Z;SpbF_kAc9B628
n1Y$<UW*|ljI*-$98JHQ8PETJmQ;k~-RIYit`njxgN@xNAPyp4k

diff --git a/src/views/mp/menu/assets/menu_head.png b/src/views/mp/menu/assets/menu_head.png
deleted file mode 100644
index 248cfb761be5ce1eeeed36067de909ef58c6de79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12673
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
X!lw4y|2_Uwf${mHs$8XvQQ-do;aw2N

diff --git a/src/views/mp/menu/index.vue b/src/views/mp/menu/index.vue
deleted file mode 100644
index 518a988a..00000000
--- a/src/views/mp/menu/index.vue
+++ /dev/null
@@ -1,714 +0,0 @@
-<!--
-MIT License
-
-Copyright (c) 2020 www.joolun.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-  芋道源码：
-  ① less 切到 scss，减少对 less 和 less-loader 的依赖
-  ②
--->
-<template>
-  <div class="app-container">
-    <doc-alert title="公众号菜单" url="https://doc.iocoder.cn/mp/menu/" />
-
-    <!-- 搜索工作栏 -->
-    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公众号" prop="accountId">
-        <el-select v-model="accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <div class="public-account-management clearfix" v-loading="loading">
-      <!--左边配置菜单-->
-      <div class="left">
-        <div class="weixin-hd">
-            <div class="weixin-title">{{ name }}</div>
-        </div>
-        <div class="weixin-menu menu_main clearfix">
-          <div class="menu_bottom" v-for="(item, i) of menuList" :key="i" >
-            <!-- 一级菜单 -->
-            <div @click="menuClick(i, item)" class="menu_item el-icon-s-fold" :class="{'active': isActive === i}">{{item.name}}</div>
-            <!-- 以下为二级菜单-->
-            <div class="submenu" v-if="isSubMenuFlag === i">
-              <div class="subtitle menu_bottom" v-if="item.children" v-for="(subItem, k) in item.children" :key="k">
-                <div class="menu_subItem" :class="{'active': isSubMenuActive === i + '' + k}" @click="subMenuClick(subItem, i, k)">
-                  {{subItem.name}}
-                </div>
-              </div>
-              <!-- 二级菜单加号， 当长度 小于 5 才显示二级菜单的加号  -->
-              <div class="menu_bottom menu_addicon" v-if="!item.children || item.children.length < 5" @click="addSubMenu(i,item)">
-                <i class="el-icon-plus" />
-              </div>
-            </div>
-          </div>
-          <!-- 一级菜单加号 -->
-          <div class="menu_bottom menu_addicon" v-if="this.menuList.length < 3" @click="addMenu"><i class="el-icon-plus"></i></div>
-        </div>
-        <div class="save_div">
-            <el-button class="save_btn" type="success" size="small" @click="handleSave" v-hasPermi="['mp:menu:save']">保存并发布菜单</el-button>
-            <el-button class="save_btn" type="danger" size="small" @click="handleDelete" v-hasPermi="['mp:menu:delete']">清空菜单</el-button>
-        </div>
-      </div>
-      <!--右边配置-->
-      <div v-if="showRightFlag" class="right">
-          <div class="configure_page">
-            <div class="delete_btn">
-                <el-button size="mini"  type="danger" icon="el-icon-delete" @click="deleteMenu(tempObj)">删除当前菜单</el-button>
-            </div>
-            <div>
-                <span>菜单名称：</span>
-                <el-input class="input_width" v-model="tempObj.name" placeholder="请输入菜单名称" :maxlength="nameMaxLength" clearable />
-            </div>
-            <div v-if="showConfigureContent">
-              <div class="menu_content">
-                <span>菜单标识：</span>
-                <el-input class="input_width" v-model="tempObj.menuKey" placeholder="请输入菜单 KEY" clearable />
-              </div>
-              <div class="menu_content">
-                <span>菜单内容：</span>
-                <el-select v-model="tempObj.type" clearable placeholder="请选择" class="menu_option">
-                    <el-option v-for="item in menuOptions" :label="item.label" :value="item.value" :key="item.value" />
-                </el-select>
-              </div>
-              <div class="configur_content" v-if="tempObj.type === 'view'">
-                <span>跳转链接：</span>
-                <el-input class="input_width" v-model="tempObj.url" placeholder="请输入链接" clearable />
-              </div>
-              <div class="configur_content" v-if="tempObj.type === 'miniprogram'">
-                <div class="applet">
-                  <span>小程序的 appid ：</span>
-                  <el-input class="input_width" v-model="tempObj.miniProgramAppId" placeholder="请输入小程序的appid" clearable />
-                </div>
-                <div class="applet">
-                  <span>小程序的页面路径：</span>
-                  <el-input class="input_width" v-model="tempObj.miniProgramPagePath"
-                            placeholder="请输入小程序的页面路径，如：pages/index" clearable />
-                </div>
-                <div class="applet">
-                  <span>小程序的备用网页：</span>
-                  <el-input class="input_width" v-model="tempObj.url" placeholder="不支持小程序的老版本客户端将打开本网页" clearable />
-                </div>
-                <p class="blue">tips:需要和公众号进行关联才可以把小程序绑定带微信菜单上哟！</p>
-              </div>
-              <div class="configur_content" v-if="tempObj.type === 'article_view_limited'">
-                <el-row>
-                  <div class="select-item" v-if="tempObj && tempObj.replyArticles">
-                    <wx-news :articles="tempObj.replyArticles" />
-                    <el-row class="ope-row">
-                        <el-button type="danger" icon="el-icon-delete" circle @click="deleteMaterial" />
-                    </el-row>
-                  </div>
-                  <div v-else>
-                    <el-row>
-                      <el-col :span="24" style="text-align: center">
-                        <el-button type="success" @click="openMaterial">
-                          素材库选择<i class="el-icon-circle-check el-icon--right"></i>
-                        </el-button>
-                      </el-col>
-                    </el-row>
-                  </div>
-                  <el-dialog title="选择图文" :visible.sync="dialogNewsVisible" width="90%">
-                    <wx-material-select :objData="{type: 'news', accountId: this.accountId}" @selectMaterial="selectMaterial" />
-                  </el-dialog>
-                </el-row>
-              </div>
-              <div class="configur_content" v-if="tempObj.type === 'click' || tempObj.type === 'scancode_waitmsg'">
-                <wx-reply-select :objData="tempObj.reply" v-if="hackResetWxReplySelect" />
-              </div>
-          </div>
-        </div>
-      </div>
-      <!-- 一进页面就显示的默认页面，当点击左边按钮的时候，就不显示了-->
-      <div v-else class="right">
-          <p>请选择菜单配置</p>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import WxReplySelect from '@/views/mp/components/wx-reply/main.vue'
-import WxNews from '@/views/mp/components/wx-news/main.vue';
-import WxMaterialSelect from '@/views/mp/components/wx-material-select/main.vue'
-import { deleteMenu, getMenuList, saveMenu } from "@/api/mp/menu";
-import { getSimpleAccounts } from "@/api/mp/account";
-
-export default {
-  name: 'MpMenu',
-  components: {
-      WxReplySelect,
-      WxNews,
-      WxMaterialSelect
-  },
-  data(){
-    return {
-      // ======================== 列表查询 ========================
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 查询参数
-      accountId: undefined,
-      name:'', // 公众号名
-      menuList: {
-        children: [],
-      },
-
-      // ======================== 菜单操作 ========================
-      isActive: -1,// 一级菜单点中样式
-      isSubMenuActive: -1, // 一级菜单点中样式
-      isSubMenuFlag: -1, // 二级菜单显示标志
-
-      // ======================== 菜单编辑 ========================
-      showRightFlag: false, // 右边配置显示默认详情还是配置详情
-      nameMaxLength: 0, // 菜单名称最大长度；1 级是 4 字符；2 级是 7 字符；
-      showConfigureContent: true, // 是否展示配置内容；如果有子菜单，就不显示配置内容
-      hackResetWxReplySelect: false, // 重置 WxReplySelect 组件
-      tempObj: {}, // 右边临时变量，作为中间值牵引关系
-      tempSelfObj: { // 一些临时值放在这里进行判断，如果放在 tempObj，由于引用关系，menu 也会多了多余的参数
-      },
-      dialogNewsVisible: false, // 跳转图文时的素材选择弹窗
-      menuOptions: [{
-        value: 'view',
-        label: '跳转网页'
-      }, {
-        value: 'miniprogram',
-        label: '跳转小程序'
-      }, {
-        value: 'click',
-        label: '点击回复'
-      }, {
-        value: 'article_view_limited',
-        label: '跳转图文消息'
-      }, {
-        value: 'scancode_push',
-        label: '扫码直接返回结果'
-      }, {
-        value: 'scancode_waitmsg',
-        label: '扫码回复'
-      }, {
-        value: 'pic_sysphoto',
-        label: '系统拍照发图'
-      }, {
-          value: 'pic_photo_or_album',
-          label: '拍照或者相册'
-      }, {
-          value: 'pic_weixin',
-          label: '微信相册'
-      }, {
-          value: 'location_select',
-          label: '选择地理位置'
-      }],
-
-      // 公众号账号列表
-      accounts: [],
-    }
-  },
-  created() {
-    getSimpleAccounts().then(response => {
-      this.accounts = response.data;
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.setAccountId(this.accounts[0].id);
-      }
-      // 加载数据
-      this.getList();
-    })
-  },
-  methods: {
-    // ======================== 列表查询 ========================
-    /** 设置账号编号 */
-    setAccountId(accountId) {
-      this.accountId = accountId;
-      this.name = this.accounts.find(item => item.id === accountId)?.name;
-    },
-    getList() {
-      this.loading = false;
-      getMenuList(this.accountId).then(response => {
-        response.data = this.convertMenuList(response.data);
-        this.menuList = this.handleTree(response.data, "id");
-      }).finally(() => {
-        this.loading = false;
-      })
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.resetForm();
-      // 默认选中第一个
-      if (this.accountId) {
-        this.setAccountId(this.accountId)
-      }
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm();
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.setAccountId(this.accounts[0].id)
-      }
-      this.handleQuery()
-    },
-    // 将后端返回的 menuList，转换成前端的 menuList
-    convertMenuList(list) {
-      const menuList = [];
-      list.forEach(item => {
-        const menu = {
-          ...item,
-        };
-        if (item.type === 'click' || item.type === 'scancode_waitmsg') {
-          this.$delete(menu, 'replyMessageType');
-          this.$delete(menu, 'replyContent');
-          this.$delete(menu, 'replyMediaId');
-          this.$delete(menu, 'replyMediaUrl');
-          this.$delete(menu, 'replyDescription');
-          this.$delete(menu, 'replyArticles');
-          menu.reply = {
-            type: item.replyMessageType,
-            accountId: item.accountId,
-            content: item.replyContent,
-            mediaId: item.replyMediaId,
-            url: item.replyMediaUrl,
-            title: item.replyTitle,
-            description: item.replyDescription,
-            thumbMediaId: item.replyThumbMediaId,
-            thumbMediaUrl: item.replyThumbMediaUrl,
-            articles: item.replyArticles,
-            musicUrl: item.replyMusicUrl,
-            hqMusicUrl: item.replyHqMusicUrl,
-          }
-        }
-        menuList.push(menu);
-      });
-      return menuList;
-    },
-    // 重置表单，清空表单数据
-    resetForm() {
-      // 菜单操作
-      this.isActive = -1;
-      this.isSubMenuActive = -1;
-      this.isSubMenuFlag = -1;
-
-      // 菜单编辑
-      this.showRightFlag = false;
-      this.nameMaxLength = 0;
-      this.showConfigureContent = 0;
-      this.hackResetWxReplySelect = true;
-      this.hackResetWxReplySelect = false;
-      this.tempObj = {};
-      this.tempSelfObj = {};
-      this.dialogNewsVisible = false;
-    },
-
-    // ======================== 菜单操作 ========================
-    // 一级菜单点击事件
-    menuClick(i, item) {
-      // 右侧的表单相关
-      this.resetEditor();
-      this.showRightFlag = true; // 右边菜单
-      this.tempObj = item; // 这个如果放在顶部，flag 会没有。因为重新赋值了。
-      this.tempSelfObj.grand = "1"; // 表示一级菜单
-      this.tempSelfObj.index = i; // 表示一级菜单索引
-      this.nameMaxLength = 4
-      this.showConfigureContent = !(item.children && item.children.length > 0); // 有子菜单，就不显示配置内容
-
-      // 左侧的选中
-      this.isActive = i; // 一级菜单选中样式
-      this.isSubMenuFlag = i; // 二级菜单显示标志
-      this.isSubMenuActive = -1; // 二级菜单去除选中样式
-    },
-    // 二级菜单点击事件
-    subMenuClick(subItem, index, k) {
-      // 右侧的表单相关
-      this.resetEditor();
-      this.showRightFlag = true; // 右边菜单
-      this.tempObj = subItem; // 将点击的数据放到临时变量，对象有引用作用
-      this.tempSelfObj.grand = "2"; // 表示二级菜单
-      this.tempSelfObj.index = index; // 表示一级菜单索引
-      this.tempSelfObj.secondIndex = k; // 表示二级菜单索引
-      this.nameMaxLength = 7
-      this.showConfigureContent = true;
-
-      // 左侧的选中
-      this.isActive = -1; // 一级菜单去除样式
-      this.isSubMenuActive = index + "" + k; // 二级菜单选中样式
-    },
-    // 添加横向一级菜单
-    addMenu() {
-      const menuKeyLength = this.menuList.length;
-      const addButton = {
-        name: "菜单名称",
-        children: [],
-        reply: { // 用于存储回复内容
-          'type': 'text',
-          'accountId': this.accountId // 保证组件里，可以使用到对应的公众号
-        }
-      }
-      this.$set(this.menuList, menuKeyLength, addButton)
-      this.menuClick(this.menuKeyLength - 1, addButton)
-    },
-    // 添加横向二级菜单；item 表示要操作的父菜单
-    addSubMenu(i, item) {
-      // 清空父菜单的属性，因为它只需要 name 属性即可
-      if (!item.children || item.children.length <= 0) {
-        this.$set( item, 'children',[])
-        this.$delete( item, 'type')
-        this.$delete( item, 'menuKey')
-        this.$delete( item, 'miniProgramAppId')
-        this.$delete( item, 'miniProgramPagePath')
-        this.$delete( item, 'url')
-        this.$delete( item, 'reply')
-        this.$delete( item, 'articleId')
-        this.$delete( item, 'replyArticles')
-        // 关闭配置面板
-        this.showConfigureContent = false
-      }
-
-      let subMenuKeyLength = item.children.length; // 获取二级菜单key长度
-      let addButton = {
-        name: "子菜单名称",
-        reply: { // 用于存储回复内容
-          'type': 'text',
-          'accountId': this.accountId // 保证组件里，可以使用到对应的公众号
-        }
-      }
-      this.$set(item.children, subMenuKeyLength, addButton);
-      this.subMenuClick(item.children[subMenuKeyLength], i, subMenuKeyLength)
-    },
-    // 删除当前菜单
-    deleteMenu(item) {
-      this.$modal.confirm('确定要删除吗?').then(() => {
-        // 删除数据
-        if (this.tempSelfObj.grand === "1") { // 一级菜单的删除方法
-          this.menuList.splice(this.tempSelfObj.index, 1);
-        } else if (this.tempSelfObj.grand === "2") {  // 二级菜单的删除方法
-          this.menuList[this.tempSelfObj.index].children.splice(this.tempSelfObj.secondIndex, 1);
-        }
-        // 提示
-        this.$modal.msgSuccess("删除成功");
-
-        // 处理菜单的选中
-        this.tempObj = {};
-        this.showRightFlag = false;
-        this.isActive = -1;
-        this.isSubMenuActive = -1;
-      }).catch(() => {});
-    },
-
-    // ======================== 菜单编辑 ========================
-    handleSave() {
-      this.$modal.confirm('确定要保证并发布该菜单吗？').then(() => {
-        this.loading = true
-        return saveMenu(this.accountId, this.convertMenuFormList());
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("发布成功");
-      }).finally(() => {
-        this.loading = false
-      });
-    },
-    // 表单 Editor 重置
-    resetEditor() {
-      this.hackResetWxReplySelect = false // 销毁组件
-      this.$nextTick(() => {
-        this.hackResetWxReplySelect = true // 重建组件
-      })
-    },
-    handleDelete() {
-      this.$modal.confirm('确定要清空所有菜单吗？').then(() => {
-        this.loading = true
-        return deleteMenu(this.accountId);
-      }).then(() => {
-        this.handleQuery();
-        this.$modal.msgSuccess("清空成功");
-      }).catch(() => {}).finally(() => {
-        this.loading = false
-      });
-    },
-    // 将前端的 menuList，转换成后端接收的 menuList
-    convertMenuFormList() {
-      const menuList = [];
-      this.menuList.forEach(item => {
-        let menu = this.convertMenuForm(item);
-        menuList.push(menu);
-        // 处理子菜单
-        if (!item.children || item.children.length <= 0) {
-          return;
-        }
-        menu.children = [];
-        item.children.forEach(subItem => {
-          menu.children.push(this.convertMenuForm(subItem))
-        })
-      })
-      return menuList;
-    },
-    // 将前端的 menu，转换成后端接收的 menu
-    convertMenuForm(menu) {
-      let result = {
-        ...menu,
-        children: undefined, // 不处理子节点
-        reply: undefined, // 稍后复制
-      }
-      if (menu.type === 'click' || menu.type === 'scancode_waitmsg') {
-        result.replyMessageType = menu.reply.type;
-        result.replyContent = menu.reply.content;
-        result.replyMediaId = menu.reply.mediaId;
-        result.replyMediaUrl = menu.reply.url;
-        result.replyTitle = menu.reply.title;
-        result.replyDescription = menu.reply.description;
-        result.replyThumbMediaId = menu.reply.thumbMediaId;
-        result.replyThumbMediaUrl = menu.reply.thumbMediaUrl;
-        result.replyArticles = menu.reply.articles;
-        result.replyMusicUrl = menu.reply.musicUrl;
-        result.replyHqMusicUrl = menu.reply.hqMusicUrl;
-      }
-      return result;
-    },
-    // ======================== 菜单编辑（素材选择） ========================
-    openMaterial() {
-      this.dialogNewsVisible = true
-    },
-    selectMaterial(item) {
-      const articleId = item.articleId;
-      const articles = item.content.newsItem;
-      // 提示，针对多图文
-      if (articles.length > 1) {
-        this.$alert('您选择的是多图文，将默认跳转第一篇', '提示', {
-          confirmButtonText: '确定'
-        })
-      }
-      this.dialogNewsVisible = false
-
-      // 设置菜单的回复
-      this.tempObj.articleId = articleId;
-      this.tempObj.replyArticles = [];
-      articles.forEach(article => {
-        this.tempObj.replyArticles.push({
-          title: article.title,
-          description: article.digest,
-          picUrl: article.picUrl,
-          url: article.url,
-        })
-      })
-    },
-    deleteMaterial() {
-        this.$delete(this.tempObj,'articleId')
-        this.$delete(this.tempObj,'replyArticles')
-    },
-  },
-}
-</script>
-<!--本组件样式-->
-<style lang="scss" scoped="scoped">
-/* 公共颜色变量 */
-.clearfix{*zoom:1;}
-.clearfix::after{content: "";display: table; clear: both;}
-div{
-  text-align: left;
-}
-.weixin-hd{
-  color: #fff;
-  text-align: center;
-  position: relative;
-  bottom: 426px;
-  left:0px;
-  width: 300px;
-  height:64px;
-  background: transparent url("assets/menu_head.png") no-repeat 0 0;
-  background-position: 0 0;
-  background-size: 100%
-}
-.weixin-title{
-  color:#fff;
-  font-size:14px;
-  width:100%;
-  text-align: center;
-  position:absolute;
-  top: 33px;
-  left: 0px;
-}
-.weixin-menu{
-  background: transparent url("assets/menu_foot.png") no-repeat 0 0;
-  padding-left: 43px;
-  font-size: 12px
-}
-.menu_option{
-  width: 40%!important;
-}
-.public-account-management{
-  min-width: 1200px;
-  width: 1200px;
-  margin: 0 auto;
-  .left{
-      float: left;
-      display: inline-block;
-      width: 350px;
-      height: 715px;
-      background: url("assets/iphone_backImg.png") no-repeat;
-      background-size: 100% auto;
-      padding: 518px 25px 88px;
-      position: relative;
-      box-sizing: border-box;
-      /*第一级菜单*/
-      .menu_main{
-          .menu_bottom{
-              position: relative;
-              float: left;
-              display: inline-block;
-              box-sizing: border-box;
-              width: 85.5px;
-              text-align: center;
-              border: 1px solid #ebedee;
-              background-color: #fff;
-              cursor: pointer;
-              &.menu_addicon{
-                  height: 46px;
-                  line-height: 46px;
-              }
-              .menu_item{
-                  height: 44px;
-                  line-height: 44px;
-                  text-align: center;
-                  box-sizing: border-box;
-                  width: 100%;
-                  &.active{
-                      border: 1px solid #2bb673;
-                  }
-              }
-              .menu_subItem{
-                  height: 44px;
-                  line-height: 44px;
-                  text-align: center;
-                  box-sizing: border-box;
-                  &.active{
-                      border: 1px solid #2bb673;
-                  }
-              }
-          }
-          i{
-              color:#2bb673;
-          }
-          /*第二级菜单*/
-          .submenu{
-              position: absolute;
-              width: 85.5px;
-              bottom: 45px;
-              .subtitle{
-                  background-color: #fff;
-                  box-sizing: border-box;
-              }
-          }
-      }
-      .save_div{
-          margin-top: 15px;
-          text-align: center;
-          .save_btn{
-              bottom: 20px;
-              left: 100px;
-          }
-      }
-  }
-  /*右边菜单内容*/
-  .right {
-      float: left;
-      width: 63%;
-      background-color: #e8e7e7;
-      padding: 20px;
-      margin-left: 20px;
-      -webkit-box-sizing: border-box;
-      box-sizing: border-box;
-      .configure_page {
-          .delete_btn {
-              text-align: right;
-              margin-bottom: 15px;
-          }
-          .menu_content {
-              margin-top: 20px;
-          }
-          .configur_content {
-              margin-top: 20px;
-              background-color: #fff;
-              padding: 20px 10px;
-              border-radius: 5px
-          }
-          .blue {
-              color:#29b6f6;
-              margin-top: 10px;
-          }
-          .applet{
-              margin-bottom: 20px;
-              span{
-                  width: 20%;
-              }
-          }
-          .input_width {
-            width: 40%;
-          }
-          .material{
-              .input_width{
-                  width: 30%;
-              }
-              .el-textarea{
-                  width: 80%
-              }
-          }
-      }
-  }
-  .el-input {
-    width: 70%;
-    margin-right: 2%;
-  }
-}
-</style>
-<!--素材样式-->
-<style lang="scss" scoped>
-.pagination {
-    text-align: right;
-    margin-right: 25px;
-}
-.select-item {
-    width: 280px;
-    padding: 10px;
-    margin: 0 auto 10px auto;
-    border: 1px solid #eaeaea;
-}
-.select-item2 {
-    padding: 10px;
-    margin: 0 auto 10px auto;
-    border: 1px solid #eaeaea;
-}
-.ope-row {
-    padding-top: 10px;
-    text-align: center;
-}
-.item-name {
-    font-size: 12px;
-    overflow: hidden;
-    text-overflow:ellipsis;
-    white-space: nowrap;
-    text-align: center;
-}
-</style>
diff --git a/src/views/mp/message/index.vue b/src/views/mp/message/index.vue
deleted file mode 100644
index e517d370..00000000
--- a/src/views/mp/message/index.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <div class="app-container">
-    <doc-alert title="公众号消息" url="https://doc.iocoder.cn/mp/message/" />
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公众号" prop="accountId">
-        <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
-        </el-select>
-      </el-form-item>
-      <!-- TODO 等待处理 -->
-      <el-form-item label="消息类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择消息类型" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.MP_MESSAGE_TYPE)"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="用户标识" prop="openid">
-        <el-input v-model="queryParams.openid" placeholder="请输入用户标识" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="发送时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="消息类型" align="center" prop="type" width="80"/>
-      <el-table-column label="发送方" align="center" prop="sendFrom" width="80">
-        <template v-slot="scope">
-          <el-tag v-if="scope.row.sendFrom === 1" type="success">粉丝</el-tag>
-          <el-tag v-else type="info">公众号</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="用户标识" align="center" prop="openid" width="300" />
-      <el-table-column label="内容" prop="content">
-        <template v-slot="scope">
-          <!-- 【事件】区域 -->
-          <div v-if="scope.row.type === 'event' && scope.row.event === 'subscribe'">
-            <el-tag type="success" size="mini">关注</el-tag>
-          </div>
-          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'unsubscribe'">
-            <el-tag type="danger" size="mini">取消关注</el-tag>
-          </div>
-          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'CLICK'">
-            <el-tag size="mini">点击菜单</el-tag>【{{ scope.row.eventKey }}】
-          </div>
-          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'VIEW'">
-            <el-tag size="mini">点击菜单链接</el-tag>【{{ scope.row.eventKey }}】
-          </div>
-          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'scancode_waitmsg'">
-            <el-tag size="mini">扫码结果</el-tag>【{{ scope.row.eventKey }}】
-          </div>
-          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'scancode_push'">
-            <el-tag size="mini">扫码结果</el-tag>【{{ scope.row.eventKey }}】
-          </div>
-          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'pic_sysphoto'">
-            <el-tag size="mini">系统拍照发图</el-tag>
-          </div>
-          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'pic_photo_or_album'">
-            <el-tag size="mini">拍照或者相册</el-tag>
-          </div>
-          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'pic_weixin'">
-            <el-tag size="mini">微信相册</el-tag>
-          </div>
-          <div v-else-if="scope.row.type === 'event' && scope.row.event === 'location_select'">
-            <el-tag size="mini">选择地理位置</el-tag>
-          </div>
-          <div v-else-if="scope.row.type === 'event'">
-            <el-tag type="danger" size="mini">未知事件类型</el-tag>
-          </div>
-          <!-- 【消息】区域 -->
-          <div v-else-if="scope.row.type === 'text'">{{ scope.row.content }}</div>
-          <div v-else-if="scope.row.type === 'voice'">
-            <wx-voice-player :url="scope.row.mediaUrl" :content="scope.row.recognition" />
-          </div>
-          <div v-else-if="scope.row.type === 'image'">
-            <a target="_blank" :href="scope.row.mediaUrl">
-              <img :src="scope.row.mediaUrl" style="width: 100px">
-            </a>
-          </div>
-          <div v-else-if="scope.row.type === 'video' || scope.row.type === 'shortvideo'">
-            <wx-video-player :url="scope.row.mediaUrl" style="margin-top: 10px" />
-          </div>
-          <div v-else-if="scope.row.type === 'link'">
-            <el-tag size="mini">链接</el-tag>：
-            <a :href="scope.row.url" target="_blank">{{scope.row.title}}</a>
-          </div>
-          <div v-else-if="scope.row.type === 'location'">
-            <wx-location :label="scope.row.label" :location-y="scope.row.locationY" :location-x="scope.row.locationX" />
-          </div>
-          <div v-else-if="scope.row.type === 'music'">
-            <wx-music :title="scope.row.title" :description="scope.row.description" :thumb-media-url="scope.row.thumbMediaUrl"
-                      :music-url="scope.row.musicUrl" :hq-music-url="scope.row.hqMusicUrl" />
-          </div>
-          <div v-else-if="scope.row.type === 'news'">
-            <wx-news :articles="scope.row.articles" />
-          </div>
-          <div v-else>
-            <el-tag type="danger" size="mini">未知消息类型</el-tag>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleSend(scope.row)"
-                     v-hasPermi="['mp:message:send']">消息
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 发送消息的弹窗 -->
-    <el-dialog title="粉丝消息列表" :visible.sync="open" width="50%">
-      <wx-msg :user-id="userId" v-if="open" />
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue';
-import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue';
-import WxMsg from '@/views/mp/components/wx-msg/main.vue';
-import WxLocation from '@/views/mp/components/wx-location/main.vue';
-import WxMusic from '@/views/mp/components/wx-music/main.vue';
-import WxNews from '@/views/mp/components/wx-news/main.vue';
-import { getMessagePage } from "@/api/mp/message";
-import { getSimpleAccounts } from "@/api/mp/account";
-
-export default {
-  name: "MpMessage",
-  components: {
-    WxVideoPlayer,
-    WxVoicePlayer,
-    WxMsg,
-    WxLocation,
-    WxMusic,
-    WxNews
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 粉丝消息列表
-      list: [],
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        openid: null,
-        accountId: null,
-        type: null,
-        createTime: []
-      },
-      // 操作的用户编号
-      userId: 0,
-
-      // 公众号账号列表
-      accounts: []
-    };
-  },
-  created() {
-    getSimpleAccounts().then(response => {
-      this.accounts = response.data;
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.queryParams.accountId = this.accounts[0].id;
-      }
-      // 加载数据
-      this.getList();
-    })
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      // 如果没有选中公众号账号，则进行提示。
-      if (!this.queryParams.accountId) {
-        this.$message.warning('未选中公众号，无法查询消息')
-        return false
-      }
-
-      this.loading = true;
-      // 执行查询
-      getMessagePage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.queryParams.accountId = this.accounts[0].id;
-      }
-      this.handleQuery();
-    },
-    handleSend(row) {
-      this.userId = row.userId;
-      this.open = true;
-    },
-  }
-};
-</script>
diff --git a/src/views/mp/statistics/index.vue b/src/views/mp/statistics/index.vue
deleted file mode 100644
index 93b891c9..00000000
--- a/src/views/mp/statistics/index.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<template>
-  <div class="app-container">
-    <doc-alert title="公众号统计" url="https://doc.iocoder.cn/mp/statistics/" />
-
-    <!-- 搜索工作栏 -->
-    <el-form ref="queryForm" size="small" :inline="true" label-width="68px">
-      <el-form-item label="公众号" prop="accountId">
-        <el-select v-model="accountId" @change="getSummary">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="时间范围" prop="date">
-        <el-date-picker v-model="date" style="width: 260px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-                        :picker-options="datePickerOptions" :default-time="['00:00:00', '23:59:59']"
-                        @change="getSummary">
-        </el-date-picker>
-      </el-form-item>
-    </el-form>
-
-    <!-- 图表 -->
-    <el-row>
-      <el-col :span="12" class="card-box">
-        <el-card>
-          <div slot="header">
-            <span>用户增减数据</span>
-          </div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <div ref="userSummaryChart" style="height: 420px" />
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="12" class="card-box">
-        <el-card>
-          <div slot="header">
-            <span>累计用户数据</span>
-          </div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <div ref="userCumulateChart" style="height: 420px" />
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="12" class="card-box">
-        <el-card>
-          <div slot="header">
-            <span>消息概况数据</span>
-          </div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <div ref="upstreamMessageChart" style="height: 420px" />
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="12" class="card-box">
-        <el-card>
-          <div slot="header">
-            <span>接口分析数据</span>
-          </div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <div ref="interfaceSummaryChart" style="height: 420px" />
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-// 引入基本模板
-import * as echarts from 'echarts'
-// 引入柱状图组件
-require('echarts/lib/chart/bar')
-// 引入柱拆线组件
-require('echarts/lib/chart/line')
-// 引入提示框和title组件
-require('echarts/lib/component/tooltip')
-require('echarts/lib/component/title')
-require('echarts/lib/component/legend')
-
-import { getInterfaceSummary, getUserSummary, getUserCumulate, getUpstreamMessage} from '@/api/mp/statistics'
-import { datePickerOptions } from "@/utils/constants";
-import {addTime, beginOfDay, betweenDay, endOfDay, formatDate} from "@/utils/dateUtils";
-import { getSimpleAccounts } from "@/api/mp/account";
-
-export default {
-  name: 'MpStatistics',
-  data() {
-    return {
-      date : [beginOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)), // -7 天
-        endOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24))], // -1 天
-      accountId: undefined,
-      accounts: [],
-
-      xAxisDate: [], // X 轴的日期范围
-      userSummaryOption: { // 用户增减数据
-        color: ['#67C23A', '#e5323e'],
-        legend: {
-          data: ['新增用户','取消关注的用户']
-        },
-        tooltip: {},
-        xAxis: {
-          data: [] // X 轴的日期范围
-        },
-        yAxis: {
-          minInterval: 1
-        },
-        series: [{
-          name: '新增用户',
-          type: 'bar',
-          label: {
-            normal: {
-              show: true
-            }
-          },
-          barGap: 0,
-          data: [] // 新增用户的数据
-        }, {
-          name: '取消关注的用户',
-          type: 'bar',
-          label: {
-            normal: {
-              show: true
-            }
-          },
-          data: [] // 取消关注的用户的数据
-        }]
-      },
-      userCumulateOption: { // 累计用户数据
-        legend: {
-          data: ['累计用户量']
-        },
-        xAxis: {
-          type: 'category',
-          data: []
-        },
-        yAxis: {
-          minInterval: 1
-        },
-        series: [{
-          name:'累计用户量',
-          data: [], // 累计用户量的数据
-          type: 'line',
-          smooth: true,
-          label: {
-            normal: {
-              show: true
-            }
-          }
-        }]
-      },
-      upstreamMessageOption: { // 消息发送概况数据
-        color: ['#67C23A', '#e5323e'],
-        legend: {
-          data: ['用户发送人数', '用户发送条数']
-        },
-        tooltip: {},
-        xAxis: {
-          data: [] // X 轴的日期范围
-        },
-        yAxis: {
-          minInterval: 1
-        },
-        series: [{
-          name: '用户发送人数',
-          type: 'line',
-          smooth: true,
-          label: {
-            normal: {
-              show: true
-            }
-          },
-          data: [] // 用户发送人数的数据
-        }, {
-          name: '用户发送条数',
-          type: 'line',
-          smooth: true,
-          label: {
-            normal: {
-              show: true
-            }
-          },
-          data: [] // 用户发送条数的数据
-        }]
-      },
-      interfaceSummaryOption: {  // 接口分析况数据
-        color: ['#67C23A', '#e5323e', '#E6A23C', '#409EFF'],
-        legend: {
-          data: ['被动回复用户消息的次数','失败次数', '最大耗时','总耗时']
-        },
-        tooltip: {},
-        xAxis: {
-          data: [] // X 轴的日期范围
-        },
-        yAxis: {},
-        series: [{
-          name: '被动回复用户消息的次数',
-          type: 'bar',
-          label: {
-            normal: {
-              show: true
-            }
-          },
-          barGap: 0,
-          data: [] // 被动回复用户消息的次数的数据
-        }, {
-          name: '失败次数',
-          type: 'bar',
-          label: {
-            normal: {
-              show: true
-            }
-          },
-          data: [] // 失败次数的数据
-        }, {
-          name: '最大耗时',
-          type: 'bar',
-          label: {
-            normal: {
-              show: true
-            }
-          },
-          data: [] // 最大耗时的数据
-        }, {
-          name: '总耗时',
-          type: 'bar',
-          label: {
-            normal: {
-              show: true
-            }
-          },
-          data: [] // 总耗时的数据
-        }]
-      },
-
-      // 静态变量
-      datePickerOptions: datePickerOptions,
-    }
-  },
-  created() {
-    getSimpleAccounts().then(response => {
-      this.accounts = response.data;
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.accountId = this.accounts[0].id;
-      }
-      // 加载数据
-      this.getSummary();
-    })
-  },
-  methods: {
-    getSummary() {
-      // 如果没有选中公众号账号，则进行提示。
-      if (!this.accountId) {
-        this.$message.warning('未选中公众号，无法统计数据')
-        return false
-      }
-      // 必须选择 7 天内，因为公众号有时间跨度限制为 7
-      if (betweenDay(this.date[0], this.date[1]) >= 7) {
-        this.$message.warning('时间间隔 7 天以内，请重新选择')
-        return false
-      }
-      this.xAxisDate = []
-      const days = betweenDay(this.date[0], this.date[1]) // 相差天数
-      for(let i = 0; i <= days; i++){
-        this.xAxisDate.push(formatDate(addTime(this.date[0], 3600 * 1000 * 24 * i), 'yyyy-MM-dd'));
-      }
-
-      // 初始化图表
-      this.initUserSummaryChart();
-      this.initUserCumulateChart();
-      this.initUpstreamMessageChart();
-      this.interfaceSummaryChart();
-    },
-    initUserSummaryChart() {
-      this.userSummaryOption.xAxis.data = [];
-      this.userSummaryOption.series[0].data = [];
-      this.userSummaryOption.series[1].data = [];
-      getUserSummary({
-        accountId: this.accountId,
-        date: [formatDate(this.date[0], 'yyyy-MM-dd HH:mm:ss'), formatDate(this.date[1], 'yyyy-MM-dd HH:mm:ss'),]
-      }).then(response => {
-        this.userSummaryOption.xAxis.data = this.xAxisDate;
-        // 处理数据
-        this.xAxisDate.forEach((date, index) => {
-          response.data.forEach((item) => {
-            // 匹配日期
-            const refDate = formatDate(new Date(item.refDate), 'yyyy-MM-dd');
-            if (refDate.indexOf(date) === -1) {
-              return;
-            }
-            // 设置数据到对应的位置
-            this.userSummaryOption.series[0].data[index] = item.newUser;
-            this.userSummaryOption.series[1].data[index] = item.cancelUser;
-          })
-        })
-        // 绘制图表
-        const userSummaryChart = echarts.init(this.$refs.userSummaryChart);
-        userSummaryChart.setOption(this.userSummaryOption)
-      }).catch(() => {})
-    },
-    initUserCumulateChart() {
-      this.userCumulateOption.xAxis.data = [];
-      this.userCumulateOption.series[0].data = [];
-      // 发起请求
-      getUserCumulate({
-        accountId: this.accountId,
-        date: [formatDate(this.date[0], 'yyyy-MM-dd HH:mm:ss'), formatDate(this.date[1], 'yyyy-MM-dd HH:mm:ss'),]
-      }).then(response => {
-        this.userCumulateOption.xAxis.data = this.xAxisDate;
-        // 处理数据
-        response.data.forEach((item, index) => {
-          this.userCumulateOption.series[0].data[index] = item.cumulateUser;
-        })
-        // 绘制图表
-        const userCumulateChart = echarts.init(this.$refs.userCumulateChart);
-        userCumulateChart.setOption(this.userCumulateOption)
-      }).catch(() => {})
-    },
-    initUpstreamMessageChart() {
-      this.upstreamMessageOption.xAxis.data = [];
-      this.upstreamMessageOption.series[0].data = [];
-      this.upstreamMessageOption.series[1].data = [];
-      // 发起请求
-      getUpstreamMessage({
-        accountId: this.accountId,
-        date: [formatDate(this.date[0], 'yyyy-MM-dd HH:mm:ss'), formatDate(this.date[1], 'yyyy-MM-dd HH:mm:ss'),]
-      }).then(response => {
-        this.upstreamMessageOption.xAxis.data = this.xAxisDate;
-        // 处理数据
-        response.data.forEach((item, index) => {
-          this.upstreamMessageOption.series[0].data[index] = item.messageUser;
-          this.upstreamMessageOption.series[1].data[index] = item.messageCount;
-        })
-        // 绘制图表
-        const upstreamMessageChart = echarts.init(this.$refs.upstreamMessageChart);
-        upstreamMessageChart.setOption(this.upstreamMessageOption);
-      }).catch(() => {})
-    },
-    interfaceSummaryChart() {
-      this.interfaceSummaryOption.xAxis.data = [];
-      this.interfaceSummaryOption.series[0].data = [];
-      this.interfaceSummaryOption.series[1].data = [];
-      this.interfaceSummaryOption.series[2].data = [];
-      this.interfaceSummaryOption.series[3].data = [];
-      // 发起请求
-      getInterfaceSummary({
-        accountId: this.accountId,
-        date: [formatDate(this.date[0], 'yyyy-MM-dd HH:mm:ss'), formatDate(this.date[1], 'yyyy-MM-dd HH:mm:ss'),]
-      }).then(response => {
-        this.interfaceSummaryOption.xAxis.data = this.xAxisDate;
-        // 处理数据
-        response.data.forEach((item, index) => {
-          this.interfaceSummaryOption.series[0].data[index] = item.callbackCount;
-          this.interfaceSummaryOption.series[1].data[index] = item.failCount;
-          this.interfaceSummaryOption.series[2].data[index] = item.maxTimeCost;
-          this.interfaceSummaryOption.series[3].data[index] = item.totalTimeCost;
-        })
-        // 绘制图表
-        const interfaceSummaryChart = echarts.init(this.$refs.interfaceSummaryChart);
-        interfaceSummaryChart.setOption(this.interfaceSummaryOption);
-      }).catch(() => {})
-    }
-  }
-}
-</script>
diff --git a/src/views/mp/tag/index.vue b/src/views/mp/tag/index.vue
deleted file mode 100644
index 88ece69a..00000000
--- a/src/views/mp/tag/index.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<template>
-  <div class="app-container">
-    <doc-alert title="公众号标签" url="https://doc.iocoder.cn/mp/tag/" />
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公众号" prop="accountId">
-        <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="标签名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入标签名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['mp:tag:create']">新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="info" plain icon="el-icon-refresh" size="mini" @click="handleSync"
-                   v-hasPermi="['mp:tag:sync']">同步
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="编号" align="center" prop="id"/>
-      <el-table-column label="标签名称" align="center" prop="name"/>
-      <el-table-column label="粉丝数" align="center" prop="count"/>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['mp:tag:update']">修改
-          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['mp:tag:delete']">删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="标签名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入标签名称"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  createTag,
-  updateTag,
-  deleteTag,
-  getTag,
-  getTagPage,
-  syncTag,
-} from '@/api/mp/tag'
-import { getSimpleAccounts} from '@/api/mp/account'
-
-export default {
-  name: 'MpTag',
-  components: {},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 公众号标签列表
-      list: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        accountId: null,
-        name: null,
-      },
-      // 表单参数
-      form: {
-        accountId: undefined,
-        name: undefined,
-      },
-      // 表单校验
-      rules: {
-        name: [{ required: true, message: '请输入标签名称', trigger: 'blur' }]
-      },
-
-      // 公众号账号列表
-      accounts: []
-    }
-  },
-  created() {
-    getSimpleAccounts().then(response => {
-      this.accounts = response.data;
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.queryParams.accountId = this.accounts[0].id;
-      }
-      // 加载数据
-      this.getList();
-    })
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      // 如果没有选中公众号账号，则进行提示。
-      if (!this.queryParams.accountId) {
-        this.$message.warning('未选中公众号，无法查询标签')
-        return false
-      }
-
-      this.loading = false
-      // 处理查询参数
-      let params = {...this.queryParams}
-      // 执行查询
-      getTagPage(params).then(response => {
-        this.list = response.data.list
-        this.total = response.data.total
-        this.loading = false
-      })
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        accountId: undefined,
-        name: undefined,
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.queryParams.accountId = this.accounts[0].id;
-      }
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加公众号标签'
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      const id = row.id
-      getTag(id).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改公众号标签'
-      })
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs['form'].validate(valid => {
-        if (!valid) {
-          return
-        }
-        this.form.accountId = this.queryParams.accountId;
-        // 修改的提交
-        if (this.form.id != null) {
-          updateTag(this.form).then(response => {
-            this.$modal.msgSuccess('修改成功')
-            this.open = false
-            this.getList()
-          })
-          return
-        }
-        // 添加的提交
-        createTag(this.form).then(response => {
-          this.$modal.msgSuccess('新增成功')
-          this.open = false
-          this.getList()
-        })
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.id
-      this.$modal.confirm('是否确认删除公众号标签编号为"' + id + '"的数据项?').then(function () {
-        return deleteTag(id)
-      }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess('删除成功')
-      }).catch(() => {
-      })
-    },
-    /** 同步标签 */
-    handleSync() {
-      const accountId = this.queryParams.accountId
-      this.$modal.confirm('是否确认同步标签？').then(function () {
-        return syncTag(accountId)
-      }).then(() => {
-        this.$modal.msgSuccess('同步标签成功')
-      }).catch(() => {
-      })
-    },
-  }
-}
-</script>
diff --git a/src/views/mp/user/index.vue b/src/views/mp/user/index.vue
deleted file mode 100644
index 675ef98b..00000000
--- a/src/views/mp/user/index.vue
+++ /dev/null
@@ -1,236 +0,0 @@
-<template>
-  <div class="app-container">
-    <doc-alert title="公众号粉丝" url="https://doc.iocoder.cn/mp/user/" />
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公众号" prop="accountId">
-        <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="用户标识" prop="openid">
-        <el-input v-model="queryParams.openid" placeholder="请输入用户标识" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="昵称" prop="nickname">
-        <el-input v-model="queryParams.nickname" placeholder="请输入昵称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="info" plain icon="el-icon-refresh" size="mini" @click="handleSync"
-                   v-hasPermi="['mp:user:sync']">同步
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="用户标识" align="center" prop="openid" width="260" />
-      <el-table-column label="昵称" align="center" prop="nickname" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="标签" align="center" prop="tagIds" width="200">
-        <template v-slot="scope">
-          <span v-for="(tagId, index) in scope.row.tagIds" :key="index">
-            <el-tag>{{ tags.find(tag => tag.tagId === tagId)?.name }} </el-tag>&nbsp;
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column label="订阅状态" align="center" prop="subscribeStatus">
-        <template v-slot="scope">
-          <el-tag v-if="scope.row.subscribeStatus === 0" type="success">已订阅</el-tag>
-          <el-tag v-else type="danger">未订阅</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="订阅时间" align="center" prop="subscribeTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.subscribeTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['mp:user:update']">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="昵称" prop="nickname">
-          <el-input v-model="form.nickname" placeholder="请输入昵称" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="标签" prop="tagIds">
-          <el-select v-model="form.tagIds" multiple clearable placeholder="请选择标签">
-            <el-option v-for="item in tags" :key="parseInt(item.tagId)" :label="item.name" :value="parseInt(item.tagId)" />
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { updateUser, getUser, getUserPage, syncUser } from "@/api/mp/mpuser";
-import { getSimpleAccounts } from "@/api/mp/account";
-import { getSimpleTags } from "@/api/mp/tag";
-
-export default {
-  name: "MpUser",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 微信公众号粉丝列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        accountId: null,
-        openid: null,
-        nickname: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {},
-
-      // 公众号账号列表
-      accounts: [],
-      // 公众号标签列表
-      tags: [],
-    };
-  },
-  created() {
-    getSimpleAccounts().then(response => {
-      this.accounts = response.data;
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.queryParams.accountId = this.accounts[0].id;
-      }
-      // 加载数据
-      this.getList();
-    })
-
-    // 加载标签
-    getSimpleTags().then(response => {
-      this.tags = response.data;
-    })
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      // 如果没有选中公众号账号，则进行提示。
-      if (!this.queryParams.accountId) {
-        this.$message.warning('未选中公众号，无法查询用户')
-        return false
-      }
-
-      this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      // 执行查询
-      getUserPage(params).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        nickname: undefined,
-        remark: undefined,
-        tagIds: [],
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      // 默认选中第一个
-      if (this.accounts.length > 0) {
-        this.queryParams.accountId = this.accounts[0].id;
-      }
-      this.handleQuery();
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getUser(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改公众号粉丝";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.id != null) {
-          updateUser(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-        }
-      });
-    },
-    /** 同步标签 */
-    handleSync() {
-      const accountId = this.queryParams.accountId
-      this.$modal.confirm('是否确认同步粉丝？').then(function () {
-        return syncUser(accountId)
-      }).then(() => {
-        this.$modal.msgSuccess('开始从微信公众号同步粉丝信息，同步需要一段时间，建议稍后再查询')
-      }).catch(() => {
-      })
-    },
-  }
-};
-</script>
diff --git a/src/views/quality/base/qualityInspectionBoxBtn/dialogForm.vue b/src/views/quality/base/qualityInspectionBoxBtn/dialogForm.vue
deleted file mode 100644
index 92a1c646..00000000
--- a/src/views/quality/base/qualityInspectionBoxBtn/dialogForm.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<!-- 
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-09-11 15:55:13
-    description: DialogForm for equipmentBindSection only
--->
-
-<template>
-	<el-form
-		ref="form"
-		:model="dataForm"
-		label-width="120px"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="产线"
-					prop="productionId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.productionId"
-						placeholder="请选择产线"
-						filterable
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="工段"
-					prop="sectionId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.sectionId"
-						placeholder="请选择工段"
-						filterable
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in workshopSectionList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="按钮盒识别码"
-					prop="buttonId"
-					:rules="[
-						{ required: true, message: '不能为空', trigger: 'blur' },
-						{
-							type: 'number',
-							message: '请输入整数',
-							trigger: 'blur',
-							transform: (val) => Number.isInteger(Number(val)) && Number(val),
-						},
-					]">
-					<el-input
-						v-model="dataForm.buttonId"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入整数" />
-				</el-form-item>
-				<!-- 				
-				<el-form-item
-					label="报警编码"
-					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.code"
-						placeholder="请选择产线"
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item> -->
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item label="按钮盒模式" prop="model">
-					<el-input
-						v-model="dataForm.model"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入按钮盒模式" />
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="按钮值"
-					prop="keyValue"
-					:rules="[
-						{ required: true, message: '不能为空', trigger: 'blur' },
-						{
-							type: 'number',
-							message: '请输入100以内的整数',
-							trigger: 'blur',
-							transform: (val) =>
-								Number.isInteger(+val) &&
-								Number(val) >= 0 &&
-								Number(val) <= 100 &&
-								Number(val),
-						},
-					]">
-					<el-input
-						v-model="dataForm.keyValue"
-						type="number"
-						min="0"
-						max="100"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入按钮盒模式" />
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item label="检测内容" prop="inspectionDetContent">
-					<el-input
-						type="textarea"
-						v-model="dataForm.inspectionDetContent"
-						placeholder="请输入检测内容"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-export default {
-	name: 'DialogForm',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: {},
-	props: {
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			formLoading: true,
-			productionLineList: [],
-			workshopSectionList: [],
-		};
-	},
-	mounted() {
-		this.getProductionLineList();
-		// this.getWorksectionList();
-		// this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
-		// 	this.formLoading = false;
-		// 	this.$emit('update', {
-		// 		...this.dataForm,
-		// 		code,
-		// 	});
-		// });
-	},
-	watch: {
-		'dataForm.productionId': {
-			handler(id) {
-				if (id != null) this.getWorksectionList(id);
-			},
-			immediate: true,
-		},
-	},
-	methods: {
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.form.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.form.resetFields(args);
-		},
-		async getProductionLineList() {
-			this.formLoading = true;
-			const res = await this.$axios({
-				url: '/base/production-line/listAll',
-				method: 'get',
-			});
-			if (res.code == 0) {
-				this.productionLineList = res.data.map((item) => ({
-					label: item.name,
-					value: item.id,
-				}));
-			}
-			this.formLoading = false;
-		},
-
-		async getWorksectionList(id) {
-			this.formLoading = true;
-			const res = await this.$axios({
-				url: '/base/workshop-section/listByParentId',
-				method: 'get',
-				params: {
-					id,
-				},
-			});
-			if (res.code == 0) {
-				this.workshopSectionList = res.data.map((item) => ({
-					label: item.name,
-					value: item.id,
-				}));
-			}
-			this.formLoading = false;
-		},
-
-		async handleProductlineChange(id) {
-			await this.getWorksectionList(id);
-			this.dataForm.sectionId = null;
-			this.$emit('update', this.dataForm);
-		},
-
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-</style>
diff --git a/src/views/quality/base/qualityInspectionBoxBtn/index.vue b/src/views/quality/base/qualityInspectionBoxBtn/index.vue
deleted file mode 100644
index 4fbe6656..00000000
--- a/src/views/quality/base/qualityInspectionBoxBtn/index.vue
+++ /dev/null
@@ -1,329 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				fixed="right"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="50%"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	createQualityInspectionBoxBtn,
-	updateQualityInspectionBoxBtn,
-	deleteQualityInspectionBoxBtn,
-	getQualityInspectionBoxBtn,
-	getQualityInspectionBoxBtnPage,
-	exportQualityInspectionBoxBtnExcel,
-} from '@/api/base/qualityInspectionBoxBtn';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import moment from 'moment';
-import DialogForm from './dialogForm.vue';
-
-export default {
-	name: 'QualityInspectionBoxBtn',
-	mixins: [basicPageMixin],
-	components: { DialogForm },
-	data() {
-		return {
-			rows: [
-				[
-					{
-						select: true,
-						label: '产线',
-						url: '/base/production-line/listAll',
-						prop: 'productionId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							filterable: true,
-						},
-					},
-					{
-						select: true,
-						label: '工段',
-						url: '/base/workshop-section/listAll',
-						prop: 'sectionId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							filterable: true,
-						},
-					},
-				],
-				[
-					{
-						input: true,
-						label: '按钮盒识别码',
-						prop: 'buttonId',
-						rules: [
-							{
-								type: 'number',
-								message: '请输入整数',
-								trigger: 'blur',
-								transform: (val) =>
-									Number.isInteger(Number(val)) && Number(val),
-							},
-						],
-					},
-					{ input: true, label: '按钮盒模式', prop: 'model' },
-				],
-				[
-					{
-						input: true,
-						label: '按钮值',
-						prop: 'keyValue',
-						rules: [
-							{
-								type: 'number',
-								message: '请输入100以内的整数',
-								trigger: 'blur',
-								transform: (val) =>
-									Number(val) <= 100 && Number.isInteger(+val) && Number(val),
-							},
-						],
-						bind: { type: 'number', min: 0, max: 100 },
-					},
-					{
-						textarea: true,
-						label: '检测内容',
-						prop: 'inspectionDetContent',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-			],
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '检查内容',
-					placeholder: '请输入检查内容',
-					param: 'inspectionDetContent',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:quality-inspection-box-btn:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-			],
-			tableBtn: [
-				this.$auth.hasPermi('base:quality-inspection-box-btn:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:quality-inspection-box-btn:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{
-					prop: 'productionName',
-					label: '产线',
-				},
-				{
-					prop: 'sectionName',
-					label: '工段',
-				},
-				{
-					prop: 'inspectionDetContent',
-					label: '检测内容',
-				},
-				{
-					width: 160,
-					prop: 'buttonId',
-					label: '按钮盒识别码',
-				},
-				// {
-				// 	width: 256,
-				// 	prop: 'productionId',
-				// 	label: '按钮盒所在产线ID',
-				// 	,
-				// },
-				// {
-				// 	width: 256,
-				// 	prop: 'sectionId',
-				// 	label: '按钮盒所在工段ID',
-				// 	,
-				// },
-				{ width: 90, prop: 'keyValue', label: '按钮值' },
-				{ width: 128, prop: 'model', label: '按钮盒模式' },
-			],
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				inspectionDetContent: null,
-			},
-			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
-			searchBarKeys: ['inspectionDetContent'],
-			form: {
-				id: null,
-				buttonId: null,
-				inspectionDetContent: null,
-				productionId: null,
-				sectionId: null,
-				model: null,
-				keyValue: null,
-			},
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getQualityInspectionBoxBtnPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: null,
-				buttonId: null,
-				inspectionDetContent: null,
-				productionId: null,
-				sectionId: null,
-				model: null,
-				keyValue: null,
-			};
-			this.resetForm('form');
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加安灯按钮16键对应';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getQualityInspectionBoxBtn(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改安灯按钮16键对应';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateQualityInspectionBoxBtn(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createQualityInspectionBoxBtn(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除"' + row.sectionName + '"?')
-				.then(function () {
-					return deleteQualityInspectionBoxBtn(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有安灯按钮16键对应数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportQualityInspectionBoxBtnExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '安灯按钮16键对应.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue
deleted file mode 100644
index d2a40135..00000000
--- a/src/views/quality/base/qualityInspectionDet/index.vue
+++ /dev/null
@@ -1,315 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				fixed="right"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="40%"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:rows="[
-					[
-						{
-							select: true,
-							label: '检测类型',
-							prop: 'typeId',
-							url: '/base/quality-inspection-type/listAll',
-							rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-							bind: {
-								filterable: true,
-							},
-						},
-					],
-					[
-						{
-							input: true,
-							label: '检测内容',
-							prop: 'content',
-							rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						},
-					],
-					[
-						{
-							input: true,
-							label: '内容编码',
-							prop: 'code',
-							url: '/base/quality-inspection-det/getCode',
-						},
-					],
-					[{ input: true, label: '备注', prop: 'remark' }],
-				]" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	createQualityInspectionDet,
-	updateQualityInspectionDet,
-	deleteQualityInspectionDet,
-	getQualityInspectionDet,
-	getQualityInspectionDetPage,
-	exportQualityInspectionDetExcel,
-} from '@/api/base/qualityInspectionDet';
-
-import moment from 'moment';
-
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-
-export default {
-	name: 'QualityInspectionDet',
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			typeList: [], // 检测类型列表
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '检测内容',
-					placeholder: '请输入检测内容',
-					param: 'content',
-				},
-				// {
-				// 	type: 'datePicker',
-				// 	label: '创建时间',
-				// 	dateType: 'daterange', // datetimerange
-				// 	// format: 'yyyy-MM-dd HH:mm:ss',
-				// 	format: 'yyyy-MM-dd',
-				// 	valueFormat: 'yyyy-MM-dd HH:mm:ss',
-				// 	rangeSeparator: '-',
-				// 	startPlaceholder: '开始日期',
-				// 	endPlaceholder: '结束日期',
-				// 	defaultTime: ['00:00:00', '23:59:59'],
-				// 	param: 'createTime',
-				// 	width: 350,
-				// },
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:quality-inspection-det:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:quality-inspection-type:export')
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			tableBtn: [
-				this.$auth.hasPermi('base:quality-inspection-det:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:quality-inspection-det:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ prop: 'typeName', label: '类型名称',  },
-				{ prop: 'content', label: '检测内容',  },
-				{ prop: 'code', label: '检测编码',  },
-				{ prop: 'remark', label: '备注',  },
-			],
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				content: null,
-				createTime: [],
-			},
-			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
-			searchBarKeys: ['content', 'createTime'],
-			form: {
-				id: undefined,
-				typeId: undefined,
-				content: undefined,
-				code: undefined,
-				remark: undefined,
-			},
-		};
-	},
-	created() {
-		this.getList();
-		this.getTypeList();
-	},
-	methods: {
-		/** 获取检测类型id */
-		getTypeList() {
-			this.$axios('/base/quality-inspection-type/listAll').then((response) => {
-				this.typeList = response.data.map((item) => {
-					return {
-						label: item.name,
-						value: item.id,
-					};
-				});
-			});
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getQualityInspectionDetPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				typeId: undefined,
-				content: undefined,
-				code: undefined,
-				remark: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加质量检测信息';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getQualityInspectionDet(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改质量检测信息';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateQualityInspectionDet(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createQualityInspectionDet(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除检测信息"' + row.content + '"?')
-				.then(function () {
-					return deleteQualityInspectionDet(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有质量检测信息基础数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportQualityInspectionDetExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '质量检测信息基础.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
-
-<style>
-.el-select {
-	width: 100% !important;
-}
-</style>
diff --git a/src/views/quality/base/qualityInspectionType/index.vue b/src/views/quality/base/qualityInspectionType/index.vue
deleted file mode 100644
index b3857826..00000000
--- a/src/views/quality/base/qualityInspectionType/index.vue
+++ /dev/null
@@ -1,355 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:rows="[
-					[
-						{
-							input: true,
-							label: '检测类型名称',
-							prop: 'name',
-							rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-							// bind: {
-							// 	disabled: true, // some condition, like detail mode...
-							// }
-						},
-					],
-					[
-						{
-							input: true,
-							label: '检测类型编码',
-							prop: 'code',
-							url: '/base/quality-inspection-type/getCode',
-						},
-					],
-					[{ input: true, label: '备注', prop: 'remark' }],
-				]" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import moment from 'moment';
-
-import {
-	createQualityInspectionType,
-	updateQualityInspectionType,
-	deleteQualityInspectionType,
-	getQualityInspectionType,
-	getQualityInspectionTypePage,
-	exportQualityInspectionTypeExcel,
-} from '@/api/base/qualityInspectionType';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-
-export default {
-	name: 'QualityInspectionType',
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			tableBtn: [
-				this.$auth.hasPermi('base:quality-inspection-type:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:quality-inspection-type:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ prop: 'name', label: '检测类型名称' },
-				{ prop: 'code', label: '检测类型编码' },
-				{ prop: 'remark', label: '备注' },
-				// {
-				// 	label: '操作',
-				// 	alignt: 'center',
-				// 	subcomponent: {
-				// 		render: function (h) {
-				// 			return h('div', null, [
-				// 				h(
-				// 					'el-button',
-				// 					{
-				// 						props: {
-				// 							icon: 'el-icon-edit',
-				// 							size: 'mini',
-				// 							type: 'text',
-				// 						},
-				// 					},
-				// 					' 修改'
-				// 				),
-				// 				h(
-				// 					'el-button',
-				// 					{
-				// 						props: {
-				// 							icon: 'el-icon-edit',
-				// 							size: 'mini',
-				// 							type: 'text',
-				// 						},
-				// 					},
-				// 					' 修改'
-				// 				),
-				// 			]);
-				// 		},
-				// 	},
-				// },
-			],
-			//
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '检测类型',
-					placeholder: '请输入检测类型',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:quality-inspection-type:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:quality-inspection-type:export')
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			// 表单配置
-			// formRows: [
-			// 	[
-			// 		{
-			// 			input: true,
-			// 			label: '检测类型名称',
-			// 			prop: 'name',
-			// 			rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-			// 			// bind: {
-			// 			// 	disabled: true, // some condition, like detail mode...
-			// 			// }
-			// 		},
-			// 	],
-			// 	[{ input: true, label: '检测类型编码', prop: 'code' }],
-			// 	[{ input: true, label: '备注', prop: 'remark' }],
-			// ],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				name: null,
-			},
-			// 表单参数
-			form: {},
-		};
-	},
-	// watch: {
-	// 	form: {
-	// 		handler: (val) => {
-	// 			console.log('form changed', val);
-	// 		},
-	// 		deep: true
-	// 	},
-	// },
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** base table related */
-		handleTableBtnClick({ data, type }) {
-			switch (type) {
-				case 'edit':
-					this.handleUpdate(data);
-					break;
-				case 'delete':
-					this.handleDelete(data);
-					break;
-			}
-		},
-		/** search bar related */
-		handleSearchBarBtnClick(btn) {
-			const keys = ['name'];
-			switch (btn.btnName) {
-				case 'search':
-					keys.forEach((key) => {
-						this.queryParams[key] = btn[key] || null;
-					});
-					this.handleQuery();
-					break;
-				case 'add':
-					this.handleAdd();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				case 'reset':
-					this.$refs['search-bar'].resetForm();
-					this.resetQuery();
-					break;
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getQualityInspectionTypePage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				name: undefined,
-				code: undefined,
-				remark: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加质量检测类型基础';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getQualityInspectionType(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改质量检测类型基础';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			// console.log('this.$refs.form', this.$refs.form);
-			// return;
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				console.log('final form', JSON.stringify(this.form));
-				// 修改的提交
-				if (this.form.id != null) {
-					updateQualityInspectionType(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createQualityInspectionType(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除该质量检测类型?')
-				.then(function () {
-					return deleteQualityInspectionType(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有质量检测类型基础数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportQualityInspectionTypeExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '质量检测类型基础.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
deleted file mode 100644
index 1d660f8a..00000000
--- a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-09-11 15:55:13
-    description: DialogForm for qualityInspectionRecord only
--->
-
-<template>
-	<el-form
-		ref="form"
-		:model="innerDataForm"
-		label-width="100px"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="检测内容"
-					prop="inspectionDetId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.inspectionDetId"
-						placeholder="请选择检测内容"
-						filterable
-						clearable
-						@change="handleInspectionDetChange">
-						<el-option
-							v-for="opt in inspectionDetList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="来源"
-					prop="source"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.source"
-						placeholder="请选择来源"
-						filterable
-						clearable
-						@change="$emit('update', innerDataForm)">
-						<el-option
-							v-for="opt in [
-								{ label: '手动', value: 1 },
-								{ label: '自动', value: 2 },
-							]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="产线"
-					prop="productionLineId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.productionLineId"
-						placeholder="请选择产线"
-						filterable
-						clearable
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="工段"
-					prop="sectionId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.sectionId"
-						placeholder="请选择工段"
-						clearable
-						filterable
-						@change="$emit('update', innerDataForm)">
-						<el-option
-							v-for="opt in sectionList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="检测人员" prop="checkPerson">
-					<el-input
-						v-model="innerDataForm.checkPerson"
-						clearable
-						@change="$emit('update', innerDataForm)"
-						placeholder="请输入检测人员" />
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="检测时间"
-					prop="checkTime"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-date-picker
-						v-model="innerDataForm.checkTime"
-						type="datetime"
-						placeholder="请选择检测时间"
-						value-format="timestamp"
-						@change="$emit('update', innerDataForm)"></el-date-picker>
-				</el-form-item>
-			</el-col>
-		</el-row>
-
-		<el-row :gutter="20">
-			<el-col>
-				<el-form-item label="描述" prop="explainText">
-					<el-input
-						v-model="innerDataForm.explainText"
-						placeholder="请输入描述信息"
-						@change="$emit('update', innerDataForm)"
-						type="textarea"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col>
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="innerDataForm.remark"
-						@change="$emit('update', innerDataForm)"
-						placeholder="请输入备注"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-export default {
-	name: 'DialogForm',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: {},
-	props: {
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			formLoading: true,
-			inspectionDetList: [],
-			productionLineList: [],
-			sectionList: [],
-			innerDataForm: {},
-			cacheInspectionDetList: null,
-		};
-	},
-	mounted() {
-		Promise.all([this.getProductLineList(), this.getInspectionDetList()]).then(
-			() => {
-				this.formLoading = false;
-			}
-		);
-	},
-	watch: {
-		// 'innerDataForm.productionLineId': {
-		// 	handler: async function (plId) {
-		// 		if (plId) await this.getWorksectionList(plId);
-		// 	},
-		// 	immediate: true,
-		// },
-		dataForm: {
-			handler: function (dataForm) {
-				this.innerDataForm = Object.assign({}, dataForm);
-
-				if (dataForm.productionLineId)
-					this.getWorksectionList(dataForm.productionLineId);
-			},
-			immediate: true,
-		},
-	},
-	methods: {
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.form.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.form.resetFields(args);
-		},
-
-		handleInspectionDetChange(value) {
-			const { id, content } = this.cacheInspectionDetList.find(
-				(item) => item.id == value
-			);
-			this.innerDataForm.inspectionDetId = id;
-			this.innerDataForm.inspectionDetContent = content;
-			this.$emit('update', this.innerDataForm);
-		},
-
-		async handleProductlineChange(id) {
-			// await this.getWorksectionList(id);
-			this.innerDataForm.sectionId = null;
-			this.$emit('update', this.innerDataForm);
-		},
-
-		// getCode
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
-		},
-
-		// 获取产线列表
-		async getProductLineList() {
-			const response = await this.$axios('/base/production-line/listAll');
-			this.productionLineList = response.data.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-
-		// 获取检测内容列表
-		async getInspectionDetList() {
-			const response = await this.$axios(
-				'/base/quality-inspection-det/listAll'
-			);
-			this.cacheInspectionDetList = response.data;
-			this.inspectionDetList = response.data.map((item) => ({
-				label: item.content,
-				value: item.id,
-			}));
-		},
-
-		// 获取工段列表
-		async getWorksectionList(plId) {
-			const response = await this.$axios(
-				'/base/workshop-section/listByParentId',
-				{
-					params: {
-						id: plId,
-					},
-				}
-			);
-			this.sectionList = response.data.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-</style>
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/index.vue b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
deleted file mode 100644
index 8dec558e..00000000
--- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue
+++ /dev/null
@@ -1,442 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				fixed="right"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="50%"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	createQualityInspectionRecord,
-	updateQualityInspectionRecord,
-	deleteQualityInspectionRecord,
-	getQualityInspectionRecord,
-	getQualityInspectionRecordPage,
-	exportQualityInspectionRecordExcel,
-} from '@/api/monitoring/qualityInspectionRecord';
-// import Editor from '@/components/Editor';
-import moment from 'moment';
-import DialogForm from './dialogForm.vue';
-
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-export default {
-	name: 'QualityInspectionRecord',
-	components: {
-		DialogForm,
-	},
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			rows: [
-				[
-					{
-						select: true,
-						label: '检测内容',
-						url: '/base/quality-inspection-det/listAll',
-						prop: 'inspectionDetId',
-						labelKey: 'content',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							filterable: true,
-						},
-					},
-					{
-						select: true,
-						label: '来源',
-						prop: 'source',
-						value: 1, // 默认手动
-						options: [
-							{ label: '手动', value: 1 },
-							{ label: '自动', value: 2 },
-						],
-						bind: {
-							filterable: true,
-						},
-					},
-				],
-				[
-					{
-						select: true,
-						label: '产线',
-						url: '/base/production-line/listAll',
-						prop: 'productionLineId',
-						bind: {
-							filterable: true,
-						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						select: true,
-						label: '工段',
-						url: '/base/workshop-section/listAll', // 这个 url 其实可加可不加，因为下面会更新 options
-						options: [], // 这个options也可加可不加, 因为下面会更新 options
-						prop: 'sectionId',
-						bind: {
-							filterable: true,
-						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '检测人员',
-						prop: 'checkPerson',
-					},
-					{
-						datetime: true,
-						label: '检测时间',
-						prop: 'checkTime',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							format: 'yyyy-MM-dd HH:mm:ss',
-							'value-format': 'timestamp',
-							// 'value-format': 'yyyy-MM-dd HH:mm:ss',
-							clearable: true,
-						},
-					},
-				],
-				// [
-				// 	{
-				// 		textarea: true,
-				// 		label: '检测内容',
-				// 		prop: 'inspectionDetContent',
-				// 		value: '',
-				// 		rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-				// 	},
-				// ],
-				[{ textarea: true, label: '描述', prop: 'explainText' }],
-				[{ input: true, label: '备注', prop: 'remark' }],
-			],
-			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					placeholder: '请选择产线',
-					param: 'productionLineId',
-					selectOptions: [],
-				},
-				{
-					type: 'input',
-					label: '检测内容',
-					placeholder: '请输入检测内容',
-					param: 'inspectionDetContent',
-				},
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'daterange', // datetimerange
-					// format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始日期',
-					endPlaceholder: '结束日期',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'checkTime',
-					// width: 350,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi(
-						'monitoring:quality-inspection-record:create'
-					)
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-			],
-			tableBtn: [
-				this.$auth.hasPermi('monitoring:quality-inspection-record:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('monitoring:quality-inspection-record:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{
-					width: 128,
-					prop: 'inspectionDetContent',
-					label: '检测内容',
-				},
-				{
-					// width: 128,
-					prop: 'lineName',
-					label: '产线',
-				},
-				{
-					// width: 128,
-					prop: 'checkPerson',
-					label: '检测人员',
-				},
-				{
-					// width: 160,
-					prop: 'checkTime',
-					label: '检测时间',
-					filter: (val) =>
-						val != null ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '-',
-				},
-				{
-					width: 90,
-					prop: 'source',
-					label: '来源',
-					filter: (val) => ['未知', '手动', '自动'][val],
-				},
-			],
-			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
-			searchBarKeys: ['inspectionDetContent', 'checkTime', 'productionLineId'],
-			form: {
-				id: undefined,
-				inspectionDetId: undefined,
-				inspectionDetContent: undefined,
-				productionLineId: undefined,
-				sectionId: undefined,
-				checkPerson: undefined,
-				checkTime: undefined,
-				source: undefined,
-				explainText: undefined,
-				remark: undefined,
-			},
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				inspectionDetContent: null,
-				checkTime: [],
-				productionLineId: null,
-			},
-		};
-	},
-	created() {
-		this.getList();
-		// this.getProductLineList();
-	},
-	watch: {
-		form: {
-			handler: function (val) {
-				console.log('form change:', val);
-			},
-			deep: true
-		}
-		// 注册弹窗里产线改变时的监听事件
-		// 'form.productionLineId': {
-		// 	handler: function (val) {
-		// 		if (val == null) return;
-		// 		this.$axios('/base/workshop-section/listByParentId', {
-		// 			params: {
-		// 				id: val,
-		// 			},
-		// 		}).then((response) => {
-		// 			this.$set(
-		// 				this.rows[1][1], // 这里索引是硬编码，所以当 this.rows 里数据顺序改变时，此处也要改
-		// 				'options',
-		// 				response.data.map((item) => {
-		// 					return {
-		// 						label: item.name,
-		// 						value: item.id,
-		// 					};
-		// 				})
-		// 			);
-		// 		});
-		// 	},
-		// 	immediate: true,
-		// },
-	},
-	methods: {
-		/** 获取搜索栏的产线列表 */
-		getProductLineList() {
-			this.$axios('/base/production-line/listAll').then((response) => {
-				this.searchBarFormConfig[0].selectOptions = response.data.map(
-					(item) => {
-						return {
-							name: item.name,
-							id: item.id,
-						};
-					}
-				);
-			});
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getQualityInspectionRecordPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				inspectionDetId: undefined,
-				inspectionDetContent: undefined,
-				sectionId: undefined,
-				checkPerson: undefined,
-				checkTime: undefined,
-				source: undefined,
-				explainText: undefined,
-				remark: undefined,
-				productionLineId: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加质量检查信息记录表';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getQualityInspectionRecord(id).then((response) => {
-				/** 因为后端返回的时间是时间戳格式，需转换 */
-				const info = {}
-				Object.keys(this.form).forEach(key => {
-					info[key] = response.data[key]
-				});
-				this.form = info;
-				this.open = true;
-				this.title = '修改质量检查信息记录表';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateQualityInspectionRecord(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createQualityInspectionRecord(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除"' + row.inspectionDetContent + '"?')
-				.then(function () {
-					return deleteQualityInspectionRecord(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有质量检查信息记录表数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportQualityInspectionRecordExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '质量检查信息记录表.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>
diff --git a/src/views/quality/monitoring/qualityRecentHours/index.vue b/src/views/quality/monitoring/qualityRecentHours/index.vue
deleted file mode 100644
index d7ec32e0..00000000
--- a/src/views/quality/monitoring/qualityRecentHours/index.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<!-- 
-    filename: index.vue
-    author: liubin
-    date: 2023-08-04 14:44:58
-    description: 
--->
-
-<template>
-	<div class="app-container">
-		<SearchBar
-			:formConfigs="[{ label: '近24小时检测记录', type: 'title' }]"
-			ref="search-bar" />
-		<!-- <pre><code v-html="jsondemo"></code></pre> -->
-
-		<el-skeleton v-if="initing" :rows="6" animated />
-		<div v-else :class="{ 'no-data-bg': !list || list.length == 0 }">
-			<base-table
-				v-if="list && list.length > 0"
-				:table-props="tableProps"
-				:page="queryParams.pageNo"
-				:limit="queryParams.pageSize"
-				:table-data="list"
-				@emitFun="handleEmitFun"></base-table>
-		</div>
-	</div>
-</template>
-
-<script>
-// import response from './response.json';
-import { handleNameData, handleDynamicData } from '@/utils/dynamicProps';
-// import hljs from 'highlight.js/lib/highlight';
-// import json from 'highlight.js/lib/languages/json';
-// import 'highlight.js/styles/github-gist.css';
-
-// hljs.registerLanguage('json', json);
-
-export default {
-	name: 'QualityRecentHours',
-	components: {},
-	props: {},
-	data() {
-		return {
-			initing: false,
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-			},
-			list: [
-				// {
-				// 	inspectionContent: '检测内容1',
-				// 	'2023-03-18T00:00:00-产线1': '产线1-asdf',
-				// 	'2023-03-18T01:00:00-产线2': '产线2-kldf',
-				// 	'2023-03-18T02:00:00-产线1': '产线1-vasdkj',
-				// },
-			],
-			tableProps: [
-				{
-					prop: 'inspectionContent',
-					label: '检测内容',
-				},
-			],
-		};
-	},
-	computed: {},
-	mounted() {
-		this.getList();
-	},
-	methods: {
-		async getList() {
-			const response = await this.$axios({
-				url: '/monitoring/record-in-one-day/get',
-				method: 'get',
-			});
-			const {
-				data: { data: dyanmicData, nameData },
-			} = response;
-
-			this.initing = true;
-			const dynamicProps = handleNameData(nameData);
-			this.tableProps.push(...dynamicProps);
-			const dataList = handleDynamicData(dyanmicData);
-			this.list = dataList;
-			this.queryParams.pageSize = dataList.length;
-
-			setTimeout(() => {
-				this.initing = false;
-			}, 1000);
-		},
-
-		handleEmitFun(payload) {
-			console.log('payload', payload);
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-::-webkit-scrollbar {
-	display: none;
-}
-
-pre {
-	margin: 10px;
-	background: #f6f8faf6;
-	border: 1px solid #e1e4e8;
-	padding: 12px;
-	border-radius: 12px;
-	position: fixed;
-	// top: 15vh;
-	top: 10vh;
-	left: 0;
-	max-height: 80vh;
-	overflow-y: auto;
-	z-index: 100000;
-	box-shadow: 0 0 32px 12px #0001;
-}
-
-code {
-	font-family: 'IntelOne Mono', 'Ubuntu', 'Courier New', Courier, monospace;
-}
-</style>
diff --git a/src/views/quality/monitoring/qualityRecentHours/props.json b/src/views/quality/monitoring/qualityRecentHours/props.json
deleted file mode 100644
index a8976b08..00000000
--- a/src/views/quality/monitoring/qualityRecentHours/props.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-	"tableProps": [
-		{
-			"prop": "inspectionContent",
-			"label": "检测内容",
-			"align": "center"
-		},
-		{
-			"prop": "2023-03-18T00:00:00",
-			"label": "2023-03-18T00:00:00",
-			"align": "center",
-			"children": [
-				{
-					"prop": "2023-03-18T00:00:00-产线1",
-					"label": "产线1",
-					"align": "center"
-				},
-				{
-					"prop": "2023-03-18T00:00:00-产线2",
-					"label": "产线2",
-					"align": "center"
-				},
-				{
-					"prop": "2023-03-18T00:00:00-产线3",
-					"label": "产线3",
-					"align": "center"
-				},
-				{
-					"prop": "2023-03-18T00:00:00-产线4",
-					"label": "产线4",
-					"align": "center"
-				},
-				{
-					"prop": "2023-03-18T00:00:00-产线5",
-					"label": "产线5",
-					"align": "center"
-				}
-			]
-		},
-		{
-			"prop": "2023-03-18T01:00:00",
-			"label": "2023-03-18T01:00:00",
-			"align": "center",
-			"children": [
-				{
-					"prop": "2023-03-18T01:00:00-产线1",
-					"label": "产线1",
-					"align": "center"
-				},
-				{
-					"prop": "2023-03-18T01:00:00-产线2",
-					"label": "产线2",
-					"align": "center"
-				},
-				{
-					"prop": "2023-03-18T01:00:00-产线3",
-					"label": "产线3",
-					"align": "center"
-				}
-			]
-		},
-		{
-			"prop": "2023-03-18T02:00:00",
-			"label": "2023-03-18T02:00:00",
-			"align": "center",
-			"children": [
-				{
-					"prop": "2023-03-18T02:00:00-产线1",
-					"label": "产线1",
-					"align": "center"
-				},
-				{
-					"prop": "2023-03-18T02:00:00-产线2",
-					"label": "产线2",
-					"align": "center"
-				}
-			]
-		}
-	]
-}
diff --git a/src/views/quality/monitoring/qualityRecentHours/response.json b/src/views/quality/monitoring/qualityRecentHours/response.json
deleted file mode 100644
index 9524dfb4..00000000
--- a/src/views/quality/monitoring/qualityRecentHours/response.json
+++ /dev/null
@@ -1,176 +0,0 @@
-{
-	"code": 0,
-	"data": {
-		"data": [
-			{
-				"data": [
-					{
-						"id": "测试222023-08-09T02:00",
-						"parentId": "测试22",
-						"dynamicName": "2023-08-09T02:00",
-						"dynamicValue": 1691517600000,
-						"children": [
-							{
-								"id": "1672847052717821953",
-								"parentId": "测试222023-08-09T02:00",
-								"dynamicName": "产线1",
-								"dynamicValue": 1
-							}
-						]
-					},
-					{
-						"id": "测试222023-08-09T08:00",
-						"parentId": "测试22",
-						"dynamicName": "2023-08-09T08:00",
-						"dynamicValue": 1691539200000,
-						"children": [
-							{
-								"id": "1672847052717821953",
-								"parentId": "测试222023-08-09T08:00",
-								"dynamicName": "产线1",
-								"dynamicValue": 1
-							}
-						]
-					},
-					{
-						"id": "测试222023-08-09T11:00",
-						"parentId": "测试22",
-						"dynamicName": "2023-08-09T11:00",
-						"dynamicValue": 1691550000000,
-						"children": [
-							{
-								"id": "1672847052717821953",
-								"parentId": "测试222023-08-09T11:00",
-								"dynamicName": "产线1",
-								"dynamicValue": 1
-							}
-						]
-					}
-				],
-				"inspectionDetContent": "测试22"
-			},
-			{
-				"data": [
-					{
-						"id": "测试112023-08-09T02:00",
-						"parentId": "测试11",
-						"dynamicName": "2023-08-09T02:00",
-						"dynamicValue": 1691517600000,
-						"children": [
-							{
-								"id": "1672847052717821954",
-								"parentId": "测试112023-08-09T02:00",
-								"dynamicName": "产线22",
-								"dynamicValue": 1
-							}
-						]
-					},
-					{
-						"id": "测试112023-08-09T08:00",
-						"parentId": "测试11",
-						"dynamicName": "2023-08-09T08:00",
-						"dynamicValue": 1691539200000,
-						"children": [
-							{
-								"id": "1672847052717821953",
-								"parentId": "测试112023-08-09T08:00",
-								"dynamicName": "产线1",
-								"dynamicValue": 1
-							}
-						]
-					},
-					{
-						"id": "测试112023-08-09T09:00",
-						"parentId": "测试11",
-						"dynamicName": "2023-08-09T09:00",
-						"dynamicValue": 1691542800000,
-						"children": [
-							{
-								"id": "1672847052717821954",
-								"parentId": "测试112023-08-09T09:00",
-								"dynamicName": "产线22",
-								"dynamicValue": 2
-							}
-						]
-					}
-				],
-				"inspectionDetContent": "测试11"
-			}
-		],
-		"nameData": [
-			{
-				"name": "2023-08-09T02:00",
-				"tree": 1,
-				"id": "测试222023-08-09T02:00",
-				"parentId": "测试22"
-			},
-			{
-				"name": "产线1",
-				"tree": 2,
-				"id": "1672847052717821953",
-				"parentId": "测试222023-08-09T02:00"
-			},
-			{
-				"name": "2023-08-09T08:00",
-				"tree": 1,
-				"id": "测试222023-08-09T08:00",
-				"parentId": "测试22"
-			},
-			{
-				"name": "产线1",
-				"tree": 2,
-				"id": "1672847052717821953",
-				"parentId": "测试222023-08-09T08:00"
-			},
-			{
-				"name": "2023-08-09T11:00",
-				"tree": 1,
-				"id": "测试222023-08-09T11:00",
-				"parentId": "测试22"
-			},
-			{
-				"name": "产线1",
-				"tree": 2,
-				"id": "1672847052717821953",
-				"parentId": "测试222023-08-09T11:00"
-			},
-			{
-				"name": "2023-08-09T02:00",
-				"tree": 1,
-				"id": "测试112023-08-09T02:00",
-				"parentId": "测试11"
-			},
-			{
-				"name": "产线22",
-				"tree": 2,
-				"id": "1672847052717821954",
-				"parentId": "测试112023-08-09T02:00"
-			},
-			{
-				"name": "2023-08-09T08:00",
-				"tree": 1,
-				"id": "测试112023-08-09T08:00",
-				"parentId": "测试11"
-			},
-			{
-				"name": "产线1",
-				"tree": 2,
-				"id": "1672847052717821953",
-				"parentId": "测试112023-08-09T08:00"
-			},
-			{
-				"name": "2023-08-09T09:00",
-				"tree": 1,
-				"id": "测试112023-08-09T09:00",
-				"parentId": "测试11"
-			},
-			{
-				"name": "产线22",
-				"tree": 2,
-				"id": "1672847052717821954",
-				"parentId": "测试112023-08-09T09:00"
-			}
-		]
-	},
-	"msg": ""
-}
diff --git a/src/views/quality/monitoring/qualityStatistics/components/detailGraph.vue b/src/views/quality/monitoring/qualityStatistics/components/detailGraph.vue
deleted file mode 100644
index 70a3a71a..00000000
--- a/src/views/quality/monitoring/qualityStatistics/components/detailGraph.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<!-- 
-    filename: detailGraph.vue
-    author: liubin
-    date: 2023-08-04 16:36:21
-    description: 图表
--->
-
-<template>
-	<div class="cell">
-		<div class="title">
-			<span>
-				{{ title }}
-			</span>
-		</div>
-		<div class="content">
-			<slot />
-		</div>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'DetailGraph',
-	components: {},
-	props: {
-		title: {
-			type: String,
-			default: 'detail graph (echarts)',
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.cell {
-	// background: #cfcfcf;
-	border: 1px solid #cfcfcf;
-	border-radius: 8px;
-	padding: 8px;
-	display: flex;
-	flex-direction: column;
-}
-
-.title > span {
-	display: inline-block;
-	padding: 4px 8px 4px 6px;
-	background: rgba(20, 145, 210, 0.155);
-	border-left: 4px solid rgba(20, 145, 210);
-}
-
-.content {
-    flex: 1; 
-    // background-color: aquamarine;
-}
-</style>
diff --git a/src/views/quality/monitoring/qualityStatistics/components/graphs/line.vue b/src/views/quality/monitoring/qualityStatistics/components/graphs/line.vue
deleted file mode 100644
index 71de4946..00000000
--- a/src/views/quality/monitoring/qualityStatistics/components/graphs/line.vue
+++ /dev/null
@@ -1,286 +0,0 @@
-<!-- 
-    filename: line.vue
-    author: liubin
-    date: 2023-08-07 16:14:11
-    description: 
--->
-
-<template>
-	<div ref="line-chart" class="line-chart"></div>
-</template>
-
-<script>
-import * as echarts from 'echarts';
-
-export default {
-	name: 'LineDataChart',
-	components: {},
-	props: {
-		xProps: {
-			type: Array,
-			default: () => [],
-		},
-		legend: {
-			type: Array,
-			default: () => [],
-		},
-		series: {
-			type: Array,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			chart: null,
-			// inspectionContents: [
-			// 	'检测内容1',
-			// 	'检测内容2',
-			// 	'检测内容3',
-			// 	'检测内容4',
-			// 	'检测内容5',
-			// 	'检测内容6',
-			// 	'检测内容7',
-			// 	'检测内容8',
-			// 	'检测总数',
-			// 	'比例%',
-			// ],
-			// xProps: [
-			// 	'产线1',
-			// 	'产线2',
-			// 	'产线3',
-			// 	'产线4',
-			// 	'产线5',
-			// 	'产线6',
-			// 	'产线7',
-			// 	'产线8',
-			// 	'产线9',
-			// ],
-			// series: [
-			// 	{
-			// 		name: 'a',
-			// 		type: 'line',
-			// 		data: [120, 132, 101, 134, 90, 230, 210, 120, 132],
-			// 	},
-			// 	{
-			// 		name: 'lkj',
-			// 		type: 'line',
-			// 		data: [220, 182, 191, 234, 290, 330, 310, 220, 182],
-			// 	},
-			// 	{
-			// 		name: '测试11',
-			// 		type: 'line',
-			// 		data: [150, 232, 201, 154, 190, 330, 410, 150, 232],
-			// 	},
-			// 	{
-			// 		name: '测试22',
-			// 		type: 'line',
-			// 		data: [320, 332, 301, 334, 390, 330, 320, 332, 301],
-			// 	},
-			// ],
-		};
-	},
-	computed: {
-		config() {
-			return {
-				color: ['#fde19a', '#8be2b9', '#288aff', '#7164ff'],
-				// title: {
-				// 	text: '折线图',
-				// },
-				grid: {
-					top: '12%',
-					left: '2%',
-					right: '5%',
-					bottom: '5%',
-					containLabel: true,
-				},
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'shadow',
-					},
-				},
-				legend: {
-					data: this.legend,
-					top: '5%',
-					icon: 'circle',
-				},
-				// toolbox: {
-				// 	feature: {
-				// 		saveAsImage: {},
-				// 	},
-				// },
-				xAxis: {
-					type: 'category',
-					boundaryGap: true,
-					onZero: false,
-					axisTick: {
-						show: false,
-					},
-					axisLine: {
-						lineStyle: {
-							// color: 'red'
-						},
-					},
-					data: this.xProps,
-					// data: [
-					// 	'设备1',
-					// 	'设备2',
-					// 	'设备3',
-					// 	'设备4',
-					// 	'设备5',
-					// 	'设备6',
-					// 	'设备7',
-					// 	'设备8',
-					// 	'设备9',
-					// 	'设备10',
-					// 	'设备11',
-					// 	'设备12',
-					// 	'设备13',
-					// 	'设备14',
-					// 	'设备15',
-					// 	'设备16',
-					// 	'设备17',
-					// 	'设备18',
-					// 	'设备19',
-					// 	'设备20',
-					// ],
-				},
-				yAxis: {
-					type: 'value',
-					name: '检测数量',
-					nameTextStyle: {
-						color: '#999',
-						fontSize: 14,
-						align: 'right',
-					},
-					max: function (value) {
-						return value.max + Math.floor(value.max / 5);
-					},
-				},
-				// 缩放 - 滑动
-				dataZoom: {
-					type: 'inside',
-				},
-				series: this.series,
-				// series: [
-				// 	{
-				// 		name: '上片数',
-				// 		type: 'bar',
-				// 		// barWidth: 12,
-				// 		data: [
-				// 			10,
-				// 			12,
-				// 			43,
-				// 			4,
-				// 			22,
-				// 			32,
-				// 			12,
-				// 			8,
-				// 			122,
-				// 			0,
-				// 			,
-				// 			43,
-				// 			4,
-				// 			22,
-				// 			32,
-				// 			12,
-				// 			8,
-				// 			122,
-				// 			77,
-				// 			99,
-				// 		],
-				// 	},
-				// 	{
-				// 		name: '下片数',
-				// 		type: 'bar',
-				// 		// barWidth: 12,
-				// 		data: [
-				// 			10,
-				// 			12,
-				// 			43,
-				// 			4,
-				// 			22,
-				// 			32,
-				// 			12,
-				// 			8,
-				// 			122,
-				// 			0,
-				// 			4,
-				// 			22,
-				// 			32,
-				// 			12,
-				// 			8,
-				// 			122,
-				// 			0,
-				// 			,
-				// 			43,
-				// 			4,
-				// 			22,
-				// 			32,
-				// 		],
-				// 	},
-				// 	{
-				// 		name: '检测数',
-				// 		type: 'bar',
-				// 		// barWidth: 12,
-				// 		barCategoryGap: 12,
-				// 		data: [
-				// 			10,
-				// 			12,
-				// 			43,
-				// 			4,
-				// 			22,
-				// 			4,
-				// 			22,
-				// 			32,
-				// 			12,
-				// 			8,
-				// 			122,
-				// 			0,
-				// 			,
-				// 			43,
-				// 			4,
-				// 			22,
-				// 			32,
-				// 			32,
-				// 			12,
-				// 			8,
-				// 			122,
-				// 			0,
-				// 		],
-				// 	},
-				// ],
-			};
-		},
-	},
-	mounted() {
-		this.init();
-	},
-	watch: {
-		config(val) {
-			this.$nextTick(() => {
-				this.init();
-			});
-		},
-	},
-	methods: {
-		init() {
-			if (!this.chart) this.chart = echarts.init(this.$refs['line-chart']);
-
-			this.$nextTick(() => {
-				this.setOption();
-			});
-		},
-		setOption() {
-			this.chart.setOption(this.config);
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.line-chart {
-	// background: #f3f3f3;
-	height: 100%;
-}
-</style>
diff --git a/src/views/quality/monitoring/qualityStatistics/components/graphs/total.vue b/src/views/quality/monitoring/qualityStatistics/components/graphs/total.vue
deleted file mode 100644
index e65d60b7..00000000
--- a/src/views/quality/monitoring/qualityStatistics/components/graphs/total.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<!-- 
-    filename: total.vue
-    author: liubin
-    date: 2023-08-07 15:04:31
-    description: 
--->
-
-<template>
-	<div class="total-graph" id="total-graph">
-		<div id="updata" class="updata"></div>
-		<div id="downdata" class="downdata"></div>
-		<div id="checktotal" class="checktotal"></div>
-	</div>
-</template>
-
-<script>
-import * as echarts from 'echarts';
-
-export default {
-	name: 'TotalGraph',
-	components: {},
-	props: {
-		summaryList: {
-			type: Array,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			config: {},
-            updata: [],
-            downdata: [],
-            checktotal: [],
-			upChart: null,
-			downChart: null,
-			totalChart: null,
-		};
-	},
-	computed: {},
-	mounted() {
-		this.init();
-	},
-	methods: {
-		init() {
-			this.handleSummaryList();
-			this.initUpdata();
-			this.initDowndata();
-			this.initChecktotal();
-		},
-
-		handleSummaryList() {
-			this.summaryList.map((item) => {
-				this.updata.push({ name: item.lineName, value: item.sumUp });
-				this.downdata.push({ name: item.lineName, value: item.sumDown });
-				this.checktotal.push({ name: item.lineName, value: item.sumCheck });
-			});
-		},
-
-		initUpdata() {
-			if (!this.upChart)
-				this.upChart = echarts.init(document.getElementById('updata'));
-			this.upChart.setOption(
-				this.handleOption({
-					title: '上片总数',
-					name: '上片数据',
-					data: this.updata
-				})
-			);
-		},
-
-		initDowndata() {
-			if (!this.downChart)
-				this.downChart = echarts.init(document.getElementById('downdata'));
-			this.downChart.setOption(
-				this.handleOption({
-					title: '下片总数',
-					name: '下片数据',
-					data: this.downdata
-				})
-			);
-		},
-
-		initChecktotal() {
-			if (!this.totalChart)
-				this.totalChart = echarts.init(document.getElementById('checktotal'));
-			this.totalChart.setOption(
-				this.handleOption({
-					title: '检测总数',
-					name: '检测数据',
-					data: this.checktotal
-				})
-			);
-		},
-
-		handleOption({ title, name, data }) {
-			const defaultOption = {
-				title: {
-					text: title,
-					left: '42%',
-					top: 'center',
-					textAlign: 'right',
-					textStyle: {
-						fontSize: 14,
-					},
-				},
-				tooltip: {
-					trigger: 'item',
-				},
-				legend: {
-					top: 'center',
-					right: '10%',
-					orient: 'vertical',
-					itemWidth: 12,
-					itemHeight: 12,
-					icon: 'circle',
-				},
-				series: [
-					{
-						name: name,
-						type: 'pie',
-						radius: ['40%', '70%'],
-						center: ['35%', '50%'],
-						avoidLabelOverlap: true,
-						label: {
-							show: false,
-							position: 'center',
-						},
-						// emphasis: {
-						// 	label: {
-						// 		show: true,
-						// 		fontSize: 40,
-						// 		fontWeight: 'bold',
-						// 	},
-						// },
-						labelLine: {
-							show: false,
-						},
-						data: data ?? [
-							{ value: 1048, name: 'Search Engine' },
-							{ value: 735, name: 'Direct' },
-							{ value: 580, name: 'Email' },
-							{ value: 484, name: 'Union Ads' },
-							{ value: 300, name: 'Video Ads' },
-						],
-					},
-				],
-			};
-
-			return defaultOption;
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-#total-graph {
-	margin-top: 8px;
-	width: 100%;
-	// height: 400px;
-	// background: #ccc;
-	display: grid;
-	grid-template-columns: repeat(2, 1fr);
-	grid-template-rows: repeat(2, 240px);
-	// row-gap: 20px;
-}
-
-.updata {
-	// width: 320px;
-	// justify-self: center;
-	// background: rgba($color: #f00, $alpha: 0.3);
-}
-
-.downdata {
-	// width: 240px;
-	// justify-self: center;
-	// background: rgba($color: #0f0, $alpha: 0.3);
-}
-
-.checktotal {
-	width: 320px;
-	justify-self: center;
-	// background: rgba($color: #00f, $alpha: 0.3);
-	grid-column: span 2;
-}
-</style>
diff --git a/src/views/quality/monitoring/qualityStatistics/components/summaryTable.vue b/src/views/quality/monitoring/qualityStatistics/components/summaryTable.vue
deleted file mode 100644
index 01996423..00000000
--- a/src/views/quality/monitoring/qualityStatistics/components/summaryTable.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- 
-    filename: summaryDialog.vue
-    author: liubin
-    date: 2023-08-04 16:25:49
-    description: 
--->
-
-<template>
-	<!-- 列表 -->
-	<!-- height="35vh" -->
-	<base-table
-		:table-props="tableProps"
-		:page="queryParams.pageNo"
-		:limit="queryParams.pageSize"
-		:table-data="list"></base-table>
-</template>
-
-<script>
-export default {
-	name: 'SummaryTable',
-	components: {},
-	props: {
-		list: {
-			type: Array,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-			},
-			tableProps: [
-				{
-					prop: 'lineName',
-					label: '产线',
-				},
-				{
-					prop: 'sumUp',
-					label: '上片总数',
-				},
-				{
-					prop: 'sumDown',
-					label: '下片总数',
-				},
-				{
-					prop: 'sumCheck',
-					label: '检测总数',
-				},
-				{
-					prop: 'scrapRatio',
-					label: '比例(%)',
-				},
-			],
-		};
-	},
-	computed: {},
-	methods: {},
-};
-</script>
-
-<style scoped lang="scss"></style>
diff --git a/src/views/quality/monitoring/qualityStatistics/graphPage.vue b/src/views/quality/monitoring/qualityStatistics/graphPage.vue
deleted file mode 100644
index b1056e82..00000000
--- a/src/views/quality/monitoring/qualityStatistics/graphPage.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<!-- 
-    filename: graphPage.vue
-    author: liubin
-    date: 2023-08-07 13:46:59
-    description: 
--->
-
-<template>
-	<div class="graph-page">
-		<!-- <DetailGraph id="dg1" key="dg1" ref="dg1" title="数据总览">
-			<TotalGraph :summary-list="summaryList" />
-		</DetailGraph> -->
-		<!-- <DetailGraph id="dg2" key="dg2" ref="dg2" title="检测内容数据">
-			<LineGraph :x-props="lineData.xProps" :legend="legend" :series="series" />
-		</DetailGraph> -->
-		<!-- <DetailGraph id="dg3" key="dg3" ref="dg3" />
-			<DetailGraph id="dg4" key="dg4" ref="dg4" /> -->
-		<!-- <div v-if="!series || series.length == 0" style="color: #777; font-size: 16px; letter-spacing: 1px; text-align: center; padding-top: 56px; text-decoration: underline;">暂无数据</div> -->
-		<div v-if="!series || series.length == 0" class="no-data-bg" />
-		<LineGraph
-			v-else
-			:x-props="lineData.xProps"
-			:legend="legend"
-			:series="series" />
-	</div>
-</template>
-
-<script>
-import DetailGraph from './components/detailGraph.vue';
-import TotalGraph from './components/graphs/total.vue';
-import LineGraph from './components/graphs/line.vue';
-
-export default {
-	name: 'GraphPage',
-	components: { DetailGraph, TotalGraph, LineGraph },
-	props: {
-		summaryList: {
-			type: Array,
-			default: () => [],
-		},
-		lineData: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			legend: [],
-			series: [],
-		};
-	},
-	mounted() {
-		this.buildLegend();
-
-		this.$nextTick(() => {
-			this.series = this.lineData.list.map(this.buildSeries);
-			console.log('this.series', this.series);
-		});
-	},
-	methods: {
-		buildSeries(item) {
-			console.log('this.list', this.lineData.list, this.lineData.xProps);
-			const seriesItem = {
-				name: item.inspectionContent,
-				type: 'bar',
-				barCategoryGap: 12,
-				barWidth: 20,
-				data: [],
-			};
-
-			this.lineData.xProps.forEach((prop) => {
-				if (prop in item) {
-					seriesItem.data.push(item[prop]);
-				} else {
-					seriesItem.data.push(null);
-				}
-			});
-
-			return seriesItem;
-		},
-		buildLegend() {
-			this.legend = this.lineData.list
-				.map((item) => item.inspectionContent)
-				.sort();
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.graph-page {
-	height: 100%;
-	display: grid;
-	// grid-template-columns: ;
-	// grid-template-columns: 1fr 1fr;
-	grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
-	grid-auto-rows: minmax(300px, max-content);
-	gap: 12px;
-}
-
-#dg1 {
-	grid-column: 1 / 3;
-}
-
-#dg2 {
-	grid-column: 3 / 5;
-}
-
-#dg3 {
-	grid-column: span 2;
-}
-
-#dg4 {
-	grid-column: span 2;
-}
-</style>
diff --git a/src/views/quality/monitoring/qualityStatistics/index.vue b/src/views/quality/monitoring/qualityStatistics/index.vue
deleted file mode 100644
index ec436dbb..00000000
--- a/src/views/quality/monitoring/qualityStatistics/index.vue
+++ /dev/null
@@ -1,632 +0,0 @@
-<!-- 
-    filename: index.vue
-    author: liubin
-    date: 2023-08-04 14:44:58
-    description: 检测统计数据
--->
-
-<template>
-	<div class="quality-container" style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column;">
-		<el-row
-			class=""
-			style="
-				margin-bottom: 12px;
-				background: #fff;
-				padding: 16px 16px 0;
-				border-radius: 8px;
-			">
-			<!-- 搜索工作栏 -->
-			<SearchBar
-				:formConfigs="searchBarFormConfig"
-				ref="search-bar"
-				@headBtnClick="handleSearchBarBtnClick" />
-		</el-row>
-
-		<el-row
-			class=""
-			style="
-				margin-top: 0;
-				margin-bottom: 12px;
-				background: #fff;
-				padding: 12px 16px 16px;
-				border-radius: 8px;
-			">
-			<div class="blue-title">产线检测总览</div>
-			<summaryTable :list="summaryList" />
-		</el-row>
-
-		<el-row
-			class=""
-			style="
-				margin-top: 0;
-				margin-bottom: 12px;
-				background: #fff;
-				padding: 12px 16px 16px;
-				border-radius: 8px;
-				flex: 1;
-			">
-			<el-row style="display: flex; align-items: center">
-				<div class="blue-title">产线检测详细</div>
-				<div class="custom-tabs">
-					<el-tabs
-						v-model="activeName"
-						:stretch="true"
-						@tab-click="handleTabClick">
-						<el-tab-pane
-							:label="'\u2002数据列表\u2002'"
-							name="table"></el-tab-pane>
-						<el-tab-pane
-							:label="'\u3000柱状图\u3000'"
-							name="graph"></el-tab-pane>
-					</el-tabs>
-				</div>
-			</el-row>
-
-			<transition mode="out-in" name="fade-down">
-				<template v-if="mode == 'table'">
-					<base-table
-						v-if="mode == 'table' && list.length"
-						:table-props="tableProps"
-						:page="queryParams.pageNo"
-						:limit="queryParams.pageSize"
-						:table-data="list"
-						@emitFun="handleEmitFun"></base-table>
-					<div v-else class="no-data-bg"></div>
-				</template>
-
-				<GraphPage
-					v-else
-					:summary-list="summaryList"
-					:line-data="{
-						list: list,
-						xProps: dynamicProps.map((v) => v.prop),
-					}" />
-			</transition>
-		</el-row>
-
-		<!-- todo: 数据总览，用弹窗包裹的 table 实现 -->
-		<!-- <base-dialog
-			dialogTitle="数据总览"
-			:dialogVisible="summaryOpen"
-			width="50%"
-			@close="handleSummaryClose"
-			@cancel="handleSummaryClose"
-			@confirm="handleSummaryClose">
-			<summaryTable :list="summaryList" />
-		</base-dialog> -->
-	</div>
-</template>
-
-<script>
-import GraphPage from './graphPage.vue';
-import summaryTable from './components/summaryTable.vue';
-
-class DateGetter {
-	constructor() {
-		this.today = new Date();
-		this.y = this.today.getFullYear();
-		this.m = this.today.getMonth();
-		this.d = this.today.getDate();
-	}
-	getWeekRange() {
-		const weekStart = new Date(this.y, this.m, this.d - this.today.getDay());
-		const weekEnd = new Date(
-			this.y,
-			this.m,
-			this.d + (6 - this.today.getDay()),
-			23,
-			59,
-			59
-		);
-		// console.log('week', [weekStart, weekEnd]);
-		return [weekStart, weekEnd];
-	}
-
-	getMonthRange() {
-		const monthStart = new Date(this.y, this.m, 1);
-		const monthEnd = new Date(this.y, this.m + 1, 0, 23, 59, 59);
-		// console.log('month', [monthStart, monthEnd]);
-		return [monthStart, monthEnd];
-	}
-
-	getQuarterRange() {
-		const quarterStart = new Date(this.y, this.m - (this.m % 3), 1);
-		const quarterEnd = new Date(
-			this.y,
-			this.m - (this.m % 3) + 3,
-			0,
-			23,
-			59,
-			59
-		);
-		// console.log('quarter', [quarterStart, quarterEnd]);
-		return [quarterStart, quarterEnd];
-	}
-}
-
-export default {
-	name: 'QualityStatistics',
-	components: { GraphPage, summaryTable },
-	props: {},
-	data() {
-		const dateGetter = new DateGetter();
-		return {
-			// mode: 'table', // defaults to 'table'
-			activeName: 'table', // defaults to 'table'
-			searchBarFormConfig: [
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'daterange', // datetimerange
-					// format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd',
-					// valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'timestamp',
-					rangeSeparator: '-',
-					startPlaceholder: '开始日期',
-					endPlaceholder: '结束日期',
-					defaultSelect: [],
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'timerange',
-					pickerOptions: {
-						shortcuts: [
-							{
-								text: '本周',
-								onClick(picker) {
-									picker.$emit('pick', dateGetter.getWeekRange());
-								},
-							},
-							{
-								text: '本月',
-								onClick(picker) {
-									picker.$emit('pick', dateGetter.getMonthRange());
-								},
-							},
-							{
-								text: '本季',
-								onClick(picker) {
-									picker.$emit('pick', dateGetter.getQuarterRange());
-								},
-							},
-						],
-					},
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '数据总览',
-				// 	name: 'summary',
-				// 	color: 'text',
-				// },
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '表格版',
-				// 	name: 'tableVersion',
-				// 	color: 'text btn-table',
-				// },
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '图形版',
-				// 	name: 'graphVersion',
-				// 	color: 'text btn-graph',
-				// },
-			],
-			// 动态的 props
-			dynamicProps: [],
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				param: null,
-			},
-			summaryList: [],
-			summaryOpen: false,
-			list: [
-				/** mock data */
-				// {
-				// 	content: 'asdfasdf',
-				// 	line1: '',
-				// 	line2: '',
-				// 	line3: '',
-				// 	line4: '',
-				// 	line5: '',
-				// 	line6: '',
-				// 	line7: '',
-				// 	line8: '',
-				// 	line9: '',
-				// 	line10: '',
-				// 	typeTotal: 100,
-				// 	ratio: '93%',
-				// },
-				// {
-				// 	content: 'fdasfs',
-				// 	line1: '',
-				// 	line2: '',
-				// 	line3: '',
-				// 	line4: '',
-				// 	line5: '',
-				// 	line6: '',
-				// 	line7: '',
-				// 	line8: '',
-				// 	line9: '',
-				// 	line10: '',
-				// 	typeTotal: 100,
-				// 	ratio: '93%',
-				// },
-				// {
-				// 	content: 'asdfdfffffff',
-				// 	line1: '',
-				// 	line2: '',
-				// 	line3: '',
-				// 	line4: '',
-				// 	line5: '',
-				// 	line6: '',
-				// 	line7: '',
-				// 	line8: '',
-				// 	line9: '',
-				// 	line10: '',
-				// 	typeTotal: 100,
-				// 	ratio: '93%',
-				// },
-			],
-		};
-	},
-	computed: {
-		mode() {
-			return this.activeName;
-		},
-		tableProps() {
-			return [
-				{
-					// width: 160,
-					prop: 'inspectionContent',
-					label: '检测内容',
-				},
-				...this.dynamicProps,
-				{
-					// width: 128,
-					prop: 'sumInput',
-					label: '检测类型总数',
-				},
-				{
-					// width: 128,
-					prop: 'scrapRatio',
-					label: '比例(%)',
-					// subcomponent: {
-					// 	name: 'TextOnly',
-					// 	props: {
-					// 		injectData: {
-					// 			type: Object,
-					// 			default: () => ({}),
-					// 		},
-					// 	},
-					// 	data() {
-					// 		return {
-					// 			text: '比例',
-					// 		};
-					// 	},
-					// 	methods: {
-					// 		handleEmit(payload) {
-					// 			console.log('handleEmit', payload);
-					// 		},
-					// 	},
-					// 	render(h) {
-					// 		return h('el-button', { props: { type: 'text' } }, this.text);
-					// 	},
-					// },
-				},
-			];
-		},
-	},
-	mounted() {
-		if (this.$route.params.startTime && this.$route.params.endTime) {
-			this.searchBarFormConfig[0].defaultSelect = [
-				this.$route.params.startTime,
-				this.$route.params.endTime,
-			];
-			this.queryParams.param = {};
-			this.$set(
-				this.queryParams.param,
-				'startTime',
-				this.$route.params.startTime
-			);
-			this.$set(this.queryParams.param, 'endTime', this.$route.params.endTime);
-		} else {
-			this.searchBarFormConfig[0].defaultSelect = [];
-		}
-		this.getList();
-	},
-	watch: {
-		$route: 'initData',
-	},
-	methods: {
-		initData(to) {
-			// console.log(to)
-			if (to.name === 'QualityStatistics') {
-				if (this.$route.params.startTime && this.$route.params.endTime) {
-					this.searchBarFormConfig[0].defaultSelect = [
-						this.$route.params.startTime,
-						this.$route.params.endTime,
-					];
-					this.queryParams.param = {};
-					this.$set(
-						this.queryParams.param,
-						'startTime',
-						this.$route.params.startTime
-					);
-					this.$set(
-						this.queryParams.param,
-						'endTime',
-						this.$route.params.endTime
-					);
-				} else {
-					this.searchBarFormConfig[0].defaultSelect = [];
-				}
-				this.getList();
-			}
-		},
-		getList() {
-			this.getSummaryList();
-			this.getDetailedList();
-		},
-		/** 获取 检测总数 列表 */
-		async getSummaryList() {
-			const response = await this.$axios({
-				url: '/monitoring/statistical-data/getUpPart',
-				method: 'post',
-				data: this.queryParams.param
-					? {
-							// startTime: new Date(2022, 6, 1, 0, 0, 0).getTime(), //  '2023-07-01 00:00:00',
-							// endTime: new Date(2023, 7, 10, 0, 0, 0).getTime(), // '2023-08-10 00:00:00',
-							startTime: this.queryParams.param.startTime,
-							endTime: this.queryParams.param.endTime,
-					  }
-					: {},
-			});
-			this.summaryList = response.data;
-		},
-		/** 获取 检测内容和产线关联 列表 */
-		async getDetailedList() {
-			const {
-				data: { data, otherList, otherMap, nameData },
-			} = await this.$axios({
-				url: '/monitoring/statistical-data/getDownPart',
-				method: 'post',
-				data: this.queryParams.param
-					? {
-							// startTime: new Date(2023, 6, 1).getTime(), // '2023-07-01 00:00:00',
-							// endTime: new Date(2023, 7, 22).getTime(), // '2023-08-10 00:00:00',
-							startTime: this.queryParams.param.startTime,
-							endTime: this.queryParams.param.endTime,
-					  }
-					: {},
-			});
-			// this.list = response.data;
-			// console.log('data', data);
-			// console.log('otherList', otherList);
-			// console.log('otherMap', otherMap);
-			// console.log('nameData', nameData);
-
-			this.dynamicProps = this.filterNameData(nameData);
-			this.list = this.filterData(data);
-		},
-		filterNameData(nameData) {
-			const ndSet = new Set();
-			nameData.forEach((nd) => {
-				ndSet.add(nd.name);
-			});
-			return Array.from(ndSet.values())
-				.sort()
-				.map((name) => ({
-					prop: name,
-					label: name,
-				}));
-		},
-		filterData(data) {
-			return data.map((item) => {
-				const { data: innerData } = item;
-				const keyValuePairs = {};
-				innerData.map((d) => {
-					keyValuePairs[d.dynamicName] = d.dynamicValue;
-				});
-				return {
-					inspectionContent: item.inspectionContent,
-					...keyValuePairs,
-					sumInput: item.sumInput,
-					scrapRatio: item.scrapRatio,
-				};
-			});
-		},
-		handleTabClick(tab, event) {
-			const { name } = tab;
-			if (name == 'graph') {
-				// 展示柱状图
-			} else {
-				// 展示表格
-			}
-		},
-		/** 总览关闭 */
-		handleSummaryClose() {
-			this.summaryOpen = false;
-		},
-		/** 搜索按钮 */
-		handleSearchBarBtnClick(btn) {
-			console.log('bnt, ', btn);
-			switch (btn.btnName) {
-				case 'search':
-					if (btn.timerange && typeof btn.timerange === 'object') {
-						this.queryParams.param = {};
-						this.$set(this.queryParams.param, 'startTime', btn.timerange[0]);
-						this.$set(this.queryParams.param, 'endTime', btn.timerange[1]);
-					}
-					this.handleQuery();
-					break;
-				case 'summary':
-					this.summaryOpen = true;
-					break;
-				case 'tableVersion':
-					this.mode = 'table';
-					break;
-				case 'graphVersion':
-					this.mode = 'graph';
-					break;
-				case 'reset':
-					this.$refs['search-bar'].resetForm();
-					// this.resetQuery();
-					break;
-			}
-		},
-		handleQuery() {
-			this.getSummaryList();
-			this.getDetailedList();
-		},
-		/** 处理表格事件 */
-		handleEmitFun() {},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-:deep(.searchBar) {
-	.el-button.btn-table {
-		color: rgb(0, 130, 130);
-		border: 1px solid rgb(0, 130, 130);
-		padding: 8px 10px;
-		border: 1px solid rgb(0, 130, 130);
-		padding: 8px 10px;
-
-		&:hover {
-			border-color: #fff;
-			color: #fff;
-			background: rgb(0, 130, 130);
-		}
-	}
-	.el-button.btn-graph {
-		color: rgb(130, 0, 130);
-		border: 1px solid rgb(130, 0, 130);
-		padding: 8px 10px;
-
-		&:hover {
-			border-color: #fff;
-			color: #fff;
-			background: rgb(130, 0, 130);
-		}
-	}
-}
-
-.fade-down-enter-active,
-.fade-down-leave-active {
-	transition: all 0.3s;
-}
-
-.fade-down-enter,
-.fade-down-leave-to {
-	transform: translateY(20%);
-	opacity: 0;
-}
-
-.fade-down-enter-to,
-.fade-down-leave {
-	transform: translateY(0);
-}
-
-.blue-title {
-	position: relative;
-	padding: 4px 0;
-	padding-left: 12px;
-	font-size: 14px;
-	color: #606266;
-	font-weight: 700;
-	margin-bottom: 12px;
-
-	&::before {
-		content: '';
-		position: absolute;
-		left: 0;
-		top: 6px;
-		height: 16px;
-		width: 4px;
-		border-radius: 1px;
-		background: #0b58ff;
-	}
-}
-
-:deep(.custom-tabs) {
-	.el-tabs__header {
-		margin-left: 12px;
-		margin-bottom: 8px;
-		display: inline-block;
-		transform: translateY(-6px);
-	}
-
-	.el-tabs__item {
-		padding-left: 0 !important;
-		padding-right: 0 !important;
-		height: 36px;
-	}
-}
-</style>
-
-<!-- 
-// {
-	// 	width: 128,
-	// 	prop: 'line1',
-	// 	label: '产线1',
-	// 	,
-	// },
-	// {
-	// 	width: 128,
-	// 	prop: 'line2',
-	// 	label: '产线2',
-	// 	,
-	// },
-	// {
-	// 	width: 128,
-	// 	prop: 'line3',
-	// 	label: '产线3',
-	// 	,
-	// },
-	// {
-	// 	width: 128,
-	// 	prop: 'line4',
-	// 	label: '产线4',
-	// 	,
-	// },
-	// {
-	// 	width: 128,
-	// 	prop: 'line5',
-	// 	label: '产线5',
-	// 	,
-	// },
-	// {
-	// 	width: 128,
-	// 	prop: 'line6',
-	// 	label: '产线6',
-	// 	,
-	// },
-	// {
-	// 	width: 128,
-	// 	prop: 'line7',
-	// 	label: '产线7',
-	// 	,
-	// },
-	// {
-	// 	width: 128,
-	// 	prop: 'line8',
-	// 	label: '产线8',
-	// 	,
-	// }, -->
diff --git a/sync_line_ry1_prod.bat b/sync_line_ry1_prod.bat
deleted file mode 100644
index 03e8e195..00000000
--- a/sync_line_ry1_prod.bat
+++ /dev/null
@@ -1,68 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-set cmdstr=rsync
-set zipfile=cwrsync.zip
-set downurl=https://itefix.net/download/free/cwrsync_6.3.0_x64_free.zip
-set currpath=%~dp0
-set "rsynchome=%ProgramFiles%\%zipfile:~0,-4%"
-set passfile=%temp%\.password
-set syncdir=dist/
-:: ������Ҫ����ͬ��������
-set accountwithost=kszny@192.168.8.22::line
-set "password=kszny@123"
-set "runcommand=%cmdstr% --port=873 -rlptvz --progress --password-file=%passfile% --exclude=google.exe --exclude=Lodap.zip %syncdir% %accountwithost%"
-
-where %cmdstr% >nul 2>nul
-::�д��������˵�������ڸ�����
-if %errorlevel% neq 0 (
-    ::��δ���ذ�װ����δ������ѹ����װĿ¼
-    if not exist "%rsynchome%" (
-        :: ������������ԱȨ��
-        echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\runAsAdmin.vbs"
-        echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\runAsAdmin.vbs"
-        "%temp%\runAsAdmin.vbs"
-        :: ��Ҫ��������ԱȨ�޲��ܴ�����Ŀ¼
-        mkdir "%rsynchome%"
-        del "%temp%\runAsAdmin.vbs"
-        exit /B
-    )
-
-    :: ʹ��powershell��curl����������
-    powershell curl  -o %temp%\%zipfile% %downurl%
-    :: ��ѹ
-    tar -xf "%temp%\%zipfile%" -C "%rsynchome%"
-    echo "%cmdstr%�Ѿ���װ����%rsynchome%Ŀ¼��"
-
-    :: ���·���Ƿ������ PATH ��
-    set "found=false"
-    for %%I in ("%PATH:;=";"%") do (
-        if /I "%%~I"=="%rsynchome%\bin" (
-            set "found=true"
-        )
-    )
-
-    :: δ���õ�path�����У����ӵ�path����
-    if "!found!"=="false" (
-        :: ����ע����е� PATH ������ͨ��setx��ʽ������ֵ���ȳ���1024���ַ��ͻᱻ�ض�
-        reg add "HKCU\Environment" /v PATH /t REG_EXPAND_SZ /d "%PATH%;%rsynchome%\bin" /f
-    )
-
-)
-
-::��ǰĿ¼��û��distĿ¼
-if not exist "%currpath%%syncdir%" (
-    echo ��ǰĿ¼��û����Ҫͬ����%syncdir%Ŀ¼�������Ҫͬ����%syncdir%Ŀ¼��������ǰĿ¼�£�
-) else (
-    echo !password!>%passfile%
-    echo ����ͬ����ʼ�����Ժ�...
-    !runcommand! && (
-        echo ����ͬ�����!
-    ) || (
-        echo !runcommand!
-        echo ����ͬ��ʧ�ܣ���ȷ���Ƿ�����VPN��
-    )
-    del %passfile%
-)
-
-endlocal
-pause
diff --git a/sync_line_yy_prod.bat b/sync_line_yy_prod.bat
deleted file mode 100644
index 6c979e84..00000000
--- a/sync_line_yy_prod.bat
+++ /dev/null
@@ -1,68 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-set cmdstr=rsync
-set zipfile=cwrsync.zip
-set downurl=https://itefix.net/download/free/cwrsync_6.3.0_x64_free.zip
-set currpath=%~dp0
-set "rsynchome=%ProgramFiles%\%zipfile:~0,-4%"
-set passfile=%temp%\.password
-set syncdir=dist/
-:: ������Ҫ����ͬ��������
-set accountwithost=kszny@192.168.4.142::line
-set "password=kszny@123"
-set "runcommand=%cmdstr% --port=873 -rlptvz --progress --password-file=%passfile% --exclude=google.exe --exclude=Lodap.zip %syncdir% %accountwithost%"
-
-where %cmdstr% >nul 2>nul
-::�д��������˵�������ڸ�����
-if %errorlevel% neq 0 (
-    ::��δ���ذ�װ����δ������ѹ����װĿ¼
-    if not exist "%rsynchome%" (
-        :: ������������ԱȨ��
-        echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\runAsAdmin.vbs"
-        echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\runAsAdmin.vbs"
-        "%temp%\runAsAdmin.vbs"
-        :: ��Ҫ��������ԱȨ�޲��ܴ�����Ŀ¼
-        mkdir "%rsynchome%"
-        del "%temp%\runAsAdmin.vbs"
-        exit /B
-    )
-
-    :: ʹ��powershell��curl����������
-    powershell curl  -o %temp%\%zipfile% %downurl%
-    :: ��ѹ
-    tar -xf "%temp%\%zipfile%" -C "%rsynchome%"
-    echo "%cmdstr%�Ѿ���װ����%rsynchome%Ŀ¼��"
-
-    :: ���·���Ƿ������ PATH ��
-    set "found=false"
-    for %%I in ("%PATH:;=";"%") do (
-        if /I "%%~I"=="%rsynchome%\bin" (
-            set "found=true"
-        )
-    )
-
-    :: δ���õ�path�����У����ӵ�path����
-    if "!found!"=="false" (
-        :: ����ע����е� PATH ������ͨ��setx��ʽ������ֵ���ȳ���1024���ַ��ͻᱻ�ض�
-        reg add "HKCU\Environment" /v PATH /t REG_EXPAND_SZ /d "%PATH%;%rsynchome%\bin" /f
-    )
-
-)
-
-::��ǰĿ¼��û��distĿ¼
-if not exist "%currpath%%syncdir%" (
-    echo ��ǰĿ¼��û����Ҫͬ����%syncdir%Ŀ¼�������Ҫͬ����%syncdir%Ŀ¼��������ǰĿ¼�£�
-) else (
-    echo !password!>%passfile%
-    echo ����ͬ����ʼ�����Ժ�...
-    !runcommand! && (
-        echo ����ͬ�����!
-    ) || (
-        echo !runcommand!
-        echo ����ͬ��ʧ�ܣ���ȷ���Ƿ�����VPN��
-    )
-    del %passfile%
-)
-
-endlocal
-pause
diff --git a/yarn.lock b/yarn.lock
index 98b36595..f8044c12 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,871 +3,888 @@
 
 
 "@achrinza/node-ipc@9.2.2":
-  "integrity" "sha512-b90U39dx0cU6emsOvy5hxU4ApNXnE3+Tuo8XQZfiKTGelDwpMwBVgBP7QX6dGTcJgu/miyJuNJ/2naFBliNWEw=="
-  "resolved" "https://registry.npmmirror.com/@achrinza/node-ipc/-/node-ipc-9.2.2.tgz"
-  "version" "9.2.2"
+  version "9.2.2"
+  resolved "https://registry.npmmirror.com/@achrinza/node-ipc/-/node-ipc-9.2.2.tgz"
+  integrity sha512-b90U39dx0cU6emsOvy5hxU4ApNXnE3+Tuo8XQZfiKTGelDwpMwBVgBP7QX6dGTcJgu/miyJuNJ/2naFBliNWEw==
   dependencies:
     "@node-ipc/js-queue" "2.0.3"
-    "event-pubsub" "4.3.0"
-    "js-message" "1.0.7"
+    event-pubsub "4.3.0"
+    js-message "1.0.7"
 
 "@ampproject/remapping@^2.2.0":
-  "integrity" "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg=="
-  "resolved" "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.1.tgz"
-  "version" "2.2.1"
+  version "2.2.1"
+  resolved "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.1.tgz"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.13":
-  "integrity" "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w=="
-  "resolved" "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.22.13.tgz"
-  "version" "7.22.13"
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.22.5.tgz"
+  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
   dependencies:
-    "@babel/highlight" "^7.22.13"
-    "chalk" "^2.4.2"
+    "@babel/highlight" "^7.22.5"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.2":
-  "integrity" "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.23.2.tgz"
-  "version" "7.23.2"
+"@babel/compat-data@^7.22.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.22.9.tgz"
+  integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
 
 "@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.0.0-0 || ^8.0.0-0 <8.0.0", "@babel/core@^7.11.0", "@babel/core@^7.12.0", "@babel/core@^7.13.0", "@babel/core@^7.4.0 || ^8.0.0-0 <8.0.0":
-  "integrity" "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/core/-/core-7.23.2.tgz"
-  "version" "7.23.2"
+  version "7.22.9"
+  resolved "https://registry.npmmirror.com/@babel/core/-/core-7.22.9.tgz"
+  integrity sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-module-transforms" "^7.23.0"
-    "@babel/helpers" "^7.23.2"
-    "@babel/parser" "^7.23.0"
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.2"
-    "@babel/types" "^7.23.0"
-    "convert-source-map" "^2.0.0"
-    "debug" "^4.1.0"
-    "gensync" "^1.0.0-beta.2"
-    "json5" "^2.2.3"
-    "semver" "^6.3.1"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.9"
+    "@babel/helper-module-transforms" "^7.22.9"
+    "@babel/helpers" "^7.22.6"
+    "@babel/parser" "^7.22.7"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.8"
+    "@babel/types" "^7.22.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
+    semver "^6.3.1"
 
-"@babel/generator@^7.23.0":
-  "integrity" "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g=="
-  "resolved" "https://registry.npmmirror.com/@babel/generator/-/generator-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/generator@^7.22.7", "@babel/generator@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.npmmirror.com/@babel/generator/-/generator-7.22.9.tgz"
+  integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==
   dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.22.5"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
-    "jsesc" "^2.5.1"
+    jsesc "^2.5.1"
 
 "@babel/helper-annotate-as-pure@^7.22.5":
-  "integrity" "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz"
+  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
   dependencies:
     "@babel/types" "^7.22.5"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
-  "integrity" "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz"
-  "version" "7.22.15"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz"
+  integrity sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.9.6":
-  "integrity" "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.22.9", "@babel/helper-compilation-targets@^7.9.6":
+  version "7.22.9"
+  resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz"
+  integrity sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==
   dependencies:
     "@babel/compat-data" "^7.22.9"
-    "@babel/helper-validator-option" "^7.22.15"
-    "browserslist" "^4.21.9"
-    "lru-cache" "^5.1.1"
-    "semver" "^6.3.1"
+    "@babel/helper-validator-option" "^7.22.5"
+    browserslist "^4.21.9"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.11", "@babel/helper-create-class-features-plugin@^7.22.15", "@babel/helper-create-class-features-plugin@^7.22.5":
-  "integrity" "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.5", "@babel/helper-create-class-features-plugin@^7.22.6":
+  version "7.22.9"
+  resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz"
+  integrity sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
     "@babel/helper-environment-visitor" "^7.22.5"
     "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
     "@babel/helper-optimise-call-expression" "^7.22.5"
     "@babel/helper-replace-supers" "^7.22.9"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "semver" "^6.3.1"
+    semver "^6.3.1"
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
-  "integrity" "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz"
-  "version" "7.22.15"
+  version "7.22.9"
+  resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz"
+  integrity sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "regexpu-core" "^5.3.1"
-    "semver" "^6.3.1"
+    regexpu-core "^5.3.1"
+    semver "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.4.3":
-  "integrity" "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz"
-  "version" "0.4.3"
+"@babel/helper-define-polyfill-provider@^0.4.2":
+  version "0.4.2"
+  resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz"
+  integrity sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "debug" "^4.1.1"
-    "lodash.debounce" "^4.0.8"
-    "resolve" "^1.14.2"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
 
-"@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5":
-  "integrity" "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz"
-  "version" "7.22.20"
+"@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz"
+  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
 
-"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
-  "integrity" "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/helper-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz"
+  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
   dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
 "@babel/helper-hoist-variables@^7.22.5":
-  "integrity" "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.22.15":
-  "integrity" "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/helper-member-expression-to-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz"
+  integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
   dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.8.3":
-  "integrity" "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz"
+  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.23.0":
-  "integrity" "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz"
+  integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.22.5"
 
 "@babel/helper-optimise-call-expression@^7.22.5":
-  "integrity" "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
   dependencies:
     "@babel/types" "^7.22.5"
 
 "@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.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  "integrity" "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-remap-async-to-generator@^7.22.20", "@babel/helper-remap-async-to-generator@^7.22.5":
-  "integrity" "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz"
-  "version" "7.22.20"
+"@babel/helper-remap-async-to-generator@^7.22.5":
+  version "7.22.9"
+  resolved "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz"
+  integrity sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-wrap-function" "^7.22.20"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-wrap-function" "^7.22.9"
 
-"@babel/helper-replace-supers@^7.22.20", "@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
-  "integrity" "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz"
-  "version" "7.22.20"
+"@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.npmmirror.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz"
+  integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
     "@babel/helper-optimise-call-expression" "^7.22.5"
 
 "@babel/helper-simple-access@^7.22.5":
-  "integrity" "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
   dependencies:
     "@babel/types" "^7.22.5"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
-  "integrity" "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz"
+  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
   dependencies:
     "@babel/types" "^7.22.5"
 
 "@babel/helper-split-export-declaration@^7.22.6":
-  "integrity" "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz"
-  "version" "7.22.6"
+  version "7.22.6"
+  resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
   dependencies:
     "@babel/types" "^7.22.5"
 
 "@babel/helper-string-parser@^7.22.5":
-  "integrity" "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
-"@babel/helper-validator-identifier@^7.22.20":
-  "integrity" "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"
-  "version" "7.22.20"
+"@babel/helper-validator-identifier@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz"
+  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
 
-"@babel/helper-validator-option@^7.22.15":
-  "integrity" "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/helper-validator-option@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz"
+  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
 
-"@babel/helper-wrap-function@^7.22.20":
-  "integrity" "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz"
-  "version" "7.22.20"
+"@babel/helper-wrap-function@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.9.tgz"
+  integrity sha512-sZ+QzfauuUEfxSEjKFmi3qDSHgLsTPK/pEpoD/qonZKOtTPTLbf59oabPQ4rKekt9lFcj/hTZaOhWwFYrgjk+Q==
   dependencies:
     "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.22.19"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helpers@^7.23.2":
-  "integrity" "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.23.2.tgz"
-  "version" "7.23.2"
+"@babel/helpers@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.22.6.tgz"
+  integrity sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==
   dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.2"
-    "@babel/types" "^7.23.0"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/highlight@^7.22.13":
-  "integrity" "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg=="
-  "resolved" "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.22.20.tgz"
-  "version" "7.22.20"
+"@babel/highlight@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.22.5.tgz"
+  integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
-    "chalk" "^2.4.2"
-    "js-tokens" "^4.0.0"
+    "@babel/helper-validator-identifier" "^7.22.5"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
 
 "@babel/parser@^7.18.4", "@babel/parser@^7.7.0", "@babel/parser@7.18.4":
-  "integrity" "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="
-  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.18.4.tgz"
-  "version" "7.18.4"
+  version "7.18.4"
+  resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.18.4.tgz"
+  integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==
 
-"@babel/parser@^7.22.15":
-  "integrity" "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
-  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/parser@^7.20.15":
+  version "7.22.7"
+  resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
+  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
 
-"@babel/parser@^7.23.0":
-  "integrity" "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
-  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/parser@^7.21.3":
+  version "7.22.7"
+  resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
+  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.15":
-  "integrity" "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/parser@^7.22.5":
+  version "7.22.7"
+  resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
+  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
+
+"@babel/parser@^7.22.7":
+  version "7.22.7"
+  resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
+  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz"
+  integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.15":
-  "integrity" "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz"
+  integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.22.15"
+    "@babel/plugin-transform-optional-chaining" "^7.22.5"
 
 "@babel/plugin-proposal-class-properties@^7.8.3":
-  "integrity" "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"
-  "version" "7.18.6"
+  version "7.18.6"
+  resolved "https://registry.npmmirror.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-decorators@^7.8.3":
-  "integrity" "sha512-eR0gJQc830fJVGz37oKLvt9W9uUIQSAovUl0e9sJ3YeO09dlcoBVYD3CLrjCj4qHdXmfiyTyFt8yeQYSN5fxLg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.2.tgz"
-  "version" "7.23.2"
+  version "7.22.7"
+  resolved "https://registry.npmmirror.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.7.tgz"
+  integrity sha512-omXqPF7Onq4Bb7wHxXjM3jSMSJvUUbvDvmmds7KI5n9Cq6Ln5I05I1W2nRlRof1rGdiUxJrxwe285WF96XlBXQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-create-class-features-plugin" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-replace-supers" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/plugin-syntax-decorators" "^7.22.10"
+    "@babel/plugin-syntax-decorators" "^7.22.5"
 
 "@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
-  "integrity" "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz"
-  "version" "7.21.0-placeholder-for-preset-env.2"
+  version "7.21.0-placeholder-for-preset-env.2"
+  resolved "https://registry.npmmirror.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz"
+  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
+
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.npmmirror.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"
+  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
-  "integrity" "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"
-  "version" "7.8.4"
+  version "7.8.4"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-class-properties@^7.12.13":
-  "integrity" "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"
-  "version" "7.12.13"
+  version "7.12.13"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-syntax-class-static-block@^7.14.5":
-  "integrity" "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"
-  "version" "7.14.5"
+  version "7.14.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"
+  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.22.10":
-  "integrity" "sha512-z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.10.tgz"
-  "version" "7.22.10"
+"@babel/plugin-syntax-decorators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz"
+  integrity sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
-  "integrity" "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"
-  "version" "7.8.3"
+  version "7.8.3"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"
+  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-export-namespace-from@^7.8.3":
-  "integrity" "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"
-  "version" "7.8.3"
+  version "7.8.3"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"
+  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-syntax-import-assertions@^7.22.5":
-  "integrity" "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz"
+  integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-import-attributes@^7.22.5":
-  "integrity" "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz"
+  integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-import-meta@^7.10.4":
-  "integrity" "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"
-  "version" "7.10.4"
+  version "7.10.4"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-json-strings@^7.8.3":
-  "integrity" "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"
-  "version" "7.8.3"
+  version "7.8.3"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.8.3":
-  "integrity" "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz"
+  integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
-  "integrity" "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"
-  "version" "7.10.4"
+  version "7.10.4"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
-  "integrity" "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"
-  "version" "7.8.3"
+  version "7.8.3"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-numeric-separator@^7.10.4":
-  "integrity" "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"
-  "version" "7.10.4"
+  version "7.10.4"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  "integrity" "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"
-  "version" "7.8.3"
+  version "7.8.3"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  "integrity" "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"
-  "version" "7.8.3"
+  version "7.8.3"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-chaining@^7.8.3":
-  "integrity" "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"
-  "version" "7.8.3"
+  version "7.8.3"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-private-property-in-object@^7.14.5":
-  "integrity" "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"
-  "version" "7.14.5"
+  version "7.14.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"
+  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-top-level-await@^7.14.5":
-  "integrity" "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"
-  "version" "7.14.5"
+  version "7.14.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
-  "integrity" "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz"
-  "version" "7.18.6"
+  version "7.18.6"
+  resolved "https://registry.npmmirror.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz"
+  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-arrow-functions@^7.22.5":
-  "integrity" "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz"
+  integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-async-generator-functions@^7.23.2":
-  "integrity" "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz"
-  "version" "7.23.2"
+"@babel/plugin-transform-async-generator-functions@^7.22.7":
+  version "7.22.7"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.7.tgz"
+  integrity sha512-7HmE7pk/Fmke45TODvxvkxRMV9RazV+ZZzhOL9AG8G29TLrr3jkjwF7uJfxZ30EoXpO+LJkq4oA8NjO2DTnEDg==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-environment-visitor" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.20"
+    "@babel/helper-remap-async-to-generator" "^7.22.5"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
 "@babel/plugin-transform-async-to-generator@^7.22.5":
-  "integrity" "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz"
+  integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
   dependencies:
     "@babel/helper-module-imports" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-remap-async-to-generator" "^7.22.5"
 
 "@babel/plugin-transform-block-scoped-functions@^7.22.5":
-  "integrity" "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz"
+  integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoping@^7.23.0":
-  "integrity" "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/plugin-transform-block-scoping@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz"
+  integrity sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-class-properties@^7.22.5":
-  "integrity" "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz"
+  integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-class-static-block@^7.22.11":
-  "integrity" "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-class-static-block@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz"
+  integrity sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.11"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-transform-classes@^7.22.15":
-  "integrity" "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/plugin-transform-classes@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz"
+  integrity sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-environment-visitor" "^7.22.5"
     "@babel/helper-function-name" "^7.22.5"
     "@babel/helper-optimise-call-expression" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.9"
+    "@babel/helper-replace-supers" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "globals" "^11.1.0"
+    globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.22.5":
-  "integrity" "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz"
+  integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/template" "^7.22.5"
 
-"@babel/plugin-transform-destructuring@^7.23.0":
-  "integrity" "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/plugin-transform-destructuring@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz"
+  integrity sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^7.22.5":
-  "integrity" "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz"
-  "version" "7.22.5"
+"@babel/plugin-transform-dotall-regex@^7.22.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz"
+  integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-duplicate-keys@^7.22.5":
-  "integrity" "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz"
+  integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dynamic-import@^7.22.11":
-  "integrity" "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-dynamic-import@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz"
+  integrity sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
 "@babel/plugin-transform-exponentiation-operator@^7.22.5":
-  "integrity" "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz"
+  integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-export-namespace-from@^7.22.11":
-  "integrity" "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-export-namespace-from@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz"
+  integrity sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.22.15":
-  "integrity" "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/plugin-transform-for-of@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz"
+  integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-function-name@^7.22.5":
-  "integrity" "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz"
+  integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.5"
     "@babel/helper-function-name" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-json-strings@^7.22.11":
-  "integrity" "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-json-strings@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz"
+  integrity sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
 "@babel/plugin-transform-literals@^7.22.5":
-  "integrity" "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz"
+  integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-logical-assignment-operators@^7.22.11":
-  "integrity" "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-logical-assignment-operators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz"
+  integrity sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
 "@babel/plugin-transform-member-expression-literals@^7.22.5":
-  "integrity" "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz"
+  integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.23.0":
-  "integrity" "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/plugin-transform-modules-amd@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz"
+  integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-module-transforms" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.23.0":
-  "integrity" "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/plugin-transform-modules-commonjs@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz"
+  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-module-transforms" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.23.0":
-  "integrity" "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/plugin-transform-modules-systemjs@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz"
+  integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-module-transforms" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.22.5"
 
 "@babel/plugin-transform-modules-umd@^7.22.5":
-  "integrity" "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz"
+  integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
   dependencies:
     "@babel/helper-module-transforms" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
-  "integrity" "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz"
+  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-new-target@^7.22.5":
-  "integrity" "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz"
+  integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11":
-  "integrity" "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz"
+  integrity sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-transform-numeric-separator@^7.22.11":
-  "integrity" "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-numeric-separator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz"
+  integrity sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-transform-object-rest-spread@^7.22.15":
-  "integrity" "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/plugin-transform-object-rest-spread@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz"
+  integrity sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==
   dependencies:
-    "@babel/compat-data" "^7.22.9"
-    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.22.15"
+    "@babel/plugin-transform-parameters" "^7.22.5"
 
 "@babel/plugin-transform-object-super@^7.22.5":
-  "integrity" "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz"
+  integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-replace-supers" "^7.22.5"
 
-"@babel/plugin-transform-optional-catch-binding@^7.22.11":
-  "integrity" "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-optional-catch-binding@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz"
+  integrity sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-optional-chaining@^7.22.15", "@babel/plugin-transform-optional-chaining@^7.23.0":
-  "integrity" "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/plugin-transform-optional-chaining@^7.22.5", "@babel/plugin-transform-optional-chaining@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.6.tgz"
+  integrity sha512-Vd5HiWml0mDVtcLHIoEU5sw6HOUW/Zk0acLs/SAeuLzkGNOPc9DB4nkUajemhCmTIz3eiaKREZn2hQQqF79YTg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.22.15":
-  "integrity" "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/plugin-transform-parameters@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz"
+  integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-private-methods@^7.22.5":
-  "integrity" "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz"
+  integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-private-property-in-object@^7.22.11":
-  "integrity" "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-private-property-in-object@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz"
+  integrity sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.11"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
 "@babel/plugin-transform-property-literals@^7.22.5":
-  "integrity" "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz"
+  integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-regenerator@^7.22.10":
-  "integrity" "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz"
-  "version" "7.22.10"
+"@babel/plugin-transform-regenerator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz"
+  integrity sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
-    "regenerator-transform" "^0.15.2"
+    regenerator-transform "^0.15.1"
 
 "@babel/plugin-transform-reserved-words@^7.22.5":
-  "integrity" "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz"
+  integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-runtime@^7.11.0":
-  "integrity" "sha512-XOntj6icgzMS58jPVtQpiuF6ZFWxQiJavISGx5KGjRj+3gqZr8+N6Kx+N9BApWzgS+DOjIZfXXj0ZesenOWDyA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.2.tgz"
-  "version" "7.23.2"
+  version "7.22.9"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz"
+  integrity sha512-9KjBH61AGJetCPYp/IEyLEp47SyybZb0nDRpBvmtEkm+rUIwxdlKpyNHI1TmsGkeuLclJdleQHRZ8XLBnnh8CQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-module-imports" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "babel-plugin-polyfill-corejs2" "^0.4.6"
-    "babel-plugin-polyfill-corejs3" "^0.8.5"
-    "babel-plugin-polyfill-regenerator" "^0.5.3"
-    "semver" "^6.3.1"
+    babel-plugin-polyfill-corejs2 "^0.4.4"
+    babel-plugin-polyfill-corejs3 "^0.8.2"
+    babel-plugin-polyfill-regenerator "^0.5.1"
+    semver "^6.3.1"
 
 "@babel/plugin-transform-shorthand-properties@^7.22.5":
-  "integrity" "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz"
+  integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-spread@^7.22.5":
-  "integrity" "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz"
+  integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
 "@babel/plugin-transform-sticky-regex@^7.22.5":
-  "integrity" "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz"
+  integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-template-literals@^7.22.5":
-  "integrity" "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz"
+  integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-typeof-symbol@^7.22.5":
-  "integrity" "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz"
+  integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-escapes@^7.22.10":
-  "integrity" "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz"
-  "version" "7.22.10"
+"@babel/plugin-transform-unicode-escapes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz"
+  integrity sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-unicode-property-regex@^7.22.5":
-  "integrity" "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz"
+  integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-unicode-regex@^7.22.5":
-  "integrity" "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz"
+  integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-unicode-sets-regex@^7.22.5":
-  "integrity" "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz"
-  "version" "7.22.5"
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz"
+  integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/preset-env@^7.11.0":
-  "integrity" "sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/preset-env/-/preset-env-7.23.2.tgz"
-  "version" "7.23.2"
+  version "7.22.9"
+  resolved "https://registry.npmmirror.com/@babel/preset-env/-/preset-env-7.22.9.tgz"
+  integrity sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==
   dependencies:
-    "@babel/compat-data" "^7.23.2"
-    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.9"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.15"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.15"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.15"
+    "@babel/helper-validator-option" "^7.22.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.5"
     "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
@@ -888,174 +905,176 @@
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
     "@babel/plugin-transform-arrow-functions" "^7.22.5"
-    "@babel/plugin-transform-async-generator-functions" "^7.23.2"
+    "@babel/plugin-transform-async-generator-functions" "^7.22.7"
     "@babel/plugin-transform-async-to-generator" "^7.22.5"
     "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
-    "@babel/plugin-transform-block-scoping" "^7.23.0"
+    "@babel/plugin-transform-block-scoping" "^7.22.5"
     "@babel/plugin-transform-class-properties" "^7.22.5"
-    "@babel/plugin-transform-class-static-block" "^7.22.11"
-    "@babel/plugin-transform-classes" "^7.22.15"
+    "@babel/plugin-transform-class-static-block" "^7.22.5"
+    "@babel/plugin-transform-classes" "^7.22.6"
     "@babel/plugin-transform-computed-properties" "^7.22.5"
-    "@babel/plugin-transform-destructuring" "^7.23.0"
+    "@babel/plugin-transform-destructuring" "^7.22.5"
     "@babel/plugin-transform-dotall-regex" "^7.22.5"
     "@babel/plugin-transform-duplicate-keys" "^7.22.5"
-    "@babel/plugin-transform-dynamic-import" "^7.22.11"
+    "@babel/plugin-transform-dynamic-import" "^7.22.5"
     "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
-    "@babel/plugin-transform-export-namespace-from" "^7.22.11"
-    "@babel/plugin-transform-for-of" "^7.22.15"
+    "@babel/plugin-transform-export-namespace-from" "^7.22.5"
+    "@babel/plugin-transform-for-of" "^7.22.5"
     "@babel/plugin-transform-function-name" "^7.22.5"
-    "@babel/plugin-transform-json-strings" "^7.22.11"
+    "@babel/plugin-transform-json-strings" "^7.22.5"
     "@babel/plugin-transform-literals" "^7.22.5"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.22.11"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.22.5"
     "@babel/plugin-transform-member-expression-literals" "^7.22.5"
-    "@babel/plugin-transform-modules-amd" "^7.23.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.23.0"
+    "@babel/plugin-transform-modules-amd" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
+    "@babel/plugin-transform-modules-systemjs" "^7.22.5"
     "@babel/plugin-transform-modules-umd" "^7.22.5"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
     "@babel/plugin-transform-new-target" "^7.22.5"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.11"
-    "@babel/plugin-transform-numeric-separator" "^7.22.11"
-    "@babel/plugin-transform-object-rest-spread" "^7.22.15"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.5"
+    "@babel/plugin-transform-numeric-separator" "^7.22.5"
+    "@babel/plugin-transform-object-rest-spread" "^7.22.5"
     "@babel/plugin-transform-object-super" "^7.22.5"
-    "@babel/plugin-transform-optional-catch-binding" "^7.22.11"
-    "@babel/plugin-transform-optional-chaining" "^7.23.0"
-    "@babel/plugin-transform-parameters" "^7.22.15"
+    "@babel/plugin-transform-optional-catch-binding" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.6"
+    "@babel/plugin-transform-parameters" "^7.22.5"
     "@babel/plugin-transform-private-methods" "^7.22.5"
-    "@babel/plugin-transform-private-property-in-object" "^7.22.11"
+    "@babel/plugin-transform-private-property-in-object" "^7.22.5"
     "@babel/plugin-transform-property-literals" "^7.22.5"
-    "@babel/plugin-transform-regenerator" "^7.22.10"
+    "@babel/plugin-transform-regenerator" "^7.22.5"
     "@babel/plugin-transform-reserved-words" "^7.22.5"
     "@babel/plugin-transform-shorthand-properties" "^7.22.5"
     "@babel/plugin-transform-spread" "^7.22.5"
     "@babel/plugin-transform-sticky-regex" "^7.22.5"
     "@babel/plugin-transform-template-literals" "^7.22.5"
     "@babel/plugin-transform-typeof-symbol" "^7.22.5"
-    "@babel/plugin-transform-unicode-escapes" "^7.22.10"
+    "@babel/plugin-transform-unicode-escapes" "^7.22.5"
     "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
     "@babel/plugin-transform-unicode-regex" "^7.22.5"
     "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
-    "@babel/preset-modules" "0.1.6-no-external-plugins"
-    "@babel/types" "^7.23.0"
-    "babel-plugin-polyfill-corejs2" "^0.4.6"
-    "babel-plugin-polyfill-corejs3" "^0.8.5"
-    "babel-plugin-polyfill-regenerator" "^0.5.3"
-    "core-js-compat" "^3.31.0"
-    "semver" "^6.3.1"
+    "@babel/preset-modules" "^0.1.5"
+    "@babel/types" "^7.22.5"
+    babel-plugin-polyfill-corejs2 "^0.4.4"
+    babel-plugin-polyfill-corejs3 "^0.8.2"
+    babel-plugin-polyfill-regenerator "^0.5.1"
+    core-js-compat "^3.31.0"
+    semver "^6.3.1"
 
-"@babel/preset-modules@0.1.6-no-external-plugins":
-  "integrity" "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA=="
-  "resolved" "https://registry.npmmirror.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz"
-  "version" "0.1.6-no-external-plugins"
+"@babel/preset-modules@^0.1.5":
+  version "0.1.6"
+  resolved "https://registry.npmmirror.com/@babel/preset-modules/-/preset-modules-0.1.6.tgz"
+  integrity sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
     "@babel/types" "^7.4.4"
-    "esutils" "^2.0.2"
+    esutils "^2.0.2"
 
 "@babel/regjsgen@^0.8.0":
-  "integrity" "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
-  "resolved" "https://registry.npmmirror.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz"
-  "version" "0.8.0"
+  version "0.8.0"
+  resolved "https://registry.npmmirror.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz"
+  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
 "@babel/runtime@^7.11.0", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4":
-  "integrity" "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg=="
-  "resolved" "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.23.2.tgz"
-  "version" "7.23.2"
+  version "7.22.6"
+  resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.6.tgz"
+  integrity sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==
   dependencies:
-    "regenerator-runtime" "^0.14.0"
+    regenerator-runtime "^0.13.11"
 
-"@babel/template@^7.22.15", "@babel/template@^7.22.5":
-  "integrity" "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w=="
-  "resolved" "https://registry.npmmirror.com/@babel/template/-/template-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/template@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/template/-/template-7.22.5.tgz"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
   dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/parser" "^7.22.15"
-    "@babel/types" "^7.22.15"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/traverse@^7.22.5", "@babel/traverse@^7.23.2", "@babel/traverse@^7.7.0":
-  "integrity" "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw=="
-  "resolved" "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.23.2.tgz"
-  "version" "7.23.2"
+"@babel/traverse@^7.22.5", "@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8", "@babel/traverse@^7.7.0":
+  version "7.22.8"
+  resolved "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.22.8.tgz"
+  integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==
   dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.7"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.0"
-    "@babel/types" "^7.23.0"
-    "debug" "^4.1.0"
-    "globals" "^11.1.0"
+    "@babel/parser" "^7.22.7"
+    "@babel/types" "^7.22.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
 
-"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  "integrity" "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg=="
-  "resolved" "https://registry.npmmirror.com/@babel/types/-/types-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/types@^7.22.5", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.22.5"
+  resolved "https://registry.npmmirror.com/@babel/types/-/types-7.22.5.tgz"
+  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
   dependencies:
     "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
-    "to-fast-properties" "^2.0.0"
+    "@babel/helper-validator-identifier" "^7.22.5"
+    to-fast-properties "^2.0.0"
 
 "@bpmn-io/diagram-js-ui@^0.2.2":
-  "integrity" "sha512-IgOIxOwoqsFB2mMPdXtcbPVPjdYkZ3huW7ipowYLhg5jdRGHlBronQ+LER+lfWro6sPtzEsw7qX8D8Yq9M2S5g=="
-  "resolved" "https://registry.npmmirror.com/@bpmn-io/diagram-js-ui/-/diagram-js-ui-0.2.2.tgz"
-  "version" "0.2.2"
+  version "0.2.2"
+  resolved "https://registry.npmmirror.com/@bpmn-io/diagram-js-ui/-/diagram-js-ui-0.2.2.tgz"
+  integrity sha512-IgOIxOwoqsFB2mMPdXtcbPVPjdYkZ3huW7ipowYLhg5jdRGHlBronQ+LER+lfWro6sPtzEsw7qX8D8Yq9M2S5g==
   dependencies:
-    "htm" "^3.1.1"
-    "preact" "^10.11.2"
+    htm "^3.1.1"
+    preact "^10.11.2"
 
 "@bpmn-io/element-templates-validator@^0.2.0":
-  "integrity" "sha512-/ogp0+6zUFdoiY09NYaHL5JtapB8zN1spG8hpML96qetXDCODRxnsqlHTvSwxtZHUDcgun+lxcK8b4wgtCP+6Q=="
-  "resolved" "https://registry.npmmirror.com/@bpmn-io/element-templates-validator/-/element-templates-validator-0.2.0.tgz"
-  "version" "0.2.0"
+  version "0.2.0"
+  resolved "https://registry.npmmirror.com/@bpmn-io/element-templates-validator/-/element-templates-validator-0.2.0.tgz"
+  integrity sha512-/ogp0+6zUFdoiY09NYaHL5JtapB8zN1spG8hpML96qetXDCODRxnsqlHTvSwxtZHUDcgun+lxcK8b4wgtCP+6Q==
   dependencies:
     "@camunda/element-templates-json-schema" "^0.4.0"
-    "json-source-map" "^0.6.1"
-    "min-dash" "^3.7.0"
+    json-source-map "^0.6.1"
+    min-dash "^3.7.0"
 
 "@bpmn-io/extract-process-variables@^0.4.3":
-  "integrity" "sha512-LtHx5b9xqS8avRLrq/uTlKhWzMeV3bWQKIdDic2bdo5n9roitX13GRb01u2S0hSsKDWEhXQtydFYN2b6G7bqfw=="
-  "resolved" "https://registry.npmmirror.com/@bpmn-io/extract-process-variables/-/extract-process-variables-0.4.5.tgz"
-  "version" "0.4.5"
+  version "0.4.5"
+  resolved "https://registry.npmmirror.com/@bpmn-io/extract-process-variables/-/extract-process-variables-0.4.5.tgz"
+  integrity sha512-LtHx5b9xqS8avRLrq/uTlKhWzMeV3bWQKIdDic2bdo5n9roitX13GRb01u2S0hSsKDWEhXQtydFYN2b6G7bqfw==
   dependencies:
-    "min-dash" "^3.8.1"
+    min-dash "^3.8.1"
 
 "@camunda/element-templates-json-schema@^0.4.0":
-  "integrity" "sha512-M5xW61ba7z2maBxfoT4c1bjuLD8OIL7863et/hULiNG6+R/B9CZ4Qze1juuIfXv4zpF2fYSuUsTPkTtiZrcspQ=="
-  "resolved" "https://registry.npmmirror.com/@camunda/element-templates-json-schema/-/element-templates-json-schema-0.4.0.tgz"
-  "version" "0.4.0"
+  version "0.4.0"
+  resolved "https://registry.npmmirror.com/@camunda/element-templates-json-schema/-/element-templates-json-schema-0.4.0.tgz"
+  integrity sha512-M5xW61ba7z2maBxfoT4c1bjuLD8OIL7863et/hULiNG6+R/B9CZ4Qze1juuIfXv4zpF2fYSuUsTPkTtiZrcspQ==
 
 "@claviska/jquery-minicolors@^2.3.6":
-  "integrity" "sha512-8Ro6D4GCrmOl41+6w4NFhEOpx8vjxwVRI69bulXsFDt49uVRKhLU5TnzEV7AmOJrylkVq+ugnYNMiGHBieeKUQ=="
-  "resolved" "https://registry.npmmirror.com/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.6.tgz"
-  "version" "2.3.6"
+  version "2.3.6"
+  resolved "https://registry.npmmirror.com/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.6.tgz"
+  integrity sha512-8Ro6D4GCrmOl41+6w4NFhEOpx8vjxwVRI69bulXsFDt49uVRKhLU5TnzEV7AmOJrylkVq+ugnYNMiGHBieeKUQ==
 
 "@gar/promisify@^1.0.1":
-  "integrity" "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="
-  "resolved" "https://registry.npmmirror.com/@gar/promisify/-/promisify-1.1.3.tgz"
-  "version" "1.1.3"
+  version "1.1.3"
+  resolved "https://registry.npmmirror.com/@gar/promisify/-/promisify-1.1.3.tgz"
+  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
 "@hapi/address@2.x.x":
-  "integrity" "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="
-  "resolved" "https://registry.npmmirror.com/@hapi/address/-/address-2.1.4.tgz"
-  "version" "2.1.4"
+  version "2.1.4"
+  resolved "https://registry.npmmirror.com/@hapi/address/-/address-2.1.4.tgz"
+  integrity sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==
 
 "@hapi/bourne@1.x.x":
-  "integrity" "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="
-  "resolved" "https://registry.npmmirror.com/@hapi/bourne/-/bourne-1.3.2.tgz"
-  "version" "1.3.2"
+  version "1.3.2"
+  resolved "https://registry.npmmirror.com/@hapi/bourne/-/bourne-1.3.2.tgz"
+  integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==
 
 "@hapi/hoek@^8.3.0", "@hapi/hoek@8.x.x":
-  "integrity" "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="
-  "resolved" "https://registry.npmmirror.com/@hapi/hoek/-/hoek-8.5.1.tgz"
-  "version" "8.5.1"
+  version "8.5.1"
+  resolved "https://registry.npmmirror.com/@hapi/hoek/-/hoek-8.5.1.tgz"
+  integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==
 
 "@hapi/joi@^15.0.1":
-  "integrity" "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="
-  "resolved" "https://registry.npmmirror.com/@hapi/joi/-/joi-15.1.1.tgz"
-  "version" "15.1.1"
+  version "15.1.1"
+  resolved "https://registry.npmmirror.com/@hapi/joi/-/joi-15.1.1.tgz"
+  integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==
   dependencies:
     "@hapi/address" "2.x.x"
     "@hapi/bourne" "1.x.x"
@@ -1063,32 +1082,32 @@
     "@hapi/topo" "3.x.x"
 
 "@hapi/topo@3.x.x":
-  "integrity" "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="
-  "resolved" "https://registry.npmmirror.com/@hapi/topo/-/topo-3.1.6.tgz"
-  "version" "3.1.6"
+  version "3.1.6"
+  resolved "https://registry.npmmirror.com/@hapi/topo/-/topo-3.1.6.tgz"
+  integrity sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==
   dependencies:
     "@hapi/hoek" "^8.3.0"
 
 "@intervolga/optimize-cssnano-plugin@^1.0.5":
-  "integrity" "sha512-zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA=="
-  "resolved" "https://registry.npmmirror.com/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz"
-  "version" "1.0.6"
+  version "1.0.6"
+  resolved "https://registry.npmmirror.com/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz"
+  integrity sha512-zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA==
   dependencies:
-    "cssnano" "^4.0.0"
-    "cssnano-preset-default" "^4.0.0"
-    "postcss" "^7.0.0"
+    cssnano "^4.0.0"
+    cssnano-preset-default "^4.0.0"
+    postcss "^7.0.0"
 
 "@jiaminghi/bezier-curve@*":
-  "integrity" "sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw=="
-  "resolved" "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz"
-  "version" "0.0.9"
+  version "0.0.9"
+  resolved "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz"
+  integrity sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==
   dependencies:
     "@babel/runtime" "^7.5.5"
 
 "@jiaminghi/c-render@^0.4.3":
-  "integrity" "sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q=="
-  "resolved" "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz"
-  "version" "0.4.3"
+  version "0.4.3"
+  resolved "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz"
+  integrity sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q==
   dependencies:
     "@babel/runtime" "^7.5.5"
     "@jiaminghi/bezier-curve" "*"
@@ -1096,170 +1115,175 @@
     "@jiaminghi/transition" "*"
 
 "@jiaminghi/charts@*":
-  "integrity" "sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA=="
-  "resolved" "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz"
-  "version" "0.2.18"
+  version "0.2.18"
+  resolved "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz"
+  integrity sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA==
   dependencies:
     "@babel/runtime" "^7.5.5"
     "@jiaminghi/c-render" "^0.4.3"
 
 "@jiaminghi/color@*":
-  "integrity" "sha512-ZY3hdorgODk4OSTbxyXBPxAxHPIVf9rPlKJyK1C1db46a50J0reFKpAvfZG8zMG3lvM60IR7Qawgcu4ZDO3+Hg=="
-  "resolved" "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz"
-  "version" "1.1.3"
+  version "1.1.3"
+  resolved "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz"
+  integrity sha512-ZY3hdorgODk4OSTbxyXBPxAxHPIVf9rPlKJyK1C1db46a50J0reFKpAvfZG8zMG3lvM60IR7Qawgcu4ZDO3+Hg==
 
 "@jiaminghi/data-view@^2.10.0":
-  "integrity" "sha512-Cud2MTiMcqc5k2KWabR/svuVQmXHANqURo+yj40370/LdI/gyUJ6LG203hWXEnT1nMCeiv/SLVmxv3PXLScCeA=="
-  "resolved" "https://registry.npmmirror.com/@jiaminghi/data-view/-/data-view-2.10.0.tgz"
-  "version" "2.10.0"
+  version "2.10.0"
+  resolved "https://registry.npmmirror.com/@jiaminghi/data-view/-/data-view-2.10.0.tgz"
+  integrity sha512-Cud2MTiMcqc5k2KWabR/svuVQmXHANqURo+yj40370/LdI/gyUJ6LG203hWXEnT1nMCeiv/SLVmxv3PXLScCeA==
   dependencies:
     "@babel/runtime" "^7.5.5"
     "@jiaminghi/charts" "*"
 
 "@jiaminghi/transition@*":
-  "integrity" "sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg=="
-  "resolved" "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz"
-  "version" "1.1.11"
+  version "1.1.11"
+  resolved "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz"
+  integrity sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg==
   dependencies:
     "@babel/runtime" "^7.5.5"
 
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  "integrity" "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ=="
-  "resolved" "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz"
-  "version" "0.3.3"
+  version "0.3.3"
+  resolved "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
   dependencies:
     "@jridgewell/set-array" "^1.0.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@^3.1.0":
-  "integrity" "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="
-  "resolved" "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz"
-  "version" "3.1.1"
+"@jridgewell/resolve-uri@3.1.0":
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
 "@jridgewell/set-array@^1.0.1":
-  "integrity" "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
-  "resolved" "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.1.2.tgz"
-  "version" "1.1.2"
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.1.2.tgz"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
 "@jridgewell/source-map@^0.3.3":
-  "integrity" "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ=="
-  "resolved" "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.5.tgz"
-  "version" "0.3.5"
+  version "0.3.5"
+  resolved "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.5.tgz"
+  integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
-  "integrity" "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
-  "resolved" "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
-  "version" "1.4.15"
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.15":
+  version "1.4.15"
+  resolved "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
+"@jridgewell/sourcemap-codec@1.4.14":
+  version "1.4.14"
+  resolved "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
 "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  "integrity" "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q=="
-  "resolved" "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz"
-  "version" "0.3.20"
+  version "0.3.18"
+  resolved "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz"
+  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
   dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
-  "integrity" "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="
-  "resolved" "https://registry.npmmirror.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"
-  "version" "2.2.1"
+  version "2.2.1"
+  resolved "https://registry.npmmirror.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
   dependencies:
-    "call-me-maybe" "^1.0.1"
-    "glob-to-regexp" "^0.3.0"
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
 
 "@node-ipc/js-queue@2.0.3":
-  "integrity" "sha512-fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw=="
-  "resolved" "https://registry.npmmirror.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz"
-  "version" "2.0.3"
+  version "2.0.3"
+  resolved "https://registry.npmmirror.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz"
+  integrity sha512-fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw==
   dependencies:
-    "easy-stack" "1.0.1"
+    easy-stack "1.0.1"
 
 "@nodelib/fs.stat@^1.1.2":
-  "integrity" "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
-  "resolved" "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz"
-  "version" "1.1.3"
+  version "1.1.3"
+  resolved "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
 "@npmcli/fs@^1.0.0":
-  "integrity" "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="
-  "resolved" "https://registry.npmmirror.com/@npmcli/fs/-/fs-1.1.1.tgz"
-  "version" "1.1.1"
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/@npmcli/fs/-/fs-1.1.1.tgz"
+  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
   dependencies:
     "@gar/promisify" "^1.0.1"
-    "semver" "^7.3.5"
+    semver "^7.3.5"
 
 "@npmcli/move-file@^1.0.1":
-  "integrity" "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="
-  "resolved" "https://registry.npmmirror.com/@npmcli/move-file/-/move-file-1.1.2.tgz"
-  "version" "1.1.2"
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/@npmcli/move-file/-/move-file-1.1.2.tgz"
+  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
   dependencies:
-    "mkdirp" "^1.0.4"
-    "rimraf" "^3.0.2"
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
 
 "@riophae/vue-treeselect@0.4.0":
-  "integrity" "sha512-J4atYmBqXQmiPFK/0B5sXKjtnGc21mBJEiyKIDZwk0Q9XuynVFX6IJ4EpaLmUgL5Tve7HAS7wkiGGSti6Uaxcg=="
-  "resolved" "https://registry.npmmirror.com/@riophae/vue-treeselect/-/vue-treeselect-0.4.0.tgz"
-  "version" "0.4.0"
+  version "0.4.0"
+  resolved "https://registry.npmmirror.com/@riophae/vue-treeselect/-/vue-treeselect-0.4.0.tgz"
+  integrity sha512-J4atYmBqXQmiPFK/0B5sXKjtnGc21mBJEiyKIDZwk0Q9XuynVFX6IJ4EpaLmUgL5Tve7HAS7wkiGGSti6Uaxcg==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    "babel-helper-vue-jsx-merge-props" "^2.0.3"
-    "easings-css" "^1.0.0"
-    "fuzzysearch" "^1.0.3"
-    "is-promise" "^2.1.0"
-    "lodash" "^4.0.0"
-    "material-colors" "^1.2.6"
-    "watch-size" "^2.0.0"
+    babel-helper-vue-jsx-merge-props "^2.0.3"
+    easings-css "^1.0.0"
+    fuzzysearch "^1.0.3"
+    is-promise "^2.1.0"
+    lodash "^4.0.0"
+    material-colors "^1.2.6"
+    watch-size "^2.0.0"
 
 "@socket.io/component-emitter@~3.1.0":
-  "integrity" "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
-  "resolved" "https://registry.npmmirror.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz"
-  "version" "3.1.0"
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz"
+  integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
 
 "@soda/friendly-errors-webpack-plugin@^1.7.1":
-  "integrity" "sha512-h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg=="
-  "resolved" "https://registry.npmmirror.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz"
-  "version" "1.8.1"
+  version "1.8.1"
+  resolved "https://registry.npmmirror.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz"
+  integrity sha512-h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg==
   dependencies:
-    "chalk" "^3.0.0"
-    "error-stack-parser" "^2.0.6"
-    "string-width" "^4.2.3"
-    "strip-ansi" "^6.0.1"
+    chalk "^3.0.0"
+    error-stack-parser "^2.0.6"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
 
 "@soda/get-current-script@^1.0.0":
-  "integrity" "sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w=="
-  "resolved" "https://registry.npmmirror.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz"
-  "version" "1.0.2"
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz"
+  integrity sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w==
 
 "@types/body-parser@*":
-  "integrity" "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA=="
-  "resolved" "https://registry.npmmirror.com/@types/body-parser/-/body-parser-1.19.4.tgz"
-  "version" "1.19.4"
+  version "1.19.2"
+  resolved "https://registry.npmmirror.com/@types/body-parser/-/body-parser-1.19.2.tgz"
+  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
 
 "@types/connect-history-api-fallback@*":
-  "integrity" "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q=="
-  "resolved" "https://registry.npmmirror.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz"
-  "version" "1.5.2"
+  version "1.5.0"
+  resolved "https://registry.npmmirror.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz"
+  integrity sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/node" "*"
 
 "@types/connect@*":
-  "integrity" "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q=="
-  "resolved" "https://registry.npmmirror.com/@types/connect/-/connect-3.4.37.tgz"
-  "version" "3.4.37"
+  version "3.4.35"
+  resolved "https://registry.npmmirror.com/@types/connect/-/connect-3.4.35.tgz"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
   dependencies:
     "@types/node" "*"
 
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
-  "integrity" "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ=="
-  "resolved" "https://registry.npmmirror.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz"
-  "version" "4.17.39"
+  version "4.17.35"
+  resolved "https://registry.npmmirror.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz"
+  integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -1267,9 +1291,9 @@
     "@types/send" "*"
 
 "@types/express@*":
-  "integrity" "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw=="
-  "resolved" "https://registry.npmmirror.com/@types/express/-/express-4.17.20.tgz"
-  "version" "4.17.20"
+  version "4.17.17"
+  resolved "https://registry.npmmirror.com/@types/express/-/express-4.17.17.tgz"
+  integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
@@ -1277,217 +1301,215 @@
     "@types/serve-static" "*"
 
 "@types/glob@^7.1.1":
-  "integrity" "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="
-  "resolved" "https://registry.npmmirror.com/@types/glob/-/glob-7.2.0.tgz"
-  "version" "7.2.0"
+  version "7.2.0"
+  resolved "https://registry.npmmirror.com/@types/glob/-/glob-7.2.0.tgz"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
   dependencies:
     "@types/minimatch" "*"
     "@types/node" "*"
 
 "@types/http-errors@*":
-  "integrity" "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA=="
-  "resolved" "https://registry.npmmirror.com/@types/http-errors/-/http-errors-2.0.3.tgz"
-  "version" "2.0.3"
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/@types/http-errors/-/http-errors-2.0.1.tgz"
+  integrity sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==
 
 "@types/http-proxy@^1.17.5":
-  "integrity" "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw=="
-  "resolved" "https://registry.npmmirror.com/@types/http-proxy/-/http-proxy-1.17.13.tgz"
-  "version" "1.17.13"
+  version "1.17.11"
+  resolved "https://registry.npmmirror.com/@types/http-proxy/-/http-proxy-1.17.11.tgz"
+  integrity sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==
   dependencies:
     "@types/node" "*"
 
 "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
-  "integrity" "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw=="
-  "resolved" "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.14.tgz"
-  "version" "7.0.14"
+  version "7.0.12"
+  resolved "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.12.tgz"
+  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
 
 "@types/json5@^0.0.29":
-  "integrity" "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
-  "resolved" "https://registry.npmmirror.com/@types/json5/-/json5-0.0.29.tgz"
-  "version" "0.0.29"
+  version "0.0.29"
+  resolved "https://registry.npmmirror.com/@types/json5/-/json5-0.0.29.tgz"
+  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/mime@*", "@types/mime@^1":
-  "integrity" "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw=="
-  "resolved" "https://registry.npmmirror.com/@types/mime/-/mime-1.3.4.tgz"
-  "version" "1.3.4"
+  version "1.3.2"
+  resolved "https://registry.npmmirror.com/@types/mime/-/mime-1.3.2.tgz"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
 "@types/minimatch@*":
-  "integrity" "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
-  "resolved" "https://registry.npmmirror.com/@types/minimatch/-/minimatch-5.1.2.tgz"
-  "version" "5.1.2"
+  version "5.1.2"
+  resolved "https://registry.npmmirror.com/@types/minimatch/-/minimatch-5.1.2.tgz"
+  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
 "@types/minimist@^1.2.0":
-  "integrity" "sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ=="
-  "resolved" "https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.4.tgz"
-  "version" "1.2.4"
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.2.tgz"
+  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
 "@types/node@*":
-  "integrity" "sha512-UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg=="
-  "resolved" "https://registry.npmmirror.com/@types/node/-/node-20.8.9.tgz"
-  "version" "20.8.9"
-  dependencies:
-    "undici-types" "~5.26.4"
+  version "20.4.5"
+  resolved "https://registry.npmmirror.com/@types/node/-/node-20.4.5.tgz"
+  integrity sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==
 
 "@types/normalize-package-data@^2.4.0":
-  "integrity" "sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg=="
-  "resolved" "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz"
-  "version" "2.4.3"
+  version "2.4.1"
+  resolved "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"
+  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
 "@types/q@^1.5.1":
-  "integrity" "sha512-HBPgtzp44867rkL+IzQ3560/E/BlobwCjeXsuKqogrcE99SKgZR4tvBBCuNJZMhUFMz26M7cjKWZg785lllwpA=="
-  "resolved" "https://registry.npmmirror.com/@types/q/-/q-1.5.7.tgz"
-  "version" "1.5.7"
+  version "1.5.5"
+  resolved "https://registry.npmmirror.com/@types/q/-/q-1.5.5.tgz"
+  integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==
 
 "@types/qs@*":
-  "integrity" "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg=="
-  "resolved" "https://registry.npmmirror.com/@types/qs/-/qs-6.9.9.tgz"
-  "version" "6.9.9"
+  version "6.9.7"
+  resolved "https://registry.npmmirror.com/@types/qs/-/qs-6.9.7.tgz"
+  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
 
 "@types/raf@^3.4.0":
-  "integrity" "sha512-sM4HyDVlDFl4goOXPF+g9nNHJFZQGot+HgySjM4cRjqXzjdatcEvYrtG4Ia8XumR9T6k8G2tW9B7hnUj51Uf0A=="
-  "resolved" "https://registry.npmmirror.com/@types/raf/-/raf-3.4.2.tgz"
-  "version" "3.4.2"
+  version "3.4.1"
+  resolved "https://registry.npmmirror.com/@types/raf/-/raf-3.4.1.tgz"
+  integrity sha512-1jJ3OO8FXHCcuVXCuO1EMC/MjDuT6/cxgsMw/UebkO9afnL99Y5QTpUjk7+flK4G5FzBVJEgDKL5eFtoxJs9MQ==
 
 "@types/range-parser@*":
-  "integrity" "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA=="
-  "resolved" "https://registry.npmmirror.com/@types/range-parser/-/range-parser-1.2.6.tgz"
-  "version" "1.2.6"
+  version "1.2.4"
+  resolved "https://registry.npmmirror.com/@types/range-parser/-/range-parser-1.2.4.tgz"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
 "@types/send@*":
-  "integrity" "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug=="
-  "resolved" "https://registry.npmmirror.com/@types/send/-/send-0.17.3.tgz"
-  "version" "0.17.3"
+  version "0.17.1"
+  resolved "https://registry.npmmirror.com/@types/send/-/send-0.17.1.tgz"
+  integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==
   dependencies:
     "@types/mime" "^1"
     "@types/node" "*"
 
 "@types/serve-static@*":
-  "integrity" "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw=="
-  "resolved" "https://registry.npmmirror.com/@types/serve-static/-/serve-static-1.15.4.tgz"
-  "version" "1.15.4"
+  version "1.15.2"
+  resolved "https://registry.npmmirror.com/@types/serve-static/-/serve-static-1.15.2.tgz"
+  integrity sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==
   dependencies:
     "@types/http-errors" "*"
     "@types/mime" "*"
     "@types/node" "*"
 
 "@types/source-list-map@*":
-  "integrity" "sha512-Kdfm7Sk5VX8dFW7Vbp18+fmAatBewzBILa1raHYxrGEFXT0jNl9x3LWfuW7bTbjEKFNey9Dfkj/UzT6z/NvRlg=="
-  "resolved" "https://registry.npmmirror.com/@types/source-list-map/-/source-list-map-0.1.4.tgz"
-  "version" "0.1.4"
+  version "0.1.2"
+  resolved "https://registry.npmmirror.com/@types/source-list-map/-/source-list-map-0.1.2.tgz"
+  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
 "@types/tapable@^1":
-  "integrity" "sha512-q8F20SdXG5fdVJQ5yxsVlH+f+oekP42QeHv4s5KlrxTMT0eopXn7ol1rhxMcksf8ph7XNv811iVDE2hOpUvEPg=="
-  "resolved" "https://registry.npmmirror.com/@types/tapable/-/tapable-1.0.10.tgz"
-  "version" "1.0.10"
+  version "1.0.8"
+  resolved "https://registry.npmmirror.com/@types/tapable/-/tapable-1.0.8.tgz"
+  integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==
 
 "@types/uglify-js@*":
-  "integrity" "sha512-ToldSfJ6wxO21cakcz63oFD1GjqQbKzhZCD57eH7zWuYT5UEZvfUoqvrjX5d+jB9g4a/sFO0n6QSVzzn5sMsjg=="
-  "resolved" "https://registry.npmmirror.com/@types/uglify-js/-/uglify-js-3.17.3.tgz"
-  "version" "3.17.3"
+  version "3.17.1"
+  resolved "https://registry.npmmirror.com/@types/uglify-js/-/uglify-js-3.17.1.tgz"
+  integrity sha512-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g==
   dependencies:
-    "source-map" "^0.6.1"
+    source-map "^0.6.1"
 
 "@types/webpack-dev-server@^3.11.0":
-  "integrity" "sha512-XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ=="
-  "resolved" "https://registry.npmmirror.com/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz"
-  "version" "3.11.6"
+  version "3.11.6"
+  resolved "https://registry.npmmirror.com/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz"
+  integrity sha512-XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ==
   dependencies:
     "@types/connect-history-api-fallback" "*"
     "@types/express" "*"
     "@types/serve-static" "*"
     "@types/webpack" "^4"
-    "http-proxy-middleware" "^1.0.0"
+    http-proxy-middleware "^1.0.0"
 
 "@types/webpack-sources@*":
-  "integrity" "sha512-acCzhuVe+UJy8abiSFQWXELhhNMZjQjQKpLNEi1pKGgKXZj0ul614ATcx4kkhunPost6Xw+aCq8y8cn1/WwAiA=="
-  "resolved" "https://registry.npmmirror.com/@types/webpack-sources/-/webpack-sources-3.2.2.tgz"
-  "version" "3.2.2"
+  version "3.2.0"
+  resolved "https://registry.npmmirror.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz"
+  integrity sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
-    "source-map" "^0.7.3"
+    source-map "^0.7.3"
 
 "@types/webpack@^4", "@types/webpack@^4.0.0":
-  "integrity" "sha512-XRC6HLGHtNfN8/xWeu1YUQV1GSE+28q8lSqvcJ+0xt/zW9Wmn4j9pCSvaXPyRlCKrl5OuqECQNEJUy2vo8oWqg=="
-  "resolved" "https://registry.npmmirror.com/@types/webpack/-/webpack-4.41.35.tgz"
-  "version" "4.41.35"
+  version "4.41.33"
+  resolved "https://registry.npmmirror.com/@types/webpack/-/webpack-4.41.33.tgz"
+  integrity sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==
   dependencies:
     "@types/node" "*"
     "@types/tapable" "^1"
     "@types/uglify-js" "*"
     "@types/webpack-sources" "*"
-    "anymatch" "^3.0.0"
-    "source-map" "^0.6.0"
+    anymatch "^3.0.0"
+    source-map "^0.6.0"
 
 "@videojs/http-streaming@2.16.2":
-  "integrity" "sha512-etPTUdCFu7gUWc+1XcbiPr+lrhOcBu3rV5OL1M+3PDW89zskScAkkcdqYzP4pFodBPye/ydamQoTDScOnElw5A=="
-  "resolved" "https://registry.npmmirror.com/@videojs/http-streaming/-/http-streaming-2.16.2.tgz"
-  "version" "2.16.2"
+  version "2.16.2"
+  resolved "https://registry.npmmirror.com/@videojs/http-streaming/-/http-streaming-2.16.2.tgz"
+  integrity sha512-etPTUdCFu7gUWc+1XcbiPr+lrhOcBu3rV5OL1M+3PDW89zskScAkkcdqYzP4pFodBPye/ydamQoTDScOnElw5A==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@videojs/vhs-utils" "3.0.5"
-    "aes-decrypter" "3.1.3"
-    "global" "^4.4.0"
-    "m3u8-parser" "4.8.0"
-    "mpd-parser" "^0.22.1"
-    "mux.js" "6.0.1"
-    "video.js" "^6 || ^7"
+    aes-decrypter "3.1.3"
+    global "^4.4.0"
+    m3u8-parser "4.8.0"
+    mpd-parser "^0.22.1"
+    mux.js "6.0.1"
+    video.js "^6 || ^7"
 
-"@videojs/http-streaming@3.7.0":
-  "integrity" "sha512-5uLFKBL8CvD56dxxJyuxqB5CY0tdoa4SE9KbXakeiAy6iFBUEPvTr2YGLKEWvQ8Lojs1wl+FQndLdv+GO7t9Fw=="
-  "resolved" "https://registry.npmmirror.com/@videojs/http-streaming/-/http-streaming-3.7.0.tgz"
-  "version" "3.7.0"
+"@videojs/http-streaming@3.5.3":
+  version "3.5.3"
+  resolved "https://registry.npmmirror.com/@videojs/http-streaming/-/http-streaming-3.5.3.tgz"
+  integrity sha512-dty8lsZk9QPc0i4It79tjWsmPiaC3FpgARFM0vJGko4k3yKNZIYkAk8kjiDRfkAQH/HZ3rYi5dDTriFNzwSsIg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@videojs/vhs-utils" "4.0.0"
-    "aes-decrypter" "4.0.1"
-    "global" "^4.4.0"
-    "m3u8-parser" "^7.1.0"
-    "mpd-parser" "^1.2.2"
-    "mux.js" "7.0.1"
-    "video.js" "^7 || ^8"
+    aes-decrypter "4.0.1"
+    global "^4.4.0"
+    m3u8-parser "^7.1.0"
+    mpd-parser "^1.1.1"
+    mux.js "7.0.0"
+    video.js "^7 || ^8"
 
 "@videojs/vhs-utils@^3.0.4", "@videojs/vhs-utils@^3.0.5", "@videojs/vhs-utils@3.0.5":
-  "integrity" "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw=="
-  "resolved" "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz"
-  "version" "3.0.5"
+  version "3.0.5"
+  resolved "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz"
+  integrity sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "global" "^4.4.0"
-    "url-toolkit" "^2.2.1"
+    global "^4.4.0"
+    url-toolkit "^2.2.1"
 
 "@videojs/vhs-utils@^4.0.0", "@videojs/vhs-utils@4.0.0":
-  "integrity" "sha512-xJp7Yd4jMLwje2vHCUmi8MOUU76nxiwII3z4Eg3Ucb+6rrkFVGosrXlMgGnaLjq724j3wzNElRZ71D/CKrTtxg=="
-  "resolved" "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-4.0.0.tgz"
-  "version" "4.0.0"
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-4.0.0.tgz"
+  integrity sha512-xJp7Yd4jMLwje2vHCUmi8MOUU76nxiwII3z4Eg3Ucb+6rrkFVGosrXlMgGnaLjq724j3wzNElRZ71D/CKrTtxg==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "global" "^4.4.0"
-    "url-toolkit" "^2.2.1"
+    global "^4.4.0"
+    url-toolkit "^2.2.1"
 
 "@videojs/xhr@2.6.0":
-  "integrity" "sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q=="
-  "resolved" "https://registry.npmmirror.com/@videojs/xhr/-/xhr-2.6.0.tgz"
-  "version" "2.6.0"
+  version "2.6.0"
+  resolved "https://registry.npmmirror.com/@videojs/xhr/-/xhr-2.6.0.tgz"
+  integrity sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==
   dependencies:
     "@babel/runtime" "^7.5.5"
-    "global" "~4.4.0"
-    "is-function" "^1.0.1"
+    global "~4.4.0"
+    is-function "^1.0.1"
 
 "@vue/babel-helper-vue-jsx-merge-props@^1.4.0":
-  "integrity" "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA=="
-  "resolved" "https://registry.npmmirror.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz"
-  "version" "1.4.0"
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz"
+  integrity sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA==
 
 "@vue/babel-helper-vue-transform-on@^1.1.5":
-  "integrity" "sha512-SgUymFpMoAyWeYWLAY+MkCK3QEROsiUnfaw5zxOVD/M64KQs8D/4oK6Q5omVA2hnvEOE0SCkH2TZxs/jnnUj7w=="
-  "resolved" "https://registry.npmmirror.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.1.5.tgz"
-  "version" "1.1.5"
+  version "1.1.5"
+  resolved "https://registry.npmmirror.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.1.5.tgz"
+  integrity sha512-SgUymFpMoAyWeYWLAY+MkCK3QEROsiUnfaw5zxOVD/M64KQs8D/4oK6Q5omVA2hnvEOE0SCkH2TZxs/jnnUj7w==
 
 "@vue/babel-plugin-jsx@^1.0.3":
-  "integrity" "sha512-nKs1/Bg9U1n3qSWnsHhCVQtAzI6aQXqua8j/bZrau8ywT1ilXQbK4FwEJGmU8fV7tcpuFvWmmN7TMmV1OBma1g=="
-  "resolved" "https://registry.npmmirror.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.5.tgz"
-  "version" "1.1.5"
+  version "1.1.5"
+  resolved "https://registry.npmmirror.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.5.tgz"
+  integrity sha512-nKs1/Bg9U1n3qSWnsHhCVQtAzI6aQXqua8j/bZrau8ywT1ilXQbK4FwEJGmU8fV7tcpuFvWmmN7TMmV1OBma1g==
   dependencies:
     "@babel/helper-module-imports" "^7.22.5"
     "@babel/plugin-syntax-jsx" "^7.22.5"
@@ -1495,26 +1517,26 @@
     "@babel/traverse" "^7.22.5"
     "@babel/types" "^7.22.5"
     "@vue/babel-helper-vue-transform-on" "^1.1.5"
-    "camelcase" "^6.3.0"
-    "html-tags" "^3.3.1"
-    "svg-tags" "^1.0.0"
+    camelcase "^6.3.0"
+    html-tags "^3.3.1"
+    svg-tags "^1.0.0"
 
 "@vue/babel-plugin-transform-vue-jsx@^1.4.0":
-  "integrity" "sha512-Fmastxw4MMx0vlgLS4XBX0XiBbUFzoMGeVXuMV08wyOfXdikAFqBTuYPR0tlk+XskL19EzHc39SgjrPGY23JnA=="
-  "resolved" "https://registry.npmmirror.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz"
-  "version" "1.4.0"
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz"
+  integrity sha512-Fmastxw4MMx0vlgLS4XBX0XiBbUFzoMGeVXuMV08wyOfXdikAFqBTuYPR0tlk+XskL19EzHc39SgjrPGY23JnA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.2.0"
     "@vue/babel-helper-vue-jsx-merge-props" "^1.4.0"
-    "html-tags" "^2.0.0"
-    "lodash.kebabcase" "^4.1.1"
-    "svg-tags" "^1.0.0"
+    html-tags "^2.0.0"
+    lodash.kebabcase "^4.1.1"
+    svg-tags "^1.0.0"
 
 "@vue/babel-preset-app@^4.5.18":
-  "integrity" "sha512-VCNRiAt2P/bLo09rYt3DLe6xXUMlhJwrvU18Ddd/lYJgC7s8+wvhgYs+MTx4OiAXdu58drGwSBO9SPx7C6J82Q=="
-  "resolved" "https://registry.npmmirror.com/@vue/babel-preset-app/-/babel-preset-app-4.5.19.tgz"
-  "version" "4.5.19"
+  version "4.5.19"
+  resolved "https://registry.npmmirror.com/@vue/babel-preset-app/-/babel-preset-app-4.5.19.tgz"
+  integrity sha512-VCNRiAt2P/bLo09rYt3DLe6xXUMlhJwrvU18Ddd/lYJgC7s8+wvhgYs+MTx4OiAXdu58drGwSBO9SPx7C6J82Q==
   dependencies:
     "@babel/core" "^7.11.0"
     "@babel/helper-compilation-targets" "^7.9.6"
@@ -1528,15 +1550,15 @@
     "@babel/runtime" "^7.11.0"
     "@vue/babel-plugin-jsx" "^1.0.3"
     "@vue/babel-preset-jsx" "^1.2.4"
-    "babel-plugin-dynamic-import-node" "^2.3.3"
-    "core-js" "^3.6.5"
-    "core-js-compat" "^3.6.5"
-    "semver" "^6.1.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
+    core-js "^3.6.5"
+    core-js-compat "^3.6.5"
+    semver "^6.1.0"
 
 "@vue/babel-preset-jsx@^1.2.4":
-  "integrity" "sha512-QmfRpssBOPZWL5xw7fOuHNifCQcNQC1PrOo/4fu6xlhlKJJKSA3HqX92Nvgyx8fqHZTUGMPHmFA+IDqwXlqkSA=="
-  "resolved" "https://registry.npmmirror.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz"
-  "version" "1.4.0"
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz"
+  integrity sha512-QmfRpssBOPZWL5xw7fOuHNifCQcNQC1PrOo/4fu6xlhlKJJKSA3HqX92Nvgyx8fqHZTUGMPHmFA+IDqwXlqkSA==
   dependencies:
     "@vue/babel-helper-vue-jsx-merge-props" "^1.4.0"
     "@vue/babel-plugin-transform-vue-jsx" "^1.4.0"
@@ -1548,100 +1570,100 @@
     "@vue/babel-sugar-v-on" "^1.4.0"
 
 "@vue/babel-sugar-composition-api-inject-h@^1.4.0":
-  "integrity" "sha512-VQq6zEddJHctnG4w3TfmlVp5FzDavUSut/DwR0xVoe/mJKXyMcsIibL42wPntozITEoY90aBV0/1d2KjxHU52g=="
-  "resolved" "https://registry.npmmirror.com/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz"
-  "version" "1.4.0"
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz"
+  integrity sha512-VQq6zEddJHctnG4w3TfmlVp5FzDavUSut/DwR0xVoe/mJKXyMcsIibL42wPntozITEoY90aBV0/1d2KjxHU52g==
   dependencies:
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
 "@vue/babel-sugar-composition-api-render-instance@^1.4.0":
-  "integrity" "sha512-6ZDAzcxvy7VcnCjNdHJ59mwK02ZFuP5CnucloidqlZwVQv5CQLijc3lGpR7MD3TWFi78J7+a8J56YxbCtHgT9Q=="
-  "resolved" "https://registry.npmmirror.com/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz"
-  "version" "1.4.0"
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz"
+  integrity sha512-6ZDAzcxvy7VcnCjNdHJ59mwK02ZFuP5CnucloidqlZwVQv5CQLijc3lGpR7MD3TWFi78J7+a8J56YxbCtHgT9Q==
   dependencies:
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
 "@vue/babel-sugar-functional-vue@^1.4.0":
-  "integrity" "sha512-lTEB4WUFNzYt2In6JsoF9sAYVTo84wC4e+PoZWSgM6FUtqRJz7wMylaEhSRgG71YF+wfLD6cc9nqVeXN2rwBvw=="
-  "resolved" "https://registry.npmmirror.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz"
-  "version" "1.4.0"
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz"
+  integrity sha512-lTEB4WUFNzYt2In6JsoF9sAYVTo84wC4e+PoZWSgM6FUtqRJz7wMylaEhSRgG71YF+wfLD6cc9nqVeXN2rwBvw==
   dependencies:
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
 "@vue/babel-sugar-inject-h@^1.4.0":
-  "integrity" "sha512-muwWrPKli77uO2fFM7eA3G1lAGnERuSz2NgAxuOLzrsTlQl8W4G+wwbM4nB6iewlKbwKRae3nL03UaF5ffAPMA=="
-  "resolved" "https://registry.npmmirror.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz"
-  "version" "1.4.0"
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz"
+  integrity sha512-muwWrPKli77uO2fFM7eA3G1lAGnERuSz2NgAxuOLzrsTlQl8W4G+wwbM4nB6iewlKbwKRae3nL03UaF5ffAPMA==
   dependencies:
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
 "@vue/babel-sugar-v-model@^1.4.0":
-  "integrity" "sha512-0t4HGgXb7WHYLBciZzN5s0Hzqan4Ue+p/3FdQdcaHAb7s5D9WZFGoSxEZHrR1TFVZlAPu1bejTKGeAzaaG3NCQ=="
-  "resolved" "https://registry.npmmirror.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz"
-  "version" "1.4.0"
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz"
+  integrity sha512-0t4HGgXb7WHYLBciZzN5s0Hzqan4Ue+p/3FdQdcaHAb7s5D9WZFGoSxEZHrR1TFVZlAPu1bejTKGeAzaaG3NCQ==
   dependencies:
     "@babel/plugin-syntax-jsx" "^7.2.0"
     "@vue/babel-helper-vue-jsx-merge-props" "^1.4.0"
     "@vue/babel-plugin-transform-vue-jsx" "^1.4.0"
-    "camelcase" "^5.0.0"
-    "html-tags" "^2.0.0"
-    "svg-tags" "^1.0.0"
+    camelcase "^5.0.0"
+    html-tags "^2.0.0"
+    svg-tags "^1.0.0"
 
 "@vue/babel-sugar-v-on@^1.4.0":
-  "integrity" "sha512-m+zud4wKLzSKgQrWwhqRObWzmTuyzl6vOP7024lrpeJM4x2UhQtRDLgYjXAw9xBXjCwS0pP9kXjg91F9ZNo9JA=="
-  "resolved" "https://registry.npmmirror.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz"
-  "version" "1.4.0"
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz"
+  integrity sha512-m+zud4wKLzSKgQrWwhqRObWzmTuyzl6vOP7024lrpeJM4x2UhQtRDLgYjXAw9xBXjCwS0pP9kXjg91F9ZNo9JA==
   dependencies:
     "@babel/plugin-syntax-jsx" "^7.2.0"
     "@vue/babel-plugin-transform-vue-jsx" "^1.4.0"
-    "camelcase" "^5.0.0"
+    camelcase "^5.0.0"
 
 "@vue/cli-overlay@^4.5.18":
-  "integrity" "sha512-GdxvNSmOw7NHIazCO8gTK+xZbaOmScTtxj6eHVeMbYpDYVPJ+th3VMLWNpw/b6uOjwzzcyKlA5dRQ1DAb+gF/g=="
-  "resolved" "https://registry.npmmirror.com/@vue/cli-overlay/-/cli-overlay-4.5.19.tgz"
-  "version" "4.5.19"
+  version "4.5.19"
+  resolved "https://registry.npmmirror.com/@vue/cli-overlay/-/cli-overlay-4.5.19.tgz"
+  integrity sha512-GdxvNSmOw7NHIazCO8gTK+xZbaOmScTtxj6eHVeMbYpDYVPJ+th3VMLWNpw/b6uOjwzzcyKlA5dRQ1DAb+gF/g==
 
 "@vue/cli-plugin-babel@4.5.18":
-  "integrity" "sha512-Juiu3EgV228pKcfWu6vrABrrXYoMtanf4PlG6P2drPHf1LgVmaUp1g/K7IxdCc63IY9E+eCWjZ2ZEnQvxMSWOQ=="
-  "resolved" "https://registry.npmmirror.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.5.18.tgz"
-  "version" "4.5.18"
+  version "4.5.18"
+  resolved "https://registry.npmmirror.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.5.18.tgz"
+  integrity sha512-Juiu3EgV228pKcfWu6vrABrrXYoMtanf4PlG6P2drPHf1LgVmaUp1g/K7IxdCc63IY9E+eCWjZ2ZEnQvxMSWOQ==
   dependencies:
     "@babel/core" "^7.11.0"
     "@vue/babel-preset-app" "^4.5.18"
     "@vue/cli-shared-utils" "^4.5.18"
-    "babel-loader" "^8.1.0"
-    "cache-loader" "^4.1.0"
-    "thread-loader" "^2.1.3"
-    "webpack" "^4.0.0"
+    babel-loader "^8.1.0"
+    cache-loader "^4.1.0"
+    thread-loader "^2.1.3"
+    webpack "^4.0.0"
 
 "@vue/cli-plugin-eslint@4.5.18":
-  "integrity" "sha512-UWacV26Ul+W61PwvMBv4Msh2h3Umr5FG0ApXFzLQTgyc/rCmXvhR53pW252zVZ2tf7s2n7xDFnp/mrCUrkb2tw=="
-  "resolved" "https://registry.npmmirror.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.18.tgz"
-  "version" "4.5.18"
+  version "4.5.18"
+  resolved "https://registry.npmmirror.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.18.tgz"
+  integrity sha512-UWacV26Ul+W61PwvMBv4Msh2h3Umr5FG0ApXFzLQTgyc/rCmXvhR53pW252zVZ2tf7s2n7xDFnp/mrCUrkb2tw==
   dependencies:
     "@vue/cli-shared-utils" "^4.5.18"
-    "eslint-loader" "^2.2.1"
-    "globby" "^9.2.0"
-    "inquirer" "^7.1.0"
-    "webpack" "^4.0.0"
-    "yorkie" "^2.0.0"
+    eslint-loader "^2.2.1"
+    globby "^9.2.0"
+    inquirer "^7.1.0"
+    webpack "^4.0.0"
+    yorkie "^2.0.0"
 
 "@vue/cli-plugin-router@^4.5.18":
-  "integrity" "sha512-3icGzH1IbVYmMMsOwYa0lal/gtvZLebFXdE5hcQJo2mnTwngXGMTyYAzL56EgHBPjbMmRpyj6Iw9k4aVInVX6A=="
-  "resolved" "https://registry.npmmirror.com/@vue/cli-plugin-router/-/cli-plugin-router-4.5.19.tgz"
-  "version" "4.5.19"
+  version "4.5.19"
+  resolved "https://registry.npmmirror.com/@vue/cli-plugin-router/-/cli-plugin-router-4.5.19.tgz"
+  integrity sha512-3icGzH1IbVYmMMsOwYa0lal/gtvZLebFXdE5hcQJo2mnTwngXGMTyYAzL56EgHBPjbMmRpyj6Iw9k4aVInVX6A==
   dependencies:
     "@vue/cli-shared-utils" "^4.5.19"
 
 "@vue/cli-plugin-vuex@^4.5.18":
-  "integrity" "sha512-DUmfdkG3pCdkP7Iznd87RfE9Qm42mgp2hcrNcYQYSru1W1gX2dG/JcW8bxmeGSa06lsxi9LEIc/QD1yPajSCZw=="
-  "resolved" "https://registry.npmmirror.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.19.tgz"
-  "version" "4.5.19"
+  version "4.5.19"
+  resolved "https://registry.npmmirror.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.19.tgz"
+  integrity sha512-DUmfdkG3pCdkP7Iznd87RfE9Qm42mgp2hcrNcYQYSru1W1gX2dG/JcW8bxmeGSa06lsxi9LEIc/QD1yPajSCZw==
 
 "@vue/cli-service@^3.0.0 || ^4.0.0-0", "@vue/cli-service@4.5.18":
-  "integrity" "sha512-ACRfiyzQNT+3Ko8NdkyvKMsAJ7IziQcM+QvRzfHo11v4YllcQBbRxYsmnffvjaZfNBefQvJ1qX9FI+ggIlxYQA=="
-  "resolved" "https://registry.npmmirror.com/@vue/cli-service/-/cli-service-4.5.18.tgz"
-  "version" "4.5.18"
+  version "4.5.18"
+  resolved "https://registry.npmmirror.com/@vue/cli-service/-/cli-service-4.5.18.tgz"
+  integrity sha512-ACRfiyzQNT+3Ko8NdkyvKMsAJ7IziQcM+QvRzfHo11v4YllcQBbRxYsmnffvjaZfNBefQvJ1qX9FI+ggIlxYQA==
   dependencies:
     "@intervolga/optimize-cssnano-plugin" "^1.0.5"
     "@soda/friendly-errors-webpack-plugin" "^1.7.1"
@@ -1656,221 +1678,221 @@
     "@vue/component-compiler-utils" "^3.1.2"
     "@vue/preload-webpack-plugin" "^1.1.0"
     "@vue/web-component-wrapper" "^1.2.0"
-    "acorn" "^7.4.0"
-    "acorn-walk" "^7.1.1"
-    "address" "^1.1.2"
-    "autoprefixer" "^9.8.6"
-    "browserslist" "^4.12.0"
-    "cache-loader" "^4.1.0"
-    "case-sensitive-paths-webpack-plugin" "^2.3.0"
-    "cli-highlight" "^2.1.4"
-    "clipboardy" "^2.3.0"
-    "cliui" "^6.0.0"
-    "copy-webpack-plugin" "^5.1.1"
-    "css-loader" "^3.5.3"
-    "cssnano" "^4.1.10"
-    "debug" "^4.1.1"
-    "default-gateway" "^5.0.5"
-    "dotenv" "^8.2.0"
-    "dotenv-expand" "^5.1.0"
-    "file-loader" "^4.2.0"
-    "fs-extra" "^7.0.1"
-    "globby" "^9.2.0"
-    "hash-sum" "^2.0.0"
-    "html-webpack-plugin" "^3.2.0"
-    "launch-editor-middleware" "^2.2.1"
-    "lodash.defaultsdeep" "^4.6.1"
-    "lodash.mapvalues" "^4.6.0"
-    "lodash.transform" "^4.6.0"
-    "mini-css-extract-plugin" "^0.9.0"
-    "minimist" "^1.2.5"
-    "pnp-webpack-plugin" "^1.6.4"
-    "portfinder" "^1.0.26"
-    "postcss-loader" "^3.0.0"
-    "ssri" "^8.0.1"
-    "terser-webpack-plugin" "^1.4.4"
-    "thread-loader" "^2.1.3"
-    "url-loader" "^2.2.0"
-    "vue-loader" "^15.9.2"
-    "vue-style-loader" "^4.1.2"
-    "webpack" "^4.0.0"
-    "webpack-bundle-analyzer" "^3.8.0"
-    "webpack-chain" "^6.4.0"
-    "webpack-dev-server" "^3.11.0"
-    "webpack-merge" "^4.2.2"
+    acorn "^7.4.0"
+    acorn-walk "^7.1.1"
+    address "^1.1.2"
+    autoprefixer "^9.8.6"
+    browserslist "^4.12.0"
+    cache-loader "^4.1.0"
+    case-sensitive-paths-webpack-plugin "^2.3.0"
+    cli-highlight "^2.1.4"
+    clipboardy "^2.3.0"
+    cliui "^6.0.0"
+    copy-webpack-plugin "^5.1.1"
+    css-loader "^3.5.3"
+    cssnano "^4.1.10"
+    debug "^4.1.1"
+    default-gateway "^5.0.5"
+    dotenv "^8.2.0"
+    dotenv-expand "^5.1.0"
+    file-loader "^4.2.0"
+    fs-extra "^7.0.1"
+    globby "^9.2.0"
+    hash-sum "^2.0.0"
+    html-webpack-plugin "^3.2.0"
+    launch-editor-middleware "^2.2.1"
+    lodash.defaultsdeep "^4.6.1"
+    lodash.mapvalues "^4.6.0"
+    lodash.transform "^4.6.0"
+    mini-css-extract-plugin "^0.9.0"
+    minimist "^1.2.5"
+    pnp-webpack-plugin "^1.6.4"
+    portfinder "^1.0.26"
+    postcss-loader "^3.0.0"
+    ssri "^8.0.1"
+    terser-webpack-plugin "^1.4.4"
+    thread-loader "^2.1.3"
+    url-loader "^2.2.0"
+    vue-loader "^15.9.2"
+    vue-style-loader "^4.1.2"
+    webpack "^4.0.0"
+    webpack-bundle-analyzer "^3.8.0"
+    webpack-chain "^6.4.0"
+    webpack-dev-server "^3.11.0"
+    webpack-merge "^4.2.2"
   optionalDependencies:
-    "vue-loader-v16" "npm:vue-loader@^16.1.0"
+    vue-loader-v16 "npm:vue-loader@^16.1.0"
 
 "@vue/cli-shared-utils@^4.5.18", "@vue/cli-shared-utils@^4.5.19":
-  "integrity" "sha512-JYpdsrC/d9elerKxbEUtmSSU6QRM60rirVubOewECHkBHj+tLNznWq/EhCjswywtePyLaMUK25eTqnTSZlEE+g=="
-  "resolved" "https://registry.npmmirror.com/@vue/cli-shared-utils/-/cli-shared-utils-4.5.19.tgz"
-  "version" "4.5.19"
+  version "4.5.19"
+  resolved "https://registry.npmmirror.com/@vue/cli-shared-utils/-/cli-shared-utils-4.5.19.tgz"
+  integrity sha512-JYpdsrC/d9elerKxbEUtmSSU6QRM60rirVubOewECHkBHj+tLNznWq/EhCjswywtePyLaMUK25eTqnTSZlEE+g==
   dependencies:
     "@achrinza/node-ipc" "9.2.2"
     "@hapi/joi" "^15.0.1"
-    "chalk" "^2.4.2"
-    "execa" "^1.0.0"
-    "launch-editor" "^2.2.1"
-    "lru-cache" "^5.1.1"
-    "open" "^6.3.0"
-    "ora" "^3.4.0"
-    "read-pkg" "^5.1.1"
-    "request" "^2.88.2"
-    "semver" "^6.1.0"
-    "strip-ansi" "^6.0.0"
+    chalk "^2.4.2"
+    execa "^1.0.0"
+    launch-editor "^2.2.1"
+    lru-cache "^5.1.1"
+    open "^6.3.0"
+    ora "^3.4.0"
+    read-pkg "^5.1.1"
+    request "^2.88.2"
+    semver "^6.1.0"
+    strip-ansi "^6.0.0"
 
-"@vue/compiler-core@3.3.7":
-  "integrity" "sha512-pACdY6YnTNVLXsB86YD8OF9ihwpolzhhtdLVHhBL6do/ykr6kKXNYABRtNMGrsQXpEXXyAdwvWWkuTbs4MFtPQ=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.3.7.tgz"
-  "version" "3.3.7"
+"@vue/compiler-core@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.3.4.tgz"
+  integrity sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==
   dependencies:
-    "@babel/parser" "^7.23.0"
-    "@vue/shared" "3.3.7"
-    "estree-walker" "^2.0.2"
-    "source-map-js" "^1.0.2"
+    "@babel/parser" "^7.21.3"
+    "@vue/shared" "3.3.4"
+    estree-walker "^2.0.2"
+    source-map-js "^1.0.2"
 
-"@vue/compiler-dom@3.3.7":
-  "integrity" "sha512-0LwkyJjnUPssXv/d1vNJ0PKfBlDoQs7n81CbO6Q0zdL7H1EzqYRrTVXDqdBVqro0aJjo/FOa1qBAPVI4PGSHBw=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.3.7.tgz"
-  "version" "3.3.7"
+"@vue/compiler-dom@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz"
+  integrity sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==
   dependencies:
-    "@vue/compiler-core" "3.3.7"
-    "@vue/shared" "3.3.7"
+    "@vue/compiler-core" "3.3.4"
+    "@vue/shared" "3.3.4"
 
 "@vue/compiler-sfc@^3.0.0-beta.14", "@vue/compiler-sfc@^3.0.1":
-  "integrity" "sha512-7pfldWy/J75U/ZyYIXRVqvLRw3vmfxDo2YLMwVtWVNew8Sm8d6wodM+OYFq4ll/UxfqVr0XKiVwti32PCrruAw=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.3.7.tgz"
-  "version" "3.3.7"
+  version "3.3.4"
+  resolved "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz"
+  integrity sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==
   dependencies:
-    "@babel/parser" "^7.23.0"
-    "@vue/compiler-core" "3.3.7"
-    "@vue/compiler-dom" "3.3.7"
-    "@vue/compiler-ssr" "3.3.7"
-    "@vue/reactivity-transform" "3.3.7"
-    "@vue/shared" "3.3.7"
-    "estree-walker" "^2.0.2"
-    "magic-string" "^0.30.5"
-    "postcss" "^8.4.31"
-    "source-map-js" "^1.0.2"
+    "@babel/parser" "^7.20.15"
+    "@vue/compiler-core" "3.3.4"
+    "@vue/compiler-dom" "3.3.4"
+    "@vue/compiler-ssr" "3.3.4"
+    "@vue/reactivity-transform" "3.3.4"
+    "@vue/shared" "3.3.4"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.0"
+    postcss "^8.1.10"
+    source-map-js "^1.0.2"
 
 "@vue/compiler-sfc@2.7.14":
-  "integrity" "sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"
-  "version" "2.7.14"
+  version "2.7.14"
+  resolved "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"
+  integrity sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==
   dependencies:
     "@babel/parser" "^7.18.4"
-    "postcss" "^8.4.14"
-    "source-map" "^0.6.1"
+    postcss "^8.4.14"
+    source-map "^0.6.1"
 
-"@vue/compiler-ssr@3.3.7":
-  "integrity" "sha512-TxOfNVVeH3zgBc82kcUv+emNHo+vKnlRrkv8YvQU5+Y5LJGJwSNzcmLUoxD/dNzv0bhQ/F0s+InlgV0NrApJZg=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.3.7.tgz"
-  "version" "3.3.7"
+"@vue/compiler-ssr@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz"
+  integrity sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==
   dependencies:
-    "@vue/compiler-dom" "3.3.7"
-    "@vue/shared" "3.3.7"
+    "@vue/compiler-dom" "3.3.4"
+    "@vue/shared" "3.3.4"
 
 "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2":
-  "integrity" "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ=="
-  "resolved" "https://registry.npmmirror.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz"
-  "version" "3.3.0"
+  version "3.3.0"
+  resolved "https://registry.npmmirror.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz"
+  integrity sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==
   dependencies:
-    "consolidate" "^0.15.1"
-    "hash-sum" "^1.0.2"
-    "lru-cache" "^4.1.2"
-    "merge-source-map" "^1.1.0"
-    "postcss" "^7.0.36"
-    "postcss-selector-parser" "^6.0.2"
-    "source-map" "~0.6.1"
-    "vue-template-es2015-compiler" "^1.9.0"
+    consolidate "^0.15.1"
+    hash-sum "^1.0.2"
+    lru-cache "^4.1.2"
+    merge-source-map "^1.1.0"
+    postcss "^7.0.36"
+    postcss-selector-parser "^6.0.2"
+    source-map "~0.6.1"
+    vue-template-es2015-compiler "^1.9.0"
   optionalDependencies:
-    "prettier" "^1.18.2 || ^2.0.0"
+    prettier "^1.18.2 || ^2.0.0"
 
 "@vue/eslint-config-prettier@^5.0.0":
-  "integrity" "sha512-LNqBXtM+4XqKz6yW3rrF/frCVZUKyYryiiMc8aCGq3czSXhTR/UNhl89FAtqZcpSwh5u8k2Qh8BvFctva68HUQ=="
-  "resolved" "https://registry.npmmirror.com/@vue/eslint-config-prettier/-/eslint-config-prettier-5.1.0.tgz"
-  "version" "5.1.0"
+  version "5.1.0"
+  resolved "https://registry.npmmirror.com/@vue/eslint-config-prettier/-/eslint-config-prettier-5.1.0.tgz"
+  integrity sha512-LNqBXtM+4XqKz6yW3rrF/frCVZUKyYryiiMc8aCGq3czSXhTR/UNhl89FAtqZcpSwh5u8k2Qh8BvFctva68HUQ==
   dependencies:
-    "eslint-config-prettier" "^6.0.0"
+    eslint-config-prettier "^6.0.0"
 
 "@vue/preload-webpack-plugin@^1.1.0":
-  "integrity" "sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="
-  "resolved" "https://registry.npmmirror.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz"
-  "version" "1.1.2"
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz"
+  integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==
 
-"@vue/reactivity-transform@3.3.7":
-  "integrity" "sha512-APhRmLVbgE1VPGtoLQoWBJEaQk4V8JUsqrQihImVqKT+8U6Qi3t5ATcg4Y9wGAPb3kIhetpufyZ1RhwbZCIdDA=="
-  "resolved" "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.3.7.tgz"
-  "version" "3.3.7"
+"@vue/reactivity-transform@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz"
+  integrity sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==
   dependencies:
-    "@babel/parser" "^7.23.0"
-    "@vue/compiler-core" "3.3.7"
-    "@vue/shared" "3.3.7"
-    "estree-walker" "^2.0.2"
-    "magic-string" "^0.30.5"
+    "@babel/parser" "^7.20.15"
+    "@vue/compiler-core" "3.3.4"
+    "@vue/shared" "3.3.4"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.0"
 
-"@vue/shared@3.3.7":
-  "integrity" "sha512-N/tbkINRUDExgcPTBvxNkvHGu504k8lzlNQRITVnm6YjOjwa4r0nnbd4Jb01sNpur5hAllyRJzSK5PvB9PPwRg=="
-  "resolved" "https://registry.npmmirror.com/@vue/shared/-/shared-3.3.7.tgz"
-  "version" "3.3.7"
+"@vue/shared@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.npmmirror.com/@vue/shared/-/shared-3.3.4.tgz"
+  integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==
 
 "@vue/web-component-wrapper@^1.2.0":
-  "integrity" "sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="
-  "resolved" "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz"
-  "version" "1.3.0"
+  version "1.3.0"
+  resolved "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz"
+  integrity sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==
 
 "@webassemblyjs/ast@1.9.0":
-  "integrity" "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.9.0.tgz"
+  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
   dependencies:
     "@webassemblyjs/helper-module-context" "1.9.0"
     "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
     "@webassemblyjs/wast-parser" "1.9.0"
 
 "@webassemblyjs/floating-point-hex-parser@1.9.0":
-  "integrity" "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"
+  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
 
 "@webassemblyjs/helper-api-error@1.9.0":
-  "integrity" "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"
+  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
 
 "@webassemblyjs/helper-buffer@1.9.0":
-  "integrity" "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"
+  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
 
 "@webassemblyjs/helper-code-frame@1.9.0":
-  "integrity" "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"
+  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
   dependencies:
     "@webassemblyjs/wast-printer" "1.9.0"
 
 "@webassemblyjs/helper-fsm@1.9.0":
-  "integrity" "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"
+  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
 
 "@webassemblyjs/helper-module-context@1.9.0":
-  "integrity" "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"
+  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
 
 "@webassemblyjs/helper-wasm-bytecode@1.9.0":
-  "integrity" "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"
+  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
 
 "@webassemblyjs/helper-wasm-section@1.9.0":
-  "integrity" "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"
+  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-buffer" "1.9.0"
@@ -1878,28 +1900,28 @@
     "@webassemblyjs/wasm-gen" "1.9.0"
 
 "@webassemblyjs/ieee754@1.9.0":
-  "integrity" "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"
+  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
 "@webassemblyjs/leb128@1.9.0":
-  "integrity" "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"
+  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
 "@webassemblyjs/utf8@1.9.0":
-  "integrity" "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"
+  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
 
 "@webassemblyjs/wasm-edit@1.9.0":
-  "integrity" "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"
+  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-buffer" "1.9.0"
@@ -1911,9 +1933,9 @@
     "@webassemblyjs/wast-printer" "1.9.0"
 
 "@webassemblyjs/wasm-gen@1.9.0":
-  "integrity" "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"
+  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
@@ -1922,9 +1944,9 @@
     "@webassemblyjs/utf8" "1.9.0"
 
 "@webassemblyjs/wasm-opt@1.9.0":
-  "integrity" "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"
+  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-buffer" "1.9.0"
@@ -1932,9 +1954,9 @@
     "@webassemblyjs/wasm-parser" "1.9.0"
 
 "@webassemblyjs/wasm-parser@1.9.0":
-  "integrity" "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"
+  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-api-error" "1.9.0"
@@ -1944,9 +1966,9 @@
     "@webassemblyjs/utf8" "1.9.0"
 
 "@webassemblyjs/wast-parser@1.9.0":
-  "integrity" "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"
+  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/floating-point-hex-parser" "1.9.0"
@@ -1956,9979 +1978,9865 @@
     "@xtuc/long" "4.2.2"
 
 "@webassemblyjs/wast-printer@1.9.0":
-  "integrity" "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="
-  "resolved" "https://registry.npmmirror.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"
-  "version" "1.9.0"
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"
+  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/wast-parser" "1.9.0"
     "@xtuc/long" "4.2.2"
 
 "@xmldom/xmldom@^0.8.3":
-  "integrity" "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="
-  "resolved" "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz"
-  "version" "0.8.10"
+  version "0.8.10"
+  resolved "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz"
+  integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==
 
 "@xtuc/ieee754@^1.2.0":
-  "integrity" "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
-  "resolved" "https://registry.npmmirror.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"
-  "version" "1.2.0"
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
 "@xtuc/long@4.2.2":
-  "integrity" "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
-  "resolved" "https://registry.npmmirror.com/@xtuc/long/-/long-4.2.2.tgz"
-  "version" "4.2.2"
+  version "4.2.2"
+  resolved "https://registry.npmmirror.com/@xtuc/long/-/long-4.2.2.tgz"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-"abbrev@1":
-  "integrity" "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-  "resolved" "https://registry.npmmirror.com/abbrev/-/abbrev-1.1.1.tgz"
-  "version" "1.1.1"
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/abbrev/-/abbrev-1.1.1.tgz"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-"accepts@~1.3.4", "accepts@~1.3.5", "accepts@~1.3.8":
-  "integrity" "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="
-  "resolved" "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz"
-  "version" "1.3.8"
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
+  version "1.3.8"
+  resolved "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz"
+  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
   dependencies:
-    "mime-types" "~2.1.34"
-    "negotiator" "0.6.3"
+    mime-types "~2.1.34"
+    negotiator "0.6.3"
 
-"acorn-jsx@^5.2.0", "acorn-jsx@^5.3.2":
-  "integrity" "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
-  "resolved" "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
-  "version" "5.3.2"
+acorn-jsx@^5.2.0, acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-"acorn-walk@^7.1.1":
-  "integrity" "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
-  "resolved" "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-7.2.0.tgz"
-  "version" "7.2.0"
+acorn-walk@^7.1.1:
+  version "7.2.0"
+  resolved "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-7.2.0.tgz"
+  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^6.4.1":
-  "integrity" "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz"
-  "version" "6.4.2"
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^7.1.1, acorn@^7.4.0:
+  version "7.4.1"
+  resolved "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-"acorn@^7.1.1":
-  "integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
-  "version" "7.4.1"
+acorn@^6.4.1:
+  version "6.4.2"
+  resolved "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz"
+  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-"acorn@^7.4.0":
-  "integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
-  "version" "7.4.1"
+acorn@^8.8.2:
+  version "8.10.0"
+  resolved "https://registry.npmmirror.com/acorn/-/acorn-8.10.0.tgz"
+  integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
-"acorn@^8.8.2":
-  "integrity" "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-8.11.2.tgz"
-  "version" "8.11.2"
+acorn@^8.9.0:
+  version "8.10.0"
+  resolved "https://registry.npmmirror.com/acorn/-/acorn-8.10.0.tgz"
+  integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
-"acorn@^8.9.0":
-  "integrity" "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-8.11.2.tgz"
-  "version" "8.11.2"
+address@^1.1.2:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/address/-/address-1.2.2.tgz"
+  integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==
 
-"address@^1.1.2":
-  "integrity" "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA=="
-  "resolved" "https://registry.npmmirror.com/address/-/address-1.2.2.tgz"
-  "version" "1.2.2"
+adler-32@~1.3.0:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz"
+  integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==
 
-"adler-32@~1.3.0":
-  "integrity" "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="
-  "resolved" "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz"
-  "version" "1.3.1"
-
-"aes-decrypter@^4.0.1", "aes-decrypter@4.0.1":
-  "integrity" "sha512-H1nh/P9VZXUf17AA5NQfJML88CFjVBDuGkp5zDHa7oEhYN9TTpNLJknRY1ie0iSKWlDf6JRnJKaZVDSQdPy6Cg=="
-  "resolved" "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-4.0.1.tgz"
-  "version" "4.0.1"
+aes-decrypter@^4.0.1, aes-decrypter@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-4.0.1.tgz"
+  integrity sha512-H1nh/P9VZXUf17AA5NQfJML88CFjVBDuGkp5zDHa7oEhYN9TTpNLJknRY1ie0iSKWlDf6JRnJKaZVDSQdPy6Cg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@videojs/vhs-utils" "^3.0.5"
-    "global" "^4.4.0"
-    "pkcs7" "^1.0.4"
+    global "^4.4.0"
+    pkcs7 "^1.0.4"
 
-"aes-decrypter@1.0.3":
-  "integrity" "sha512-rsx8pfx7wJsn+ziYbpJ8XA5c93hKAtBCrfydxJqJCMT+qfjipd/B5wC2xHtBcoxyvlqJcpeAo3K55t0lXOn9yQ=="
-  "resolved" "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-1.0.3.tgz"
-  "version" "1.0.3"
+aes-decrypter@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-1.0.3.tgz"
+  integrity sha512-rsx8pfx7wJsn+ziYbpJ8XA5c93hKAtBCrfydxJqJCMT+qfjipd/B5wC2xHtBcoxyvlqJcpeAo3K55t0lXOn9yQ==
   dependencies:
-    "pkcs7" "^0.2.3"
+    pkcs7 "^0.2.3"
 
-"aes-decrypter@3.1.3":
-  "integrity" "sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A=="
-  "resolved" "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-3.1.3.tgz"
-  "version" "3.1.3"
+aes-decrypter@3.1.3:
+  version "3.1.3"
+  resolved "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-3.1.3.tgz"
+  integrity sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@videojs/vhs-utils" "^3.0.5"
-    "global" "^4.4.0"
-    "pkcs7" "^1.0.4"
+    global "^4.4.0"
+    pkcs7 "^1.0.4"
 
-"aggregate-error@^3.0.0":
-  "integrity" "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="
-  "resolved" "https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz"
-  "version" "3.1.0"
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
   dependencies:
-    "clean-stack" "^2.0.0"
-    "indent-string" "^4.0.0"
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
 
-"ajv-errors@^1.0.0":
-  "integrity" "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
-  "resolved" "https://registry.npmmirror.com/ajv-errors/-/ajv-errors-1.0.1.tgz"
-  "version" "1.0.1"
+ajv-errors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/ajv-errors/-/ajv-errors-1.0.1.tgz"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-"ajv-keywords@^3.1.0", "ajv-keywords@^3.4.1", "ajv-keywords@^3.5.2":
-  "integrity" "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
-  "resolved" "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
-  "version" "3.5.2"
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-"ajv@^6.1.0", "ajv@^6.10.0", "ajv@^6.10.2", "ajv@^6.12.3", "ajv@^6.12.4", "ajv@^6.12.5", "ajv@^6.9.1", "ajv@>=5.0.0":
-  "integrity" "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="
-  "resolved" "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz"
-  "version" "6.12.6"
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1, ajv@>=5.0.0:
+  version "6.12.6"
+  resolved "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
-    "fast-deep-equal" "^3.1.1"
-    "fast-json-stable-stringify" "^2.0.0"
-    "json-schema-traverse" "^0.4.1"
-    "uri-js" "^4.2.2"
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
 
-"alphanum-sort@^1.0.0":
-  "integrity" "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ=="
-  "resolved" "https://registry.npmmirror.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz"
-  "version" "1.0.2"
+alphanum-sort@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz"
+  integrity sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==
 
-"ansi-colors@^3.0.0":
-  "integrity" "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="
-  "resolved" "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-3.2.4.tgz"
-  "version" "3.2.4"
+ansi-colors@^3.0.0:
+  version "3.2.4"
+  resolved "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-3.2.4.tgz"
+  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-"ansi-escapes@^4.2.1", "ansi-escapes@^4.3.0":
-  "integrity" "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="
-  "resolved" "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
-  "version" "4.3.2"
+ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
+  version "4.3.2"
+  resolved "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
-    "type-fest" "^0.21.3"
+    type-fest "^0.21.3"
 
-"ansi-html-community@0.0.8":
-  "integrity" "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="
-  "resolved" "https://registry.npmmirror.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz"
-  "version" "0.0.8"
+ansi-html-community@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.npmmirror.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz"
+  integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-"ansi-regex@^2.0.0":
-  "integrity" "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="
-  "resolved" "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-2.1.1.tgz"
-  "version" "2.1.1"
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-2.1.1.tgz"
+  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
 
-"ansi-regex@^4.1.0":
-  "integrity" "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
-  "resolved" "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-4.1.1.tgz"
-  "version" "4.1.1"
+ansi-regex@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-4.1.1.tgz"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
-"ansi-regex@^5.0.1":
-  "integrity" "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-  "resolved" "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz"
-  "version" "5.0.1"
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-"ansi-regex@^6.0.1":
-  "integrity" "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
-  "resolved" "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-6.0.1.tgz"
-  "version" "6.0.1"
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-6.0.1.tgz"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
-"ansi-styles@^2.2.1":
-  "integrity" "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="
-  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz"
-  "version" "2.2.1"
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz"
+  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
 
-"ansi-styles@^3.1.0", "ansi-styles@^3.2.0", "ansi-styles@^3.2.1":
-  "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
-  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
-  "version" "3.2.1"
+ansi-styles@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
-    "color-convert" "^1.9.0"
+    color-convert "^1.9.0"
 
-"ansi-styles@^4.0.0":
-  "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
-  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz"
-  "version" "4.3.0"
+ansi-styles@^3.2.0:
+  version "3.2.1"
+  resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
-    "color-convert" "^2.0.1"
+    color-convert "^1.9.0"
 
-"ansi-styles@^4.1.0":
-  "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
-  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz"
-  "version" "4.3.0"
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
-    "color-convert" "^2.0.1"
+    color-convert "^1.9.0"
 
-"ansi-styles@^6.0.0":
-  "integrity" "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="
-  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-6.2.1.tgz"
-  "version" "6.2.1"
-
-"any-promise@^1.0.0":
-  "integrity" "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
-  "resolved" "https://registry.npmmirror.com/any-promise/-/any-promise-1.3.0.tgz"
-  "version" "1.3.0"
-
-"anymatch@^2.0.0":
-  "integrity" "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="
-  "resolved" "https://registry.npmmirror.com/anymatch/-/anymatch-2.0.0.tgz"
-  "version" "2.0.0"
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
-    "micromatch" "^3.1.4"
-    "normalize-path" "^2.1.1"
+    color-convert "^2.0.1"
 
-"anymatch@^3.0.0", "anymatch@~3.1.2":
-  "integrity" "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="
-  "resolved" "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz"
-  "version" "3.1.3"
+ansi-styles@^6.0.0:
+  version "6.2.1"
+  resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-6.2.1.tgz"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.npmmirror.com/any-promise/-/any-promise-1.3.0.tgz"
+  integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/anymatch/-/anymatch-2.0.0.tgz"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
-    "normalize-path" "^3.0.0"
-    "picomatch" "^2.0.4"
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
 
-"aproba@^1.1.1":
-  "integrity" "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
-  "resolved" "https://registry.npmmirror.com/aproba/-/aproba-1.2.0.tgz"
-  "version" "1.2.0"
-
-"arch@^2.1.1":
-  "integrity" "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="
-  "resolved" "https://registry.npmmirror.com/arch/-/arch-2.2.0.tgz"
-  "version" "2.2.0"
-
-"argparse@^1.0.7":
-  "integrity" "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="
-  "resolved" "https://registry.npmmirror.com/argparse/-/argparse-1.0.10.tgz"
-  "version" "1.0.10"
+anymatch@^3.0.0, anymatch@~3.1.2:
+  version "3.1.3"
+  resolved "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
-    "sprintf-js" "~1.0.2"
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
 
-"arr-diff@^4.0.0":
-  "integrity" "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA=="
-  "resolved" "https://registry.npmmirror.com/arr-diff/-/arr-diff-4.0.0.tgz"
-  "version" "4.0.0"
+aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/aproba/-/aproba-1.2.0.tgz"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-"arr-flatten@^1.1.0":
-  "integrity" "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
-  "resolved" "https://registry.npmmirror.com/arr-flatten/-/arr-flatten-1.1.0.tgz"
-  "version" "1.1.0"
+arch@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.npmmirror.com/arch/-/arch-2.2.0.tgz"
+  integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
-"arr-union@^3.1.0":
-  "integrity" "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="
-  "resolved" "https://registry.npmmirror.com/arr-union/-/arr-union-3.1.0.tgz"
-  "version" "3.1.0"
-
-"array-buffer-byte-length@^1.0.0":
-  "integrity" "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A=="
-  "resolved" "https://registry.npmmirror.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"
-  "version" "1.0.0"
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.npmmirror.com/argparse/-/argparse-1.0.10.tgz"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
-    "call-bind" "^1.0.2"
-    "is-array-buffer" "^3.0.1"
+    sprintf-js "~1.0.2"
 
-"array-flatten@^2.1.0":
-  "integrity" "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
-  "resolved" "https://registry.npmmirror.com/array-flatten/-/array-flatten-2.1.2.tgz"
-  "version" "2.1.2"
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/arr-diff/-/arr-diff-4.0.0.tgz"
+  integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
 
-"array-flatten@1.1.1":
-  "integrity" "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
-  "resolved" "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz"
-  "version" "1.1.1"
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/arr-flatten/-/arr-flatten-1.1.0.tgz"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
-"array-includes@^3.1.7":
-  "integrity" "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ=="
-  "resolved" "https://registry.npmmirror.com/array-includes/-/array-includes-3.1.7.tgz"
-  "version" "3.1.7"
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/arr-union/-/arr-union-3.1.0.tgz"
+  integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
+
+array-buffer-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"
+  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "get-intrinsic" "^1.2.1"
-    "is-string" "^1.0.7"
+    call-bind "^1.0.2"
+    is-array-buffer "^3.0.1"
 
-"array-union@^1.0.1", "array-union@^1.0.2":
-  "integrity" "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng=="
-  "resolved" "https://registry.npmmirror.com/array-union/-/array-union-1.0.2.tgz"
-  "version" "1.0.2"
+array-flatten@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.npmmirror.com/array-flatten/-/array-flatten-2.1.2.tgz"
+  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz"
+  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
+
+array-includes@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.npmmirror.com/array-includes/-/array-includes-3.1.6.tgz"
+  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
   dependencies:
-    "array-uniq" "^1.0.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
+    is-string "^1.0.7"
 
-"array-uniq@^1.0.1":
-  "integrity" "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q=="
-  "resolved" "https://registry.npmmirror.com/array-uniq/-/array-uniq-1.0.3.tgz"
-  "version" "1.0.3"
-
-"array-unique@^0.3.2":
-  "integrity" "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="
-  "resolved" "https://registry.npmmirror.com/array-unique/-/array-unique-0.3.2.tgz"
-  "version" "0.3.2"
-
-"array.prototype.findlastindex@^1.2.3":
-  "integrity" "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA=="
-  "resolved" "https://registry.npmmirror.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz"
-  "version" "1.2.3"
+array-union@^1.0.1, array-union@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/array-union/-/array-union-1.0.2.tgz"
+  integrity sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "es-shim-unscopables" "^1.0.0"
-    "get-intrinsic" "^1.2.1"
+    array-uniq "^1.0.1"
 
-"array.prototype.flat@^1.3.2":
-  "integrity" "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA=="
-  "resolved" "https://registry.npmmirror.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz"
-  "version" "1.3.2"
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/array-uniq/-/array-uniq-1.0.3.tgz"
+  integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.npmmirror.com/array-unique/-/array-unique-0.3.2.tgz"
+  integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
+
+array.prototype.flat@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz"
+  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "es-shim-unscopables" "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
 
-"array.prototype.flatmap@^1.3.2":
-  "integrity" "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ=="
-  "resolved" "https://registry.npmmirror.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz"
-  "version" "1.3.2"
+array.prototype.flatmap@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz"
+  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "es-shim-unscopables" "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
 
-"array.prototype.reduce@^1.0.6":
-  "integrity" "sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg=="
-  "resolved" "https://registry.npmmirror.com/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz"
-  "version" "1.0.6"
+array.prototype.reduce@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz"
+  integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "es-array-method-boxes-properly" "^1.0.0"
-    "is-string" "^1.0.7"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-array-method-boxes-properly "^1.0.0"
+    is-string "^1.0.7"
 
-"arraybuffer.prototype.slice@^1.0.2":
-  "integrity" "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw=="
-  "resolved" "https://registry.npmmirror.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz"
-  "version" "1.0.2"
+arraybuffer.prototype.slice@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz"
+  integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==
   dependencies:
-    "array-buffer-byte-length" "^1.0.0"
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "get-intrinsic" "^1.2.1"
-    "is-array-buffer" "^3.0.2"
-    "is-shared-array-buffer" "^1.0.2"
+    array-buffer-byte-length "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    get-intrinsic "^1.2.1"
+    is-array-buffer "^3.0.2"
+    is-shared-array-buffer "^1.0.2"
 
-"asn1.js@^5.2.0":
-  "integrity" "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="
-  "resolved" "https://registry.npmmirror.com/asn1.js/-/asn1.js-5.4.1.tgz"
-  "version" "5.4.1"
+asn1.js@^5.2.0:
+  version "5.4.1"
+  resolved "https://registry.npmmirror.com/asn1.js/-/asn1.js-5.4.1.tgz"
+  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
   dependencies:
-    "bn.js" "^4.0.0"
-    "inherits" "^2.0.1"
-    "minimalistic-assert" "^1.0.0"
-    "safer-buffer" "^2.1.0"
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    safer-buffer "^2.1.0"
 
-"asn1@~0.2.3":
-  "integrity" "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="
-  "resolved" "https://registry.npmmirror.com/asn1/-/asn1-0.2.6.tgz"
-  "version" "0.2.6"
+asn1@~0.2.3:
+  version "0.2.6"
+  resolved "https://registry.npmmirror.com/asn1/-/asn1-0.2.6.tgz"
+  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
   dependencies:
-    "safer-buffer" "~2.1.0"
+    safer-buffer "~2.1.0"
 
-"assert-plus@^1.0.0", "assert-plus@1.0.0":
-  "integrity" "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="
-  "resolved" "https://registry.npmmirror.com/assert-plus/-/assert-plus-1.0.0.tgz"
-  "version" "1.0.0"
+assert-plus@^1.0.0, assert-plus@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/assert-plus/-/assert-plus-1.0.0.tgz"
+  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
 
-"assert@^1.1.1":
-  "integrity" "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A=="
-  "resolved" "https://registry.npmmirror.com/assert/-/assert-1.5.1.tgz"
-  "version" "1.5.1"
+assert@^1.1.1:
+  version "1.5.0"
+  resolved "https://registry.npmmirror.com/assert/-/assert-1.5.0.tgz"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
   dependencies:
-    "object.assign" "^4.1.4"
-    "util" "^0.10.4"
+    object-assign "^4.1.1"
+    util "0.10.3"
 
-"assign-symbols@^1.0.0":
-  "integrity" "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw=="
-  "resolved" "https://registry.npmmirror.com/assign-symbols/-/assign-symbols-1.0.0.tgz"
-  "version" "1.0.0"
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/assign-symbols/-/assign-symbols-1.0.0.tgz"
+  integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
 
-"astral-regex@^1.0.0":
-  "integrity" "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
-  "resolved" "https://registry.npmmirror.com/astral-regex/-/astral-regex-1.0.0.tgz"
-  "version" "1.0.0"
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/astral-regex/-/astral-regex-1.0.0.tgz"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
-"astral-regex@^2.0.0":
-  "integrity" "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
-  "resolved" "https://registry.npmmirror.com/astral-regex/-/astral-regex-2.0.0.tgz"
-  "version" "2.0.0"
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/astral-regex/-/astral-regex-2.0.0.tgz"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-"async-each@^1.0.1":
-  "integrity" "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg=="
-  "resolved" "https://registry.npmmirror.com/async-each/-/async-each-1.0.6.tgz"
-  "version" "1.0.6"
+async-each@^1.0.1:
+  version "1.0.6"
+  resolved "https://registry.npmmirror.com/async-each/-/async-each-1.0.6.tgz"
+  integrity sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==
 
-"async-limiter@~1.0.0":
-  "integrity" "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
-  "resolved" "https://registry.npmmirror.com/async-limiter/-/async-limiter-1.0.1.tgz"
-  "version" "1.0.1"
+async-limiter@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/async-limiter/-/async-limiter-1.0.1.tgz"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
-"async-validator@~1.8.1":
-  "integrity" "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA=="
-  "resolved" "https://registry.npmmirror.com/async-validator/-/async-validator-1.8.5.tgz"
-  "version" "1.8.5"
+async-validator@~1.8.1:
+  version "1.8.5"
+  resolved "https://registry.npmmirror.com/async-validator/-/async-validator-1.8.5.tgz"
+  integrity sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==
   dependencies:
-    "babel-runtime" "6.x"
+    babel-runtime "6.x"
 
-"async@^2.6.4":
-  "integrity" "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="
-  "resolved" "https://registry.npmmirror.com/async/-/async-2.6.4.tgz"
-  "version" "2.6.4"
+async@^2.6.4:
+  version "2.6.4"
+  resolved "https://registry.npmmirror.com/async/-/async-2.6.4.tgz"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
   dependencies:
-    "lodash" "^4.17.14"
+    lodash "^4.17.14"
 
-"asynckit@^0.4.0":
-  "integrity" "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-  "resolved" "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz"
-  "version" "0.4.0"
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-"atob@^2.1.2":
-  "integrity" "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
-  "resolved" "https://registry.npmmirror.com/atob/-/atob-2.1.2.tgz"
-  "version" "2.1.2"
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmmirror.com/atob/-/atob-2.1.2.tgz"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-"autoprefixer@^9.8.6":
-  "integrity" "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA=="
-  "resolved" "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-9.8.8.tgz"
-  "version" "9.8.8"
+autoprefixer@^9.8.6:
+  version "9.8.8"
+  resolved "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-9.8.8.tgz"
+  integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==
   dependencies:
-    "browserslist" "^4.12.0"
-    "caniuse-lite" "^1.0.30001109"
-    "normalize-range" "^0.1.2"
-    "num2fraction" "^1.2.2"
-    "picocolors" "^0.2.1"
-    "postcss" "^7.0.32"
-    "postcss-value-parser" "^4.1.0"
+    browserslist "^4.12.0"
+    caniuse-lite "^1.0.30001109"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    picocolors "^0.2.1"
+    postcss "^7.0.32"
+    postcss-value-parser "^4.1.0"
 
-"available-typed-arrays@^1.0.5":
-  "integrity" "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
-  "resolved" "https://registry.npmmirror.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"
-  "version" "1.0.5"
+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-"aws-sign2@~0.7.0":
-  "integrity" "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="
-  "resolved" "https://registry.npmmirror.com/aws-sign2/-/aws-sign2-0.7.0.tgz"
-  "version" "0.7.0"
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.npmmirror.com/aws-sign2/-/aws-sign2-0.7.0.tgz"
+  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
 
-"aws4@^1.8.0":
-  "integrity" "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="
-  "resolved" "https://registry.npmmirror.com/aws4/-/aws4-1.12.0.tgz"
-  "version" "1.12.0"
+aws4@^1.8.0:
+  version "1.12.0"
+  resolved "https://registry.npmmirror.com/aws4/-/aws4-1.12.0.tgz"
+  integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
 
-"axios@0.27.2":
-  "integrity" "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="
-  "resolved" "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz"
-  "version" "0.27.2"
+axios@0.27.2:
+  version "0.27.2"
+  resolved "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz"
+  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
   dependencies:
-    "follow-redirects" "^1.14.9"
-    "form-data" "^4.0.0"
+    follow-redirects "^1.14.9"
+    form-data "^4.0.0"
 
-"babel-eslint@10.1.0":
-  "integrity" "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg=="
-  "resolved" "https://registry.npmmirror.com/babel-eslint/-/babel-eslint-10.1.0.tgz"
-  "version" "10.1.0"
+babel-eslint@10.1.0:
+  version "10.1.0"
+  resolved "https://registry.npmmirror.com/babel-eslint/-/babel-eslint-10.1.0.tgz"
+  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.7.0"
     "@babel/traverse" "^7.7.0"
     "@babel/types" "^7.7.0"
-    "eslint-visitor-keys" "^1.0.0"
-    "resolve" "^1.12.0"
+    eslint-visitor-keys "^1.0.0"
+    resolve "^1.12.0"
 
-"babel-helper-vue-jsx-merge-props@^2.0.0", "babel-helper-vue-jsx-merge-props@^2.0.3":
-  "integrity" "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
-  "resolved" "https://registry.npmmirror.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz"
-  "version" "2.0.3"
+babel-helper-vue-jsx-merge-props@^2.0.0, babel-helper-vue-jsx-merge-props@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npmmirror.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz"
+  integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==
 
-"babel-loader@^8.1.0":
-  "integrity" "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q=="
-  "resolved" "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.3.0.tgz"
-  "version" "8.3.0"
+babel-loader@^8.1.0:
+  version "8.3.0"
+  resolved "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.3.0.tgz"
+  integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==
   dependencies:
-    "find-cache-dir" "^3.3.1"
-    "loader-utils" "^2.0.0"
-    "make-dir" "^3.1.0"
-    "schema-utils" "^2.6.5"
+    find-cache-dir "^3.3.1"
+    loader-utils "^2.0.0"
+    make-dir "^3.1.0"
+    schema-utils "^2.6.5"
 
-"babel-plugin-dynamic-import-node@^2.3.3":
-  "integrity" "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="
-  "resolved" "https://registry.npmmirror.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"
-  "version" "2.3.3"
+babel-plugin-dynamic-import-node@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.npmmirror.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"
+  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
   dependencies:
-    "object.assign" "^4.1.0"
+    object.assign "^4.1.0"
 
-"babel-plugin-polyfill-corejs2@^0.4.6":
-  "integrity" "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q=="
-  "resolved" "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz"
-  "version" "0.4.6"
+babel-plugin-polyfill-corejs2@^0.4.4:
+  version "0.4.5"
+  resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz"
+  integrity sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==
   dependencies:
     "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.4.3"
-    "semver" "^6.3.1"
+    "@babel/helper-define-polyfill-provider" "^0.4.2"
+    semver "^6.3.1"
 
-"babel-plugin-polyfill-corejs3@^0.8.5":
-  "integrity" "sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ=="
-  "resolved" "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz"
-  "version" "0.8.6"
+babel-plugin-polyfill-corejs3@^0.8.2:
+  version "0.8.3"
+  resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz"
+  integrity sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.3"
-    "core-js-compat" "^3.33.1"
+    "@babel/helper-define-polyfill-provider" "^0.4.2"
+    core-js-compat "^3.31.0"
 
-"babel-plugin-polyfill-regenerator@^0.5.3":
-  "integrity" "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw=="
-  "resolved" "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz"
-  "version" "0.5.3"
+babel-plugin-polyfill-regenerator@^0.5.1:
+  version "0.5.2"
+  resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz"
+  integrity sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.3"
+    "@babel/helper-define-polyfill-provider" "^0.4.2"
 
-"babel-runtime@^6.9.2", "babel-runtime@6.x":
-  "integrity" "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g=="
-  "resolved" "https://registry.npmmirror.com/babel-runtime/-/babel-runtime-6.26.0.tgz"
-  "version" "6.26.0"
+babel-runtime@^6.9.2, babel-runtime@6.x:
+  version "6.26.0"
+  resolved "https://registry.npmmirror.com/babel-runtime/-/babel-runtime-6.26.0.tgz"
+  integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
   dependencies:
-    "core-js" "^2.4.0"
-    "regenerator-runtime" "^0.11.0"
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
 
-"balanced-match@^1.0.0":
-  "integrity" "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-  "resolved" "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz"
-  "version" "1.0.2"
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-"base@^0.11.1":
-  "integrity" "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="
-  "resolved" "https://registry.npmmirror.com/base/-/base-0.11.2.tgz"
-  "version" "0.11.2"
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.npmmirror.com/base/-/base-0.11.2.tgz"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
-    "cache-base" "^1.0.1"
-    "class-utils" "^0.3.5"
-    "component-emitter" "^1.2.1"
-    "define-property" "^1.0.0"
-    "isobject" "^3.0.1"
-    "mixin-deep" "^1.2.0"
-    "pascalcase" "^0.1.1"
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
 
-"base64-arraybuffer@^1.0.2":
-  "integrity" "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
-  "resolved" "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz"
-  "version" "1.0.2"
+base64-arraybuffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz"
+  integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
 
-"base64-js@^1.0.2":
-  "integrity" "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-  "resolved" "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz"
-  "version" "1.5.1"
+base64-js@^1.0.2:
+  version "1.5.1"
+  resolved "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-"batch@0.6.1":
-  "integrity" "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
-  "resolved" "https://registry.npmmirror.com/batch/-/batch-0.6.1.tgz"
-  "version" "0.6.1"
-
-"bcrypt-pbkdf@^1.0.0":
-  "integrity" "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w=="
-  "resolved" "https://registry.npmmirror.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"
-  "version" "1.0.2"
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"
+  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
   dependencies:
-    "tweetnacl" "^0.14.3"
+    tweetnacl "^0.14.3"
 
-"benz-amr-recorder@^1.1.5":
-  "integrity" "sha512-NepctcNTsZHK8NxBb5uKO5p8S+xkbm+vD6GLSkCYdJeEsriexvgumLHpDkanX4QJBcLRMVtg16buWMs+gUPB3g=="
-  "resolved" "https://registry.npmmirror.com/benz-amr-recorder/-/benz-amr-recorder-1.1.5.tgz"
-  "version" "1.1.5"
+bfj@^6.1.1:
+  version "6.1.2"
+  resolved "https://registry.npmmirror.com/bfj/-/bfj-6.1.2.tgz"
+  integrity sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==
   dependencies:
-    "benz-recorderjs" "^1.0.5"
+    bluebird "^3.5.5"
+    check-types "^8.0.3"
+    hoopy "^0.1.4"
+    tryer "^1.0.1"
 
-"benz-recorderjs@^1.0.5":
-  "integrity" "sha512-EwedOQo9KLti7HxDi/eZY51PSRbAXnOdEZmLvJ6ro3QQSoF9Y3AXBt57MIllGvVz5vtFYMeikG+GD7qTm3+p9w=="
-  "resolved" "https://registry.npmmirror.com/benz-recorderjs/-/benz-recorderjs-1.0.5.tgz"
-  "version" "1.0.5"
+big.js@^3.1.3:
+  version "3.2.0"
+  resolved "https://registry.npmmirror.com/big.js/-/big.js-3.2.0.tgz"
+  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
 
-"bfj@^6.1.1":
-  "integrity" "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw=="
-  "resolved" "https://registry.npmmirror.com/bfj/-/bfj-6.1.2.tgz"
-  "version" "6.1.2"
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+binary-extensions@^1.0.0:
+  version "1.13.1"
+  resolved "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-1.13.1.tgz"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
+bluebird@^3.1.1, bluebird@^3.5.0, bluebird@^3.5.5:
+  version "3.7.2"
+  resolved "https://registry.npmmirror.com/bluebird/-/bluebird-3.7.2.tgz"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+bn.js@^4.0.0:
+  version "4.12.0"
+  resolved "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.0.tgz"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+
+bn.js@^4.1.0:
+  version "4.12.0"
+  resolved "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.0.tgz"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+
+bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.0.tgz"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+
+bn.js@^5.0.0, bn.js@^5.1.1:
+  version "5.2.1"
+  resolved "https://registry.npmmirror.com/bn.js/-/bn.js-5.2.1.tgz"
+  integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
+
+body-parser@1.20.1:
+  version "1.20.1"
+  resolved "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.1.tgz"
+  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
   dependencies:
-    "bluebird" "^3.5.5"
-    "check-types" "^8.0.3"
-    "hoopy" "^0.1.4"
-    "tryer" "^1.0.1"
+    bytes "3.1.2"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.1"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
 
-"big.js@^3.1.3":
-  "integrity" "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
-  "resolved" "https://registry.npmmirror.com/big.js/-/big.js-3.2.0.tgz"
-  "version" "3.2.0"
-
-"big.js@^5.2.2":
-  "integrity" "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
-  "resolved" "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz"
-  "version" "5.2.2"
-
-"binary-extensions@^1.0.0":
-  "integrity" "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
-  "resolved" "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-1.13.1.tgz"
-  "version" "1.13.1"
-
-"binary-extensions@^2.0.0":
-  "integrity" "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
-  "resolved" "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz"
-  "version" "2.2.0"
-
-"bluebird@^3.1.1", "bluebird@^3.5.0", "bluebird@^3.5.5":
-  "integrity" "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
-  "resolved" "https://registry.npmmirror.com/bluebird/-/bluebird-3.7.2.tgz"
-  "version" "3.7.2"
-
-"bn.js@^4.0.0":
-  "integrity" "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-  "resolved" "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.0.tgz"
-  "version" "4.12.0"
-
-"bn.js@^4.1.0":
-  "integrity" "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-  "resolved" "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.0.tgz"
-  "version" "4.12.0"
-
-"bn.js@^4.11.9":
-  "integrity" "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-  "resolved" "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.0.tgz"
-  "version" "4.12.0"
-
-"bn.js@^5.0.0", "bn.js@^5.2.1":
-  "integrity" "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
-  "resolved" "https://registry.npmmirror.com/bn.js/-/bn.js-5.2.1.tgz"
-  "version" "5.2.1"
-
-"body-parser@1.20.1":
-  "integrity" "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="
-  "resolved" "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.1.tgz"
-  "version" "1.20.1"
+bonjour@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.npmmirror.com/bonjour/-/bonjour-3.5.0.tgz"
+  integrity sha512-RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==
   dependencies:
-    "bytes" "3.1.2"
-    "content-type" "~1.0.4"
-    "debug" "2.6.9"
-    "depd" "2.0.0"
-    "destroy" "1.2.0"
-    "http-errors" "2.0.0"
-    "iconv-lite" "0.4.24"
-    "on-finished" "2.4.1"
-    "qs" "6.11.0"
-    "raw-body" "2.5.1"
-    "type-is" "~1.6.18"
-    "unpipe" "1.0.0"
+    array-flatten "^2.1.0"
+    deep-equal "^1.0.1"
+    dns-equal "^1.0.0"
+    dns-txt "^2.0.2"
+    multicast-dns "^6.0.1"
+    multicast-dns-service-types "^1.1.0"
 
-"bonjour@^3.5.0":
-  "integrity" "sha512-RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg=="
-  "resolved" "https://registry.npmmirror.com/bonjour/-/bonjour-3.5.0.tgz"
-  "version" "3.5.0"
-  dependencies:
-    "array-flatten" "^2.1.0"
-    "deep-equal" "^1.0.1"
-    "dns-equal" "^1.0.0"
-    "dns-txt" "^2.0.2"
-    "multicast-dns" "^6.0.1"
-    "multicast-dns-service-types" "^1.1.0"
+boolbase@^1.0.0, boolbase@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz"
+  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
-"boolbase@^1.0.0", "boolbase@~1.0.0":
-  "integrity" "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
-  "resolved" "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz"
-  "version" "1.0.0"
-
-"bpmn-js-properties-panel@0.46.0":
-  "integrity" "sha512-8MlNvHklIZZQH9vtoKf0A0A1v0sHO4Iz19jGhHeX15czOOiCfdavjo+q23GHWNKzQA9347F91XYFcrnM6FO8zw=="
-  "resolved" "https://registry.npmmirror.com/bpmn-js-properties-panel/-/bpmn-js-properties-panel-0.46.0.tgz"
-  "version" "0.46.0"
+bpmn-js-properties-panel@0.46.0:
+  version "0.46.0"
+  resolved "https://registry.npmmirror.com/bpmn-js-properties-panel/-/bpmn-js-properties-panel-0.46.0.tgz"
+  integrity sha512-8MlNvHklIZZQH9vtoKf0A0A1v0sHO4Iz19jGhHeX15czOOiCfdavjo+q23GHWNKzQA9347F91XYFcrnM6FO8zw==
   dependencies:
     "@bpmn-io/element-templates-validator" "^0.2.0"
     "@bpmn-io/extract-process-variables" "^0.4.3"
-    "ids" "^1.0.0"
-    "inherits" "^2.0.1"
-    "lodash" "^4.17.20"
-    "min-dom" "^3.1.3"
-    "scroll-tabs" "^1.0.1"
-    "selection-update" "^0.1.2"
-    "semver" "^6.3.0"
+    ids "^1.0.0"
+    inherits "^2.0.1"
+    lodash "^4.17.20"
+    min-dom "^3.1.3"
+    scroll-tabs "^1.0.1"
+    selection-update "^0.1.2"
+    semver "^6.3.0"
 
-"bpmn-js-token-simulation@0.10.0":
-  "integrity" "sha512-QuZQ/KVXKt9Vl+XENyOBoTW2Aw+uKjuBlKdCJL6El7AyM7DkJ5bZkSYURshId1SkBDdYg2mJ1flSmsrhGuSfwg=="
-  "resolved" "https://registry.npmmirror.com/bpmn-js-token-simulation/-/bpmn-js-token-simulation-0.10.0.tgz"
-  "version" "0.10.0"
+bpmn-js-token-simulation@0.10.0:
+  version "0.10.0"
+  resolved "https://registry.npmmirror.com/bpmn-js-token-simulation/-/bpmn-js-token-simulation-0.10.0.tgz"
+  integrity sha512-QuZQ/KVXKt9Vl+XENyOBoTW2Aw+uKjuBlKdCJL6El7AyM7DkJ5bZkSYURshId1SkBDdYg2mJ1flSmsrhGuSfwg==
   dependencies:
-    "min-dash" "^3.3.0"
-    "min-dom" "^0.2.0"
-    "svg.js" "^2.6.3"
+    min-dash "^3.3.0"
+    min-dom "^0.2.0"
+    svg.js "^2.6.3"
 
-"bpmn-js@^3.x || ^4.x || ^5.x || ^6.x || ^7.x || ^8.x", "bpmn-js@8.9.0":
-  "integrity" "sha512-cthSxiJUpEHspiUKiL0YA8/mRCYngNKwALWieLKPtFo42n+vWTFgmxnASNRwhxpPEbSXjYuTah1lZ0lSyLWPpw=="
-  "resolved" "https://registry.npmmirror.com/bpmn-js/-/bpmn-js-8.9.0.tgz"
-  "version" "8.9.0"
+"bpmn-js@^3.x || ^4.x || ^5.x || ^6.x || ^7.x || ^8.x", bpmn-js@8.9.0:
+  version "8.9.0"
+  resolved "https://registry.npmmirror.com/bpmn-js/-/bpmn-js-8.9.0.tgz"
+  integrity sha512-cthSxiJUpEHspiUKiL0YA8/mRCYngNKwALWieLKPtFo42n+vWTFgmxnASNRwhxpPEbSXjYuTah1lZ0lSyLWPpw==
   dependencies:
-    "bpmn-moddle" "^7.1.2"
-    "css.escape" "^1.5.1"
-    "diagram-js" "^7.8.2"
-    "diagram-js-direct-editing" "^1.6.3"
-    "ids" "^1.0.0"
-    "inherits" "^2.0.4"
-    "min-dash" "^3.5.2"
-    "min-dom" "^3.1.3"
-    "object-refs" "^0.3.0"
-    "tiny-svg" "^2.2.2"
+    bpmn-moddle "^7.1.2"
+    css.escape "^1.5.1"
+    diagram-js "^7.8.2"
+    diagram-js-direct-editing "^1.6.3"
+    ids "^1.0.0"
+    inherits "^2.0.4"
+    min-dash "^3.5.2"
+    min-dom "^3.1.3"
+    object-refs "^0.3.0"
+    tiny-svg "^2.2.2"
 
-"bpmn-moddle@^7.1.2":
-  "integrity" "sha512-ZcBfw0NSOdYTSXFKEn7MOXHItz7VfLZTrFYKO8cK6V8ZzGjCcdiLIOiw7Lctw1PJsihhLiZQS8Htj2xKf+NwCg=="
-  "resolved" "https://registry.npmmirror.com/bpmn-moddle/-/bpmn-moddle-7.1.3.tgz"
-  "version" "7.1.3"
+bpmn-moddle@^7.1.2:
+  version "7.1.3"
+  resolved "https://registry.npmmirror.com/bpmn-moddle/-/bpmn-moddle-7.1.3.tgz"
+  integrity sha512-ZcBfw0NSOdYTSXFKEn7MOXHItz7VfLZTrFYKO8cK6V8ZzGjCcdiLIOiw7Lctw1PJsihhLiZQS8Htj2xKf+NwCg==
   dependencies:
-    "min-dash" "^3.5.2"
-    "moddle" "^5.0.2"
-    "moddle-xml" "^9.0.6"
+    min-dash "^3.5.2"
+    moddle "^5.0.2"
+    moddle-xml "^9.0.6"
 
-"brace-expansion@^1.1.7":
-  "integrity" "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="
-  "resolved" "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz"
-  "version" "1.1.11"
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
-    "balanced-match" "^1.0.0"
-    "concat-map" "0.0.1"
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
 
-"braces@^2.2.2", "braces@^2.3.1", "braces@^2.3.2":
-  "integrity" "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="
-  "resolved" "https://registry.npmmirror.com/braces/-/braces-2.3.2.tgz"
-  "version" "2.3.2"
+braces@^2.2.2, braces@^2.3.1, braces@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.npmmirror.com/braces/-/braces-2.3.2.tgz"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
-    "arr-flatten" "^1.1.0"
-    "array-unique" "^0.3.2"
-    "extend-shallow" "^2.0.1"
-    "fill-range" "^4.0.0"
-    "isobject" "^3.0.1"
-    "repeat-element" "^1.1.2"
-    "snapdragon" "^0.8.1"
-    "snapdragon-node" "^2.0.1"
-    "split-string" "^3.0.2"
-    "to-regex" "^3.0.1"
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
 
-"braces@^3.0.2":
-  "integrity" "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="
-  "resolved" "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz"
-  "version" "3.0.2"
+braces@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
-    "fill-range" "^7.0.1"
+    fill-range "^7.0.1"
 
-"braces@~3.0.2":
-  "integrity" "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="
-  "resolved" "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz"
-  "version" "3.0.2"
+braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
-    "fill-range" "^7.0.1"
+    fill-range "^7.0.1"
 
-"brorand@^1.0.1", "brorand@^1.1.0":
-  "integrity" "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
-  "resolved" "https://registry.npmmirror.com/brorand/-/brorand-1.1.0.tgz"
-  "version" "1.1.0"
+brorand@^1.0.1, brorand@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/brorand/-/brorand-1.1.0.tgz"
+  integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
 
-"browserify-aes@^1.0.0", "browserify-aes@^1.0.4":
-  "integrity" "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="
-  "resolved" "https://registry.npmmirror.com/browserify-aes/-/browserify-aes-1.2.0.tgz"
-  "version" "1.2.0"
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/browserify-aes/-/browserify-aes-1.2.0.tgz"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
-    "buffer-xor" "^1.0.3"
-    "cipher-base" "^1.0.0"
-    "create-hash" "^1.1.0"
-    "evp_bytestokey" "^1.0.3"
-    "inherits" "^2.0.1"
-    "safe-buffer" "^5.0.1"
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
-"browserify-cipher@^1.0.0":
-  "integrity" "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="
-  "resolved" "https://registry.npmmirror.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz"
-  "version" "1.0.1"
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
-    "browserify-aes" "^1.0.4"
-    "browserify-des" "^1.0.0"
-    "evp_bytestokey" "^1.0.0"
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
 
-"browserify-des@^1.0.0":
-  "integrity" "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="
-  "resolved" "https://registry.npmmirror.com/browserify-des/-/browserify-des-1.0.2.tgz"
-  "version" "1.0.2"
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/browserify-des/-/browserify-des-1.0.2.tgz"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
   dependencies:
-    "cipher-base" "^1.0.1"
-    "des.js" "^1.0.0"
-    "inherits" "^2.0.1"
-    "safe-buffer" "^5.1.2"
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
 
-"browserify-rsa@^4.0.0", "browserify-rsa@^4.1.0":
-  "integrity" "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="
-  "resolved" "https://registry.npmmirror.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz"
-  "version" "4.1.0"
+browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.npmmirror.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz"
+  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
   dependencies:
-    "bn.js" "^5.0.0"
-    "randombytes" "^2.0.1"
+    bn.js "^5.0.0"
+    randombytes "^2.0.1"
 
-"browserify-sign@^4.0.0":
-  "integrity" "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg=="
-  "resolved" "https://registry.npmmirror.com/browserify-sign/-/browserify-sign-4.2.2.tgz"
-  "version" "4.2.2"
+browserify-sign@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.npmmirror.com/browserify-sign/-/browserify-sign-4.2.1.tgz"
+  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
   dependencies:
-    "bn.js" "^5.2.1"
-    "browserify-rsa" "^4.1.0"
-    "create-hash" "^1.2.0"
-    "create-hmac" "^1.1.7"
-    "elliptic" "^6.5.4"
-    "inherits" "^2.0.4"
-    "parse-asn1" "^5.1.6"
-    "readable-stream" "^3.6.2"
-    "safe-buffer" "^5.2.1"
+    bn.js "^5.1.1"
+    browserify-rsa "^4.0.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.5.3"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.5"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
-"browserify-zlib@^0.2.0":
-  "integrity" "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="
-  "resolved" "https://registry.npmmirror.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz"
-  "version" "0.2.0"
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmmirror.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
-    "pako" "~1.0.5"
+    pako "~1.0.5"
 
-"browserslist@^4.0.0", "browserslist@^4.12.0", "browserslist@^4.21.9", "browserslist@^4.22.1", "browserslist@>= 4.21.0":
-  "integrity" "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ=="
-  "resolved" "https://registry.npmmirror.com/browserslist/-/browserslist-4.22.1.tgz"
-  "version" "4.22.1"
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.21.9, "browserslist@>= 4.21.0":
+  version "4.21.9"
+  resolved "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.9.tgz"
+  integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==
   dependencies:
-    "caniuse-lite" "^1.0.30001541"
-    "electron-to-chromium" "^1.4.535"
-    "node-releases" "^2.0.13"
-    "update-browserslist-db" "^1.0.13"
+    caniuse-lite "^1.0.30001503"
+    electron-to-chromium "^1.4.431"
+    node-releases "^2.0.12"
+    update-browserslist-db "^1.0.11"
 
-"btoa@^1.2.1":
-  "integrity" "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
-  "resolved" "https://registry.npmmirror.com/btoa/-/btoa-1.2.1.tgz"
-  "version" "1.2.1"
+btoa@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmmirror.com/btoa/-/btoa-1.2.1.tgz"
+  integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==
 
-"buffer-from@^1.0.0":
-  "integrity" "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-  "resolved" "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz"
-  "version" "1.1.2"
+buffer-from@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-"buffer-indexof@^1.0.0":
-  "integrity" "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
-  "resolved" "https://registry.npmmirror.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz"
-  "version" "1.1.1"
+buffer-indexof@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz"
+  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
 
-"buffer-json@^2.0.0":
-  "integrity" "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw=="
-  "resolved" "https://registry.npmmirror.com/buffer-json/-/buffer-json-2.0.0.tgz"
-  "version" "2.0.0"
+buffer-json@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/buffer-json/-/buffer-json-2.0.0.tgz"
+  integrity sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==
 
-"buffer-xor@^1.0.3":
-  "integrity" "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
-  "resolved" "https://registry.npmmirror.com/buffer-xor/-/buffer-xor-1.0.3.tgz"
-  "version" "1.0.3"
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/buffer-xor/-/buffer-xor-1.0.3.tgz"
+  integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==
 
-"buffer@^4.3.0":
-  "integrity" "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="
-  "resolved" "https://registry.npmmirror.com/buffer/-/buffer-4.9.2.tgz"
-  "version" "4.9.2"
+buffer@^4.3.0:
+  version "4.9.2"
+  resolved "https://registry.npmmirror.com/buffer/-/buffer-4.9.2.tgz"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
   dependencies:
-    "base64-js" "^1.0.2"
-    "ieee754" "^1.1.4"
-    "isarray" "^1.0.0"
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
 
-"builtin-status-codes@^3.0.0":
-  "integrity" "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="
-  "resolved" "https://registry.npmmirror.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"
-  "version" "3.0.0"
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"
+  integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==
 
-"bytes@3.0.0":
-  "integrity" "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
-  "resolved" "https://registry.npmmirror.com/bytes/-/bytes-3.0.0.tgz"
-  "version" "3.0.0"
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/bytes/-/bytes-3.0.0.tgz"
+  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
 
-"bytes@3.1.2":
-  "integrity" "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-  "resolved" "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz"
-  "version" "3.1.2"
+bytes@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz"
+  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-"cacache@^12.0.2", "cacache@^12.0.3":
-  "integrity" "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="
-  "resolved" "https://registry.npmmirror.com/cacache/-/cacache-12.0.4.tgz"
-  "version" "12.0.4"
+cacache@^12.0.2:
+  version "12.0.4"
+  resolved "https://registry.npmmirror.com/cacache/-/cacache-12.0.4.tgz"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
   dependencies:
-    "bluebird" "^3.5.5"
-    "chownr" "^1.1.1"
-    "figgy-pudding" "^3.5.1"
-    "glob" "^7.1.4"
-    "graceful-fs" "^4.1.15"
-    "infer-owner" "^1.0.3"
-    "lru-cache" "^5.1.1"
-    "mississippi" "^3.0.0"
-    "mkdirp" "^0.5.1"
-    "move-concurrently" "^1.0.1"
-    "promise-inflight" "^1.0.1"
-    "rimraf" "^2.6.3"
-    "ssri" "^6.0.1"
-    "unique-filename" "^1.1.1"
-    "y18n" "^4.0.0"
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
 
-"cacache@^15.0.5":
-  "integrity" "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="
-  "resolved" "https://registry.npmmirror.com/cacache/-/cacache-15.3.0.tgz"
-  "version" "15.3.0"
+cacache@^12.0.3:
+  version "12.0.4"
+  resolved "https://registry.npmmirror.com/cacache/-/cacache-12.0.4.tgz"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cacache@^15.0.5:
+  version "15.3.0"
+  resolved "https://registry.npmmirror.com/cacache/-/cacache-15.3.0.tgz"
+  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
   dependencies:
     "@npmcli/fs" "^1.0.0"
     "@npmcli/move-file" "^1.0.1"
-    "chownr" "^2.0.0"
-    "fs-minipass" "^2.0.0"
-    "glob" "^7.1.4"
-    "infer-owner" "^1.0.4"
-    "lru-cache" "^6.0.0"
-    "minipass" "^3.1.1"
-    "minipass-collect" "^1.0.2"
-    "minipass-flush" "^1.0.5"
-    "minipass-pipeline" "^1.2.2"
-    "mkdirp" "^1.0.3"
-    "p-map" "^4.0.0"
-    "promise-inflight" "^1.0.1"
-    "rimraf" "^3.0.2"
-    "ssri" "^8.0.1"
-    "tar" "^6.0.2"
-    "unique-filename" "^1.1.1"
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    glob "^7.1.4"
+    infer-owner "^1.0.4"
+    lru-cache "^6.0.0"
+    minipass "^3.1.1"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.2"
+    mkdirp "^1.0.3"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^8.0.1"
+    tar "^6.0.2"
+    unique-filename "^1.1.1"
 
-"cache-base@^1.0.1":
-  "integrity" "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="
-  "resolved" "https://registry.npmmirror.com/cache-base/-/cache-base-1.0.1.tgz"
-  "version" "1.0.1"
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/cache-base/-/cache-base-1.0.1.tgz"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
-    "collection-visit" "^1.0.0"
-    "component-emitter" "^1.2.1"
-    "get-value" "^2.0.6"
-    "has-value" "^1.0.0"
-    "isobject" "^3.0.1"
-    "set-value" "^2.0.0"
-    "to-object-path" "^0.3.0"
-    "union-value" "^1.0.0"
-    "unset-value" "^1.0.0"
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
 
-"cache-loader@^4.1.0":
-  "integrity" "sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw=="
-  "resolved" "https://registry.npmmirror.com/cache-loader/-/cache-loader-4.1.0.tgz"
-  "version" "4.1.0"
+cache-loader@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmmirror.com/cache-loader/-/cache-loader-4.1.0.tgz"
+  integrity sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw==
   dependencies:
-    "buffer-json" "^2.0.0"
-    "find-cache-dir" "^3.0.0"
-    "loader-utils" "^1.2.3"
-    "mkdirp" "^0.5.1"
-    "neo-async" "^2.6.1"
-    "schema-utils" "^2.0.0"
+    buffer-json "^2.0.0"
+    find-cache-dir "^3.0.0"
+    loader-utils "^1.2.3"
+    mkdirp "^0.5.1"
+    neo-async "^2.6.1"
+    schema-utils "^2.0.0"
 
-"call-bind@^1.0.0", "call-bind@^1.0.2", "call-bind@^1.0.4", "call-bind@^1.0.5":
-  "integrity" "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ=="
-  "resolved" "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.5.tgz"
-  "version" "1.0.5"
+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
   dependencies:
-    "function-bind" "^1.1.2"
-    "get-intrinsic" "^1.2.1"
-    "set-function-length" "^1.1.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
 
-"call-me-maybe@^1.0.1":
-  "integrity" "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ=="
-  "resolved" "https://registry.npmmirror.com/call-me-maybe/-/call-me-maybe-1.0.2.tgz"
-  "version" "1.0.2"
+call-me-maybe@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/call-me-maybe/-/call-me-maybe-1.0.2.tgz"
+  integrity sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==
 
-"caller-callsite@^2.0.0":
-  "integrity" "sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ=="
-  "resolved" "https://registry.npmmirror.com/caller-callsite/-/caller-callsite-2.0.0.tgz"
-  "version" "2.0.0"
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/caller-callsite/-/caller-callsite-2.0.0.tgz"
+  integrity sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==
   dependencies:
-    "callsites" "^2.0.0"
+    callsites "^2.0.0"
 
-"caller-path@^2.0.0":
-  "integrity" "sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A=="
-  "resolved" "https://registry.npmmirror.com/caller-path/-/caller-path-2.0.0.tgz"
-  "version" "2.0.0"
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/caller-path/-/caller-path-2.0.0.tgz"
+  integrity sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==
   dependencies:
-    "caller-callsite" "^2.0.0"
+    caller-callsite "^2.0.0"
 
-"callsites@^2.0.0":
-  "integrity" "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ=="
-  "resolved" "https://registry.npmmirror.com/callsites/-/callsites-2.0.0.tgz"
-  "version" "2.0.0"
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/callsites/-/callsites-2.0.0.tgz"
+  integrity sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==
 
-"callsites@^3.0.0":
-  "integrity" "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-  "resolved" "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz"
-  "version" "3.1.0"
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-"camel-case@3.0.x":
-  "integrity" "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w=="
-  "resolved" "https://registry.npmmirror.com/camel-case/-/camel-case-3.0.0.tgz"
-  "version" "3.0.0"
+camel-case@3.0.x:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/camel-case/-/camel-case-3.0.0.tgz"
+  integrity sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==
   dependencies:
-    "no-case" "^2.2.0"
-    "upper-case" "^1.1.1"
+    no-case "^2.2.0"
+    upper-case "^1.1.1"
 
-"camelcase@^5.0.0":
-  "integrity" "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-  "resolved" "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz"
-  "version" "5.3.1"
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-"camelcase@^5.3.1":
-  "integrity" "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-  "resolved" "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz"
-  "version" "5.3.1"
+camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-"camelcase@^6.3.0":
-  "integrity" "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="
-  "resolved" "https://registry.npmmirror.com/camelcase/-/camelcase-6.3.0.tgz"
-  "version" "6.3.0"
+camelcase@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.npmmirror.com/camelcase/-/camelcase-6.3.0.tgz"
+  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-"caniuse-api@^3.0.0":
-  "integrity" "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="
-  "resolved" "https://registry.npmmirror.com/caniuse-api/-/caniuse-api-3.0.0.tgz"
-  "version" "3.0.0"
+caniuse-api@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/caniuse-api/-/caniuse-api-3.0.0.tgz"
+  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
   dependencies:
-    "browserslist" "^4.0.0"
-    "caniuse-lite" "^1.0.0"
-    "lodash.memoize" "^4.1.2"
-    "lodash.uniq" "^4.5.0"
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
 
-"caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001109", "caniuse-lite@^1.0.30001541":
-  "integrity" "sha512-/Et7DwLqpjS47JPEcz6VnxU9PwcIdVi0ciLXRWBQdj1XFye68pSQYpV0QtPTfUKWuOaEig+/Vez2l74eDc1tPQ=="
-  "resolved" "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001558.tgz"
-  "version" "1.0.30001558"
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001503:
+  version "1.0.30001517"
+  resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz"
+  integrity sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==
 
-"canvg@^3.0.10", "canvg@^3.0.6":
-  "integrity" "sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q=="
-  "resolved" "https://registry.npmmirror.com/canvg/-/canvg-3.0.10.tgz"
-  "version" "3.0.10"
+canvg@^3.0.10, canvg@^3.0.6:
+  version "3.0.10"
+  resolved "https://registry.npmmirror.com/canvg/-/canvg-3.0.10.tgz"
+  integrity sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@types/raf" "^3.4.0"
-    "core-js" "^3.8.3"
-    "raf" "^3.4.1"
-    "regenerator-runtime" "^0.13.7"
-    "rgbcolor" "^1.0.1"
-    "stackblur-canvas" "^2.0.0"
-    "svg-pathdata" "^6.0.3"
+    core-js "^3.8.3"
+    raf "^3.4.1"
+    regenerator-runtime "^0.13.7"
+    rgbcolor "^1.0.1"
+    stackblur-canvas "^2.0.0"
+    svg-pathdata "^6.0.3"
 
-"case-sensitive-paths-webpack-plugin@^2.3.0":
-  "integrity" "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw=="
-  "resolved" "https://registry.npmmirror.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz"
-  "version" "2.4.0"
+case-sensitive-paths-webpack-plugin@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.npmmirror.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz"
+  integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==
 
-"caseless@~0.12.0":
-  "integrity" "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
-  "resolved" "https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz"
-  "version" "0.12.0"
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz"
+  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
-"cfb@~1.2.1":
-  "integrity" "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA=="
-  "resolved" "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz"
-  "version" "1.2.2"
+cfb@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz"
+  integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==
   dependencies:
-    "adler-32" "~1.3.0"
-    "crc-32" "~1.2.0"
+    adler-32 "~1.3.0"
+    crc-32 "~1.2.0"
 
-"chalk@^1.1.3":
-  "integrity" "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A=="
-  "resolved" "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz"
-  "version" "1.1.3"
+chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz"
+  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
   dependencies:
-    "ansi-styles" "^2.2.1"
-    "escape-string-regexp" "^1.0.2"
-    "has-ansi" "^2.0.0"
-    "strip-ansi" "^3.0.0"
-    "supports-color" "^2.0.0"
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
 
-"chalk@^2.0.1":
-  "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="
-  "resolved" "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz"
-  "version" "2.4.2"
+chalk@^2.0.0:
+  version "2.4.2"
+  resolved "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
-    "ansi-styles" "^3.2.1"
-    "escape-string-regexp" "^1.0.5"
-    "supports-color" "^5.3.0"
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
 
-"chalk@^2.1.0":
-  "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="
-  "resolved" "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz"
-  "version" "2.4.2"
+chalk@^2.0.1:
+  version "2.4.2"
+  resolved "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
-    "ansi-styles" "^3.2.1"
-    "escape-string-regexp" "^1.0.5"
-    "supports-color" "^5.3.0"
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
 
-"chalk@^2.4.1":
-  "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="
-  "resolved" "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz"
-  "version" "2.4.2"
+chalk@^2.1.0:
+  version "2.4.2"
+  resolved "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
-    "ansi-styles" "^3.2.1"
-    "escape-string-regexp" "^1.0.5"
-    "supports-color" "^5.3.0"
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
 
-"chalk@^2.4.2":
-  "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="
-  "resolved" "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz"
-  "version" "2.4.2"
+chalk@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
-    "ansi-styles" "^3.2.1"
-    "escape-string-regexp" "^1.0.5"
-    "supports-color" "^5.3.0"
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
 
-"chalk@^3.0.0":
-  "integrity" "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="
-  "resolved" "https://registry.npmmirror.com/chalk/-/chalk-3.0.0.tgz"
-  "version" "3.0.0"
+chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
-    "ansi-styles" "^4.1.0"
-    "supports-color" "^7.1.0"
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
 
-"chalk@^4.0.0", "chalk@^4.1.0", "chalk@4.1.0":
-  "integrity" "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="
-  "resolved" "https://registry.npmmirror.com/chalk/-/chalk-4.1.0.tgz"
-  "version" "4.1.0"
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/chalk/-/chalk-3.0.0.tgz"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
   dependencies:
-    "ansi-styles" "^4.1.0"
-    "supports-color" "^7.1.0"
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
 
-"chalk@2.3.0":
-  "integrity" "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q=="
-  "resolved" "https://registry.npmmirror.com/chalk/-/chalk-2.3.0.tgz"
-  "version" "2.3.0"
+chalk@^4.0.0, chalk@^4.1.0, chalk@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmmirror.com/chalk/-/chalk-4.1.0.tgz"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
   dependencies:
-    "ansi-styles" "^3.1.0"
-    "escape-string-regexp" "^1.0.5"
-    "supports-color" "^4.0.0"
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
 
-"chardet@^0.7.0":
-  "integrity" "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
-  "resolved" "https://registry.npmmirror.com/chardet/-/chardet-0.7.0.tgz"
-  "version" "0.7.0"
-
-"check-types@^8.0.3":
-  "integrity" "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ=="
-  "resolved" "https://registry.npmmirror.com/check-types/-/check-types-8.0.3.tgz"
-  "version" "8.0.3"
-
-"chinese-lunar@^0.1.4":
-  "integrity" "sha512-E4seb9UZkSJtkm65Ry2ZLWTw5Z87DOyGcCePdg3ft7da342hnEliMtcDAPSn+YSo/o0xl1Egmhh671kxEJgY+g=="
-  "resolved" "https://registry.npmmirror.com/chinese-lunar/-/chinese-lunar-0.1.4.tgz"
-  "version" "0.1.4"
-
-"chokidar@^2.1.8":
-  "integrity" "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="
-  "resolved" "https://registry.npmmirror.com/chokidar/-/chokidar-2.1.8.tgz"
-  "version" "2.1.8"
+chalk@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/chalk/-/chalk-2.3.0.tgz"
+  integrity sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==
   dependencies:
-    "anymatch" "^2.0.0"
-    "async-each" "^1.0.1"
-    "braces" "^2.3.2"
-    "glob-parent" "^3.1.0"
-    "inherits" "^2.0.3"
-    "is-binary-path" "^1.0.0"
-    "is-glob" "^4.0.0"
-    "normalize-path" "^3.0.0"
-    "path-is-absolute" "^1.0.0"
-    "readdirp" "^2.2.1"
-    "upath" "^1.1.1"
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.npmmirror.com/chardet/-/chardet-0.7.0.tgz"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+check-types@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.npmmirror.com/check-types/-/check-types-8.0.3.tgz"
+  integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==
+
+chinese-lunar@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npmmirror.com/chinese-lunar/-/chinese-lunar-0.1.4.tgz"
+  integrity sha512-E4seb9UZkSJtkm65Ry2ZLWTw5Z87DOyGcCePdg3ft7da342hnEliMtcDAPSn+YSo/o0xl1Egmhh671kxEJgY+g==
+
+chokidar@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.npmmirror.com/chokidar/-/chokidar-2.1.8.tgz"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
   optionalDependencies:
-    "fsevents" "^1.2.7"
+    fsevents "^1.2.7"
 
-"chokidar@^3.4.1", "chokidar@>=3.0.0 <4.0.0":
-  "integrity" "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="
-  "resolved" "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz"
-  "version" "3.5.3"
+chokidar@^3.4.1, "chokidar@>=3.0.0 <4.0.0":
+  version "3.5.3"
+  resolved "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
   dependencies:
-    "anymatch" "~3.1.2"
-    "braces" "~3.0.2"
-    "glob-parent" "~5.1.2"
-    "is-binary-path" "~2.1.0"
-    "is-glob" "~4.0.1"
-    "normalize-path" "~3.0.0"
-    "readdirp" "~3.6.0"
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
   optionalDependencies:
-    "fsevents" "~2.3.2"
+    fsevents "~2.3.2"
 
-"chownr@^1.1.1":
-  "integrity" "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
-  "resolved" "https://registry.npmmirror.com/chownr/-/chownr-1.1.4.tgz"
-  "version" "1.1.4"
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.npmmirror.com/chownr/-/chownr-1.1.4.tgz"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
-"chownr@^2.0.0":
-  "integrity" "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
-  "resolved" "https://registry.npmmirror.com/chownr/-/chownr-2.0.0.tgz"
-  "version" "2.0.0"
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/chownr/-/chownr-2.0.0.tgz"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
-"chrome-trace-event@^1.0.2":
-  "integrity" "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
-  "resolved" "https://registry.npmmirror.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"
-  "version" "1.0.3"
+chrome-trace-event@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"
+  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
-"ci-info@^1.5.0":
-  "integrity" "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="
-  "resolved" "https://registry.npmmirror.com/ci-info/-/ci-info-1.6.0.tgz"
-  "version" "1.6.0"
+ci-info@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.npmmirror.com/ci-info/-/ci-info-1.6.0.tgz"
+  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
 
-"cipher-base@^1.0.0", "cipher-base@^1.0.1", "cipher-base@^1.0.3":
-  "integrity" "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="
-  "resolved" "https://registry.npmmirror.com/cipher-base/-/cipher-base-1.0.4.tgz"
-  "version" "1.0.4"
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/cipher-base/-/cipher-base-1.0.4.tgz"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
   dependencies:
-    "inherits" "^2.0.1"
-    "safe-buffer" "^5.0.1"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
-"class-utils@^0.3.5":
-  "integrity" "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="
-  "resolved" "https://registry.npmmirror.com/class-utils/-/class-utils-0.3.6.tgz"
-  "version" "0.3.6"
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.npmmirror.com/class-utils/-/class-utils-0.3.6.tgz"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
-    "arr-union" "^3.1.0"
-    "define-property" "^0.2.5"
-    "isobject" "^3.0.0"
-    "static-extend" "^0.1.1"
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
 
-"clean-css@4.2.x":
-  "integrity" "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A=="
-  "resolved" "https://registry.npmmirror.com/clean-css/-/clean-css-4.2.4.tgz"
-  "version" "4.2.4"
+clean-css@4.2.x:
+  version "4.2.4"
+  resolved "https://registry.npmmirror.com/clean-css/-/clean-css-4.2.4.tgz"
+  integrity sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==
   dependencies:
-    "source-map" "~0.6.0"
+    source-map "~0.6.0"
 
-"clean-stack@^2.0.0":
-  "integrity" "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
-  "resolved" "https://registry.npmmirror.com/clean-stack/-/clean-stack-2.2.0.tgz"
-  "version" "2.2.0"
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.npmmirror.com/clean-stack/-/clean-stack-2.2.0.tgz"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-"cli-cursor@^2.1.0":
-  "integrity" "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw=="
-  "resolved" "https://registry.npmmirror.com/cli-cursor/-/cli-cursor-2.1.0.tgz"
-  "version" "2.1.0"
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/cli-cursor/-/cli-cursor-2.1.0.tgz"
+  integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==
   dependencies:
-    "restore-cursor" "^2.0.0"
+    restore-cursor "^2.0.0"
 
-"cli-cursor@^3.1.0":
-  "integrity" "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="
-  "resolved" "https://registry.npmmirror.com/cli-cursor/-/cli-cursor-3.1.0.tgz"
-  "version" "3.1.0"
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/cli-cursor/-/cli-cursor-3.1.0.tgz"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
-    "restore-cursor" "^3.1.0"
+    restore-cursor "^3.1.0"
 
-"cli-highlight@^2.1.4":
-  "integrity" "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="
-  "resolved" "https://registry.npmmirror.com/cli-highlight/-/cli-highlight-2.1.11.tgz"
-  "version" "2.1.11"
+cli-highlight@^2.1.4:
+  version "2.1.11"
+  resolved "https://registry.npmmirror.com/cli-highlight/-/cli-highlight-2.1.11.tgz"
+  integrity sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==
   dependencies:
-    "chalk" "^4.0.0"
-    "highlight.js" "^10.7.1"
-    "mz" "^2.4.0"
-    "parse5" "^5.1.1"
-    "parse5-htmlparser2-tree-adapter" "^6.0.0"
-    "yargs" "^16.0.0"
+    chalk "^4.0.0"
+    highlight.js "^10.7.1"
+    mz "^2.4.0"
+    parse5 "^5.1.1"
+    parse5-htmlparser2-tree-adapter "^6.0.0"
+    yargs "^16.0.0"
 
-"cli-spinners@^2.0.0":
-  "integrity" "sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ=="
-  "resolved" "https://registry.npmmirror.com/cli-spinners/-/cli-spinners-2.9.1.tgz"
-  "version" "2.9.1"
+cli-spinners@^2.0.0:
+  version "2.9.0"
+  resolved "https://registry.npmmirror.com/cli-spinners/-/cli-spinners-2.9.0.tgz"
+  integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==
 
-"cli-truncate@^2.1.0":
-  "integrity" "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="
-  "resolved" "https://registry.npmmirror.com/cli-truncate/-/cli-truncate-2.1.0.tgz"
-  "version" "2.1.0"
+cli-truncate@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/cli-truncate/-/cli-truncate-2.1.0.tgz"
+  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
   dependencies:
-    "slice-ansi" "^3.0.0"
-    "string-width" "^4.2.0"
+    slice-ansi "^3.0.0"
+    string-width "^4.2.0"
 
-"cli-truncate@^3.1.0":
-  "integrity" "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA=="
-  "resolved" "https://registry.npmmirror.com/cli-truncate/-/cli-truncate-3.1.0.tgz"
-  "version" "3.1.0"
+cli-truncate@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/cli-truncate/-/cli-truncate-3.1.0.tgz"
+  integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==
   dependencies:
-    "slice-ansi" "^5.0.0"
-    "string-width" "^5.0.0"
+    slice-ansi "^5.0.0"
+    string-width "^5.0.0"
 
-"cli-width@^3.0.0":
-  "integrity" "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="
-  "resolved" "https://registry.npmmirror.com/cli-width/-/cli-width-3.0.0.tgz"
-  "version" "3.0.0"
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/cli-width/-/cli-width-3.0.0.tgz"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-"clipboard@2.0.8":
-  "integrity" "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ=="
-  "resolved" "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.8.tgz"
-  "version" "2.0.8"
+clipboard@2.0.8:
+  version "2.0.8"
+  resolved "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.8.tgz"
+  integrity sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==
   dependencies:
-    "good-listener" "^1.2.2"
-    "select" "^1.1.2"
-    "tiny-emitter" "^2.0.0"
+    good-listener "^1.2.2"
+    select "^1.1.2"
+    tiny-emitter "^2.0.0"
 
-"clipboardy@^2.3.0":
-  "integrity" "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="
-  "resolved" "https://registry.npmmirror.com/clipboardy/-/clipboardy-2.3.0.tgz"
-  "version" "2.3.0"
+clipboardy@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/clipboardy/-/clipboardy-2.3.0.tgz"
+  integrity sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==
   dependencies:
-    "arch" "^2.1.1"
-    "execa" "^1.0.0"
-    "is-wsl" "^2.1.1"
+    arch "^2.1.1"
+    execa "^1.0.0"
+    is-wsl "^2.1.1"
 
-"cliui@^5.0.0":
-  "integrity" "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="
-  "resolved" "https://registry.npmmirror.com/cliui/-/cliui-5.0.0.tgz"
-  "version" "5.0.0"
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmmirror.com/cliui/-/cliui-5.0.0.tgz"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
   dependencies:
-    "string-width" "^3.1.0"
-    "strip-ansi" "^5.2.0"
-    "wrap-ansi" "^5.1.0"
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
 
-"cliui@^6.0.0":
-  "integrity" "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="
-  "resolved" "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz"
-  "version" "6.0.0"
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
   dependencies:
-    "string-width" "^4.2.0"
-    "strip-ansi" "^6.0.0"
-    "wrap-ansi" "^6.2.0"
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
 
-"cliui@^7.0.2":
-  "integrity" "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="
-  "resolved" "https://registry.npmmirror.com/cliui/-/cliui-7.0.4.tgz"
-  "version" "7.0.4"
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.npmmirror.com/cliui/-/cliui-7.0.4.tgz"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
   dependencies:
-    "string-width" "^4.2.0"
-    "strip-ansi" "^6.0.0"
-    "wrap-ansi" "^7.0.0"
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
 
-"clone@^1.0.2":
-  "integrity" "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="
-  "resolved" "https://registry.npmmirror.com/clone/-/clone-1.0.4.tgz"
-  "version" "1.0.4"
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/clone/-/clone-1.0.4.tgz"
+  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-"clone@^2.1.1":
-  "integrity" "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
-  "resolved" "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz"
-  "version" "2.1.2"
+clone@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz"
+  integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
 
-"clsx@^2.0.0":
-  "integrity" "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q=="
-  "resolved" "https://registry.npmmirror.com/clsx/-/clsx-2.0.0.tgz"
-  "version" "2.0.0"
+clsx@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/clsx/-/clsx-2.0.0.tgz"
+  integrity sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==
 
-"coa@^2.0.2":
-  "integrity" "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="
-  "resolved" "https://registry.npmmirror.com/coa/-/coa-2.0.2.tgz"
-  "version" "2.0.2"
+coa@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/coa/-/coa-2.0.2.tgz"
+  integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==
   dependencies:
     "@types/q" "^1.5.1"
-    "chalk" "^2.4.1"
-    "q" "^1.1.2"
+    chalk "^2.4.1"
+    q "^1.1.2"
 
-"code-brick-zj@^1.0.2":
-  "integrity" "sha512-NEpNcbuwdVebH+eEY9Y1BY5MIfjBp51DMEPv4X3H90a6hGdnH9AUZ2b5umf6tQgUKP/OAR9T+90CGy8WuTsdIw=="
-  "resolved" "https://registry.npmmirror.com/code-brick-zj/-/code-brick-zj-1.0.5.tgz"
-  "version" "1.0.5"
+code-brick-zj@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/code-brick-zj/-/code-brick-zj-1.0.2.tgz"
+  integrity sha512-V8XwYqXjIPMfPCaZMja4I2MJPT45EEnzRmTL1Ps6aMsmUQ/PhZ48OwUvddBFNqNZeVV13aPm1b5K1c3ogfad8Q==
 
-"codepage@~1.15.0":
-  "integrity" "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA=="
-  "resolved" "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz"
-  "version" "1.15.0"
+codepage@~1.15.0:
+  version "1.15.0"
+  resolved "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz"
+  integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==
 
-"collection-visit@^1.0.0":
-  "integrity" "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw=="
-  "resolved" "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz"
-  "version" "1.0.0"
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz"
+  integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
   dependencies:
-    "map-visit" "^1.0.0"
-    "object-visit" "^1.0.0"
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
 
-"color-convert@^1.9.0", "color-convert@^1.9.3":
-  "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
-  "resolved" "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
-  "version" "1.9.3"
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
-    "color-name" "1.1.3"
+    color-name "1.1.3"
 
-"color-convert@^2.0.1":
-  "integrity" "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
-  "resolved" "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz"
-  "version" "2.0.1"
+color-convert@^1.9.3:
+  version "1.9.3"
+  resolved "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
-    "color-name" "~1.1.4"
+    color-name "1.1.3"
 
-"color-name@^1.0.0", "color-name@1.1.3":
-  "integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-  "resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz"
-  "version" "1.1.3"
-
-"color-name@~1.1.4":
-  "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-  "resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz"
-  "version" "1.1.4"
-
-"color-string@^1.6.0":
-  "integrity" "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="
-  "resolved" "https://registry.npmmirror.com/color-string/-/color-string-1.9.1.tgz"
-  "version" "1.9.1"
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
   dependencies:
-    "color-name" "^1.0.0"
-    "simple-swizzle" "^0.2.2"
+    color-name "~1.1.4"
 
-"color@^3.0.0":
-  "integrity" "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="
-  "resolved" "https://registry.npmmirror.com/color/-/color-3.2.1.tgz"
-  "version" "3.2.1"
+color-name@^1.0.0, color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+
+color-string@^1.6.0:
+  version "1.9.1"
+  resolved "https://registry.npmmirror.com/color-string/-/color-string-1.9.1.tgz"
+  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
   dependencies:
-    "color-convert" "^1.9.3"
-    "color-string" "^1.6.0"
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
 
-"colorette@^2.0.16":
-  "integrity" "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
-  "resolved" "https://registry.npmmirror.com/colorette/-/colorette-2.0.20.tgz"
-  "version" "2.0.20"
-
-"combined-stream@^1.0.6", "combined-stream@^1.0.8", "combined-stream@~1.0.6":
-  "integrity" "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="
-  "resolved" "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz"
-  "version" "1.0.8"
+color@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.npmmirror.com/color/-/color-3.2.1.tgz"
+  integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
   dependencies:
-    "delayed-stream" "~1.0.0"
+    color-convert "^1.9.3"
+    color-string "^1.6.0"
 
-"commander@*", "commander@^2.18.0", "commander@^2.19.0", "commander@^2.20.0":
-  "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
-  "version" "2.20.3"
+colorette@^2.0.16:
+  version "2.0.20"
+  resolved "https://registry.npmmirror.com/colorette/-/colorette-2.0.20.tgz"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
-"commander@^9.3.0":
-  "integrity" "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="
-  "resolved" "https://registry.npmmirror.com/commander/-/commander-9.5.0.tgz"
-  "version" "9.5.0"
-
-"commander@~2.19.0":
-  "integrity" "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
-  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.19.0.tgz"
-  "version" "2.19.0"
-
-"commander@2.17.x":
-  "integrity" "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
-  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.17.1.tgz"
-  "version" "2.17.1"
-
-"commondir@^1.0.1":
-  "integrity" "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
-  "resolved" "https://registry.npmmirror.com/commondir/-/commondir-1.0.1.tgz"
-  "version" "1.0.1"
-
-"component-classes@^1.2.3":
-  "integrity" "sha512-hPFGULxdwugu1QWW3SvVOCUHLzO34+a2J6Wqy0c5ASQkfi9/8nZcBB0ZohaEbXOQlCflMAEMmEWk7u7BVs4koA=="
-  "resolved" "https://registry.npmmirror.com/component-classes/-/component-classes-1.2.6.tgz"
-  "version" "1.2.6"
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
-    "component-indexof" "0.0.3"
+    delayed-stream "~1.0.0"
 
-"component-closest@*", "component-closest@^0.1.4":
-  "integrity" "sha512-NF9hMj6JKGM5sb6wP/dg7GdJOttaIH9PcTsUNdWcrvu7Kw/5R5swQAFpgaYEHlARrNMyn4Wf7O1PlRej+pt76Q=="
-  "resolved" "https://registry.npmmirror.com/component-closest/-/component-closest-0.1.4.tgz"
-  "version" "0.1.4"
+commander@*, commander@2.17.x:
+  version "2.17.1"
+  resolved "https://registry.npmmirror.com/commander/-/commander-2.17.1.tgz"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
+
+commander@^2.18.0:
+  version "2.20.3"
+  resolved "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^2.19.0:
+  version "2.20.3"
+  resolved "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^2.20.0:
+  version "2.20.3"
+  resolved "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^9.3.0:
+  version "9.5.0"
+  resolved "https://registry.npmmirror.com/commander/-/commander-9.5.0.tgz"
+  integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
+
+commander@~2.19.0:
+  version "2.19.0"
+  resolved "https://registry.npmmirror.com/commander/-/commander-2.19.0.tgz"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/commondir/-/commondir-1.0.1.tgz"
+  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
+
+component-classes@^1.2.3:
+  version "1.2.6"
+  resolved "https://registry.npmmirror.com/component-classes/-/component-classes-1.2.6.tgz"
+  integrity sha512-hPFGULxdwugu1QWW3SvVOCUHLzO34+a2J6Wqy0c5ASQkfi9/8nZcBB0ZohaEbXOQlCflMAEMmEWk7u7BVs4koA==
   dependencies:
-    "component-matches-selector" "~0.1.5"
+    component-indexof "0.0.3"
 
-"component-delegate@^0.2.3":
-  "integrity" "sha512-OlpcB/6Fi+kXQPh/TfXnSvvmrU04ghz7vcJh/jgLF0Ni+I+E3WGlKJQbBGDa5X+kVUG8WxOgjP+8iWbz902fPg=="
-  "resolved" "https://registry.npmmirror.com/component-delegate/-/component-delegate-0.2.4.tgz"
-  "version" "0.2.4"
+component-closest@*, component-closest@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npmmirror.com/component-closest/-/component-closest-0.1.4.tgz"
+  integrity sha512-NF9hMj6JKGM5sb6wP/dg7GdJOttaIH9PcTsUNdWcrvu7Kw/5R5swQAFpgaYEHlARrNMyn4Wf7O1PlRej+pt76Q==
   dependencies:
-    "component-closest" "*"
-    "component-event" "*"
+    component-matches-selector "~0.1.5"
 
-"component-emitter@^1.2.1":
-  "integrity" "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
-  "resolved" "https://registry.npmmirror.com/component-emitter/-/component-emitter-1.3.0.tgz"
-  "version" "1.3.0"
-
-"component-event@*", "component-event@^0.1.4":
-  "integrity" "sha512-GMwOG8MnUHP1l8DZx1ztFO0SJTFnIzZnBDkXAj8RM2ntV2A6ALlDxgbMY1Fvxlg6WPQ+5IM/a6vg4PEYbjg/Rw=="
-  "resolved" "https://registry.npmmirror.com/component-event/-/component-event-0.1.4.tgz"
-  "version" "0.1.4"
-
-"component-event@^0.2.1":
-  "integrity" "sha512-wGA++isMqiDq1jPYeyv2as/Bt/u+3iLW0rEa+8NQ82jAv3TgqMiCM+B2SaBdn2DfLilLjjq736YcezihRYhfxw=="
-  "resolved" "https://registry.npmmirror.com/component-event/-/component-event-0.2.1.tgz"
-  "version" "0.2.1"
-
-"component-indexof@0.0.3":
-  "integrity" "sha512-puDQKvx/64HZXb4hBwIcvQLaLgux8o1CbWl39s41hrIIZDl1lJiD5jc22gj3RBeGK0ovxALDYpIbyjqDUUl0rw=="
-  "resolved" "https://registry.npmmirror.com/component-indexof/-/component-indexof-0.0.3.tgz"
-  "version" "0.0.3"
-
-"component-matches-selector@^0.1.5", "component-matches-selector@~0.1.5":
-  "integrity" "sha512-Yb2+pVBvrqkQVpPaDBF0DYXRreBveXJNrpJs9FnFu8PF6/5IIcz5oDZqiH9nB5hbD2/TmFVN5ZCxBzqu7yFFYQ=="
-  "resolved" "https://registry.npmmirror.com/component-matches-selector/-/component-matches-selector-0.1.7.tgz"
-  "version" "0.1.7"
+component-delegate@^0.2.3:
+  version "0.2.4"
+  resolved "https://registry.npmmirror.com/component-delegate/-/component-delegate-0.2.4.tgz"
+  integrity sha512-OlpcB/6Fi+kXQPh/TfXnSvvmrU04ghz7vcJh/jgLF0Ni+I+E3WGlKJQbBGDa5X+kVUG8WxOgjP+8iWbz902fPg==
   dependencies:
-    "component-query" "*"
-    "global-object" "^1.0.0"
+    component-closest "*"
+    component-event "*"
 
-"component-query@*", "component-query@^0.0.3":
-  "integrity" "sha512-VgebQseT1hz1Ps7vVp2uaSg+N/gsI5ts3AZUSnN6GMA2M82JH7o+qYifWhmVE/e8w/H48SJuA3nA9uX8zRe95Q=="
-  "resolved" "https://registry.npmmirror.com/component-query/-/component-query-0.0.3.tgz"
-  "version" "0.0.3"
+component-emitter@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.npmmirror.com/component-emitter/-/component-emitter-1.3.0.tgz"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-"compressible@~2.0.16":
-  "integrity" "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="
-  "resolved" "https://registry.npmmirror.com/compressible/-/compressible-2.0.18.tgz"
-  "version" "2.0.18"
+component-event@*, component-event@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npmmirror.com/component-event/-/component-event-0.1.4.tgz"
+  integrity sha512-GMwOG8MnUHP1l8DZx1ztFO0SJTFnIzZnBDkXAj8RM2ntV2A6ALlDxgbMY1Fvxlg6WPQ+5IM/a6vg4PEYbjg/Rw==
+
+component-event@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.npmmirror.com/component-event/-/component-event-0.2.1.tgz"
+  integrity sha512-wGA++isMqiDq1jPYeyv2as/Bt/u+3iLW0rEa+8NQ82jAv3TgqMiCM+B2SaBdn2DfLilLjjq736YcezihRYhfxw==
+
+component-indexof@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.npmmirror.com/component-indexof/-/component-indexof-0.0.3.tgz"
+  integrity sha512-puDQKvx/64HZXb4hBwIcvQLaLgux8o1CbWl39s41hrIIZDl1lJiD5jc22gj3RBeGK0ovxALDYpIbyjqDUUl0rw==
+
+component-matches-selector@^0.1.5, component-matches-selector@~0.1.5:
+  version "0.1.7"
+  resolved "https://registry.npmmirror.com/component-matches-selector/-/component-matches-selector-0.1.7.tgz"
+  integrity sha512-Yb2+pVBvrqkQVpPaDBF0DYXRreBveXJNrpJs9FnFu8PF6/5IIcz5oDZqiH9nB5hbD2/TmFVN5ZCxBzqu7yFFYQ==
   dependencies:
-    "mime-db" ">= 1.43.0 < 2"
+    component-query "*"
+    global-object "^1.0.0"
 
-"compression-webpack-plugin@5.0.2":
-  "integrity" "sha512-F2G4cQfsMZ6CiPlG22Q5EDUCqnfyZqTjyJP5cMgNYUbBg/dUzV3hto8yTFFIogDCTWooVbePHQE0qL6FrJUSsA=="
-  "resolved" "https://registry.npmmirror.com/compression-webpack-plugin/-/compression-webpack-plugin-5.0.2.tgz"
-  "version" "5.0.2"
+component-query@*, component-query@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.npmmirror.com/component-query/-/component-query-0.0.3.tgz"
+  integrity sha512-VgebQseT1hz1Ps7vVp2uaSg+N/gsI5ts3AZUSnN6GMA2M82JH7o+qYifWhmVE/e8w/H48SJuA3nA9uX8zRe95Q==
+
+compressible@~2.0.16:
+  version "2.0.18"
+  resolved "https://registry.npmmirror.com/compressible/-/compressible-2.0.18.tgz"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
   dependencies:
-    "cacache" "^15.0.5"
-    "find-cache-dir" "^3.3.1"
-    "schema-utils" "^2.7.0"
-    "serialize-javascript" "^4.0.0"
-    "webpack-sources" "^1.4.3"
+    mime-db ">= 1.43.0 < 2"
 
-"compression@^1.7.4":
-  "integrity" "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="
-  "resolved" "https://registry.npmmirror.com/compression/-/compression-1.7.4.tgz"
-  "version" "1.7.4"
+compression-webpack-plugin@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.npmmirror.com/compression-webpack-plugin/-/compression-webpack-plugin-5.0.2.tgz"
+  integrity sha512-F2G4cQfsMZ6CiPlG22Q5EDUCqnfyZqTjyJP5cMgNYUbBg/dUzV3hto8yTFFIogDCTWooVbePHQE0qL6FrJUSsA==
   dependencies:
-    "accepts" "~1.3.5"
-    "bytes" "3.0.0"
-    "compressible" "~2.0.16"
-    "debug" "2.6.9"
-    "on-headers" "~1.0.2"
-    "safe-buffer" "5.1.2"
-    "vary" "~1.1.2"
+    cacache "^15.0.5"
+    find-cache-dir "^3.3.1"
+    schema-utils "^2.7.0"
+    serialize-javascript "^4.0.0"
+    webpack-sources "^1.4.3"
 
-"concat-map@0.0.1":
-  "integrity" "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-  "resolved" "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz"
-  "version" "0.0.1"
-
-"concat-stream@^1.5.0":
-  "integrity" "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="
-  "resolved" "https://registry.npmmirror.com/concat-stream/-/concat-stream-1.6.2.tgz"
-  "version" "1.6.2"
+compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.npmmirror.com/compression/-/compression-1.7.4.tgz"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
-    "buffer-from" "^1.0.0"
-    "inherits" "^2.0.3"
-    "readable-stream" "^2.2.2"
-    "typedarray" "^0.0.6"
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
 
-"config-chain@^1.1.12":
-  "integrity" "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="
-  "resolved" "https://registry.npmmirror.com/config-chain/-/config-chain-1.1.13.tgz"
-  "version" "1.1.13"
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
+concat-stream@^1.5.0:
+  version "1.6.2"
+  resolved "https://registry.npmmirror.com/concat-stream/-/concat-stream-1.6.2.tgz"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
-    "ini" "^1.3.4"
-    "proto-list" "~1.2.1"
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
 
-"confusing-browser-globals@^1.0.10":
-  "integrity" "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="
-  "resolved" "https://registry.npmmirror.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz"
-  "version" "1.0.11"
-
-"connect-history-api-fallback@^1.6.0":
-  "integrity" "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="
-  "resolved" "https://registry.npmmirror.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"
-  "version" "1.6.0"
-
-"connect@3.6.6":
-  "integrity" "sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ=="
-  "resolved" "https://registry.npmmirror.com/connect/-/connect-3.6.6.tgz"
-  "version" "3.6.6"
+config-chain@^1.1.12:
+  version "1.1.13"
+  resolved "https://registry.npmmirror.com/config-chain/-/config-chain-1.1.13.tgz"
+  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
   dependencies:
-    "debug" "2.6.9"
-    "finalhandler" "1.1.0"
-    "parseurl" "~1.3.2"
-    "utils-merge" "1.0.1"
+    ini "^1.3.4"
+    proto-list "~1.2.1"
 
-"console-browserify@^1.1.0":
-  "integrity" "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
-  "resolved" "https://registry.npmmirror.com/console-browserify/-/console-browserify-1.2.0.tgz"
-  "version" "1.2.0"
+confusing-browser-globals@^1.0.10:
+  version "1.0.11"
+  resolved "https://registry.npmmirror.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz"
+  integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
 
-"consolidate@^0.15.1":
-  "integrity" "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="
-  "resolved" "https://registry.npmmirror.com/consolidate/-/consolidate-0.15.1.tgz"
-  "version" "0.15.1"
+connect-history-api-fallback@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.npmmirror.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"
+  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
+
+connect@3.6.6:
+  version "3.6.6"
+  resolved "https://registry.npmmirror.com/connect/-/connect-3.6.6.tgz"
+  integrity sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==
   dependencies:
-    "bluebird" "^3.1.1"
+    debug "2.6.9"
+    finalhandler "1.1.0"
+    parseurl "~1.3.2"
+    utils-merge "1.0.1"
 
-"constants-browserify@^1.0.0":
-  "integrity" "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="
-  "resolved" "https://registry.npmmirror.com/constants-browserify/-/constants-browserify-1.0.0.tgz"
-  "version" "1.0.0"
+console-browserify@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/console-browserify/-/console-browserify-1.2.0.tgz"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-"content-disposition@0.5.4":
-  "integrity" "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="
-  "resolved" "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz"
-  "version" "0.5.4"
+consolidate@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.npmmirror.com/consolidate/-/consolidate-0.15.1.tgz"
+  integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
   dependencies:
-    "safe-buffer" "5.2.1"
+    bluebird "^3.1.1"
 
-"content-type@~1.0.4":
-  "integrity" "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
-  "resolved" "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz"
-  "version" "1.0.5"
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/constants-browserify/-/constants-browserify-1.0.0.tgz"
+  integrity sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==
 
-"convert-source-map@^2.0.0":
-  "integrity" "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
-  "resolved" "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz"
-  "version" "2.0.0"
-
-"cookie-signature@1.0.6":
-  "integrity" "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
-  "resolved" "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz"
-  "version" "1.0.6"
-
-"cookie@0.5.0":
-  "integrity" "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
-  "resolved" "https://registry.npmmirror.com/cookie/-/cookie-0.5.0.tgz"
-  "version" "0.5.0"
-
-"copy-concurrently@^1.0.0":
-  "integrity" "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A=="
-  "resolved" "https://registry.npmmirror.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"
-  "version" "1.0.5"
+content-disposition@0.5.4:
+  version "0.5.4"
+  resolved "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz"
+  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
   dependencies:
-    "aproba" "^1.1.1"
-    "fs-write-stream-atomic" "^1.0.8"
-    "iferr" "^0.1.5"
-    "mkdirp" "^0.5.1"
-    "rimraf" "^2.5.4"
-    "run-queue" "^1.0.0"
+    safe-buffer "5.2.1"
 
-"copy-descriptor@^0.1.0":
-  "integrity" "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw=="
-  "resolved" "https://registry.npmmirror.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"
-  "version" "0.1.1"
+content-type@~1.0.4:
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
 
-"copy-webpack-plugin@^5.1.1":
-  "integrity" "sha512-Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="
-  "resolved" "https://registry.npmmirror.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz"
-  "version" "5.1.2"
+convert-source-map@^1.7.0:
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz"
+  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz"
+  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
+
+cookie@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.npmmirror.com/cookie/-/cookie-0.5.0.tgz"
+  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
   dependencies:
-    "cacache" "^12.0.3"
-    "find-cache-dir" "^2.1.0"
-    "glob-parent" "^3.1.0"
-    "globby" "^7.1.1"
-    "is-glob" "^4.0.1"
-    "loader-utils" "^1.2.3"
-    "minimatch" "^3.0.4"
-    "normalize-path" "^3.0.0"
-    "p-limit" "^2.2.1"
-    "schema-utils" "^1.0.0"
-    "serialize-javascript" "^4.0.0"
-    "webpack-log" "^2.0.0"
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
 
-"core-js-compat@^3.31.0", "core-js-compat@^3.33.1", "core-js-compat@^3.6.5":
-  "integrity" "sha512-6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ=="
-  "resolved" "https://registry.npmmirror.com/core-js-compat/-/core-js-compat-3.33.1.tgz"
-  "version" "3.33.1"
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.npmmirror.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"
+  integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
+
+copy-webpack-plugin@^5.1.1:
+  version "5.1.2"
+  resolved "https://registry.npmmirror.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz"
+  integrity sha512-Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ==
   dependencies:
-    "browserslist" "^4.22.1"
+    cacache "^12.0.3"
+    find-cache-dir "^2.1.0"
+    glob-parent "^3.1.0"
+    globby "^7.1.1"
+    is-glob "^4.0.1"
+    loader-utils "^1.2.3"
+    minimatch "^3.0.4"
+    normalize-path "^3.0.0"
+    p-limit "^2.2.1"
+    schema-utils "^1.0.0"
+    serialize-javascript "^4.0.0"
+    webpack-log "^2.0.0"
 
-"core-js@^2.4.0":
-  "integrity" "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
-  "resolved" "https://registry.npmmirror.com/core-js/-/core-js-2.6.12.tgz"
-  "version" "2.6.12"
-
-"core-js@^3.26.0", "core-js@^3.6.0", "core-js@^3.6.5", "core-js@^3.8.3":
-  "integrity" "sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q=="
-  "resolved" "https://registry.npmmirror.com/core-js/-/core-js-3.33.1.tgz"
-  "version" "3.33.1"
-
-"core-util-is@~1.0.0", "core-util-is@1.0.2":
-  "integrity" "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
-  "resolved" "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.2.tgz"
-  "version" "1.0.2"
-
-"cosmiconfig@^5.0.0":
-  "integrity" "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="
-  "resolved" "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"
-  "version" "5.2.1"
+core-js-compat@^3.31.0, core-js-compat@^3.6.5:
+  version "3.31.1"
+  resolved "https://registry.npmmirror.com/core-js-compat/-/core-js-compat-3.31.1.tgz"
+  integrity sha512-wIDWd2s5/5aJSdpOJHfSibxNODxoGoWOBHt8JSPB41NOE94M7kuTPZCYLOlTtuoXTsBPKobpJ6T+y0SSy5L9SA==
   dependencies:
-    "import-fresh" "^2.0.0"
-    "is-directory" "^0.3.1"
-    "js-yaml" "^3.13.1"
-    "parse-json" "^4.0.0"
+    browserslist "^4.21.9"
 
-"crc-32@~1.2.0", "crc-32@~1.2.1":
-  "integrity" "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
-  "resolved" "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz"
-  "version" "1.2.2"
+core-js@^2.4.0:
+  version "2.6.12"
+  resolved "https://registry.npmmirror.com/core-js/-/core-js-2.6.12.tgz"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
-"create-ecdh@^4.0.0":
-  "integrity" "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="
-  "resolved" "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz"
-  "version" "4.0.4"
+core-js@^3.26.0, core-js@^3.6.0, core-js@^3.6.5, core-js@^3.8.3:
+  version "3.31.1"
+  resolved "https://registry.npmmirror.com/core-js/-/core-js-3.31.1.tgz"
+  integrity sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ==
+
+core-util-is@~1.0.0, core-util-is@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.2.tgz"
+  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
+
+cosmiconfig@^5.0.0:
+  version "5.2.1"
+  resolved "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
   dependencies:
-    "bn.js" "^4.1.0"
-    "elliptic" "^6.5.3"
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.13.1"
+    parse-json "^4.0.0"
 
-"create-hash@^1.1.0", "create-hash@^1.1.2", "create-hash@^1.2.0":
-  "integrity" "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="
-  "resolved" "https://registry.npmmirror.com/create-hash/-/create-hash-1.2.0.tgz"
-  "version" "1.2.0"
+crc-32@~1.2.0, crc-32@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz"
+  integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
+
+create-ecdh@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz"
+  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
   dependencies:
-    "cipher-base" "^1.0.1"
-    "inherits" "^2.0.1"
-    "md5.js" "^1.3.4"
-    "ripemd160" "^2.0.1"
-    "sha.js" "^2.4.0"
+    bn.js "^4.1.0"
+    elliptic "^6.5.3"
 
-"create-hmac@^1.1.0", "create-hmac@^1.1.4", "create-hmac@^1.1.7":
-  "integrity" "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="
-  "resolved" "https://registry.npmmirror.com/create-hmac/-/create-hmac-1.1.7.tgz"
-  "version" "1.1.7"
+create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/create-hash/-/create-hash-1.2.0.tgz"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
-    "cipher-base" "^1.0.3"
-    "create-hash" "^1.1.0"
-    "inherits" "^2.0.1"
-    "ripemd160" "^2.0.0"
-    "safe-buffer" "^5.0.1"
-    "sha.js" "^2.4.8"
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
 
-"cross-spawn@^5.0.1":
-  "integrity" "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A=="
-  "resolved" "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-5.1.0.tgz"
-  "version" "5.1.0"
+create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.npmmirror.com/create-hmac/-/create-hmac-1.1.7.tgz"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
   dependencies:
-    "lru-cache" "^4.0.1"
-    "shebang-command" "^1.2.0"
-    "which" "^1.2.9"
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
 
-"cross-spawn@^6.0.0":
-  "integrity" "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="
-  "resolved" "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-6.0.5.tgz"
-  "version" "6.0.5"
+cross-spawn@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-5.1.0.tgz"
+  integrity sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==
   dependencies:
-    "nice-try" "^1.0.4"
-    "path-key" "^2.0.1"
-    "semver" "^5.5.0"
-    "shebang-command" "^1.2.0"
-    "which" "^1.2.9"
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
 
-"cross-spawn@^6.0.5":
-  "integrity" "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="
-  "resolved" "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-6.0.5.tgz"
-  "version" "6.0.5"
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-6.0.5.tgz"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
-    "nice-try" "^1.0.4"
-    "path-key" "^2.0.1"
-    "semver" "^5.5.0"
-    "shebang-command" "^1.2.0"
-    "which" "^1.2.9"
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
 
-"cross-spawn@^7.0.0":
-  "integrity" "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="
-  "resolved" "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz"
-  "version" "7.0.3"
+cross-spawn@^7.0.0:
+  version "7.0.3"
+  resolved "https://registry.npmmirror.com/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"
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
 
-"cross-spawn@^7.0.3":
-  "integrity" "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="
-  "resolved" "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz"
-  "version" "7.0.3"
+cross-spawn@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.npmmirror.com/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"
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
 
-"crypto-browserify@^3.11.0":
-  "integrity" "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="
-  "resolved" "https://registry.npmmirror.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz"
-  "version" "3.12.0"
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.npmmirror.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
   dependencies:
-    "browserify-cipher" "^1.0.0"
-    "browserify-sign" "^4.0.0"
-    "create-ecdh" "^4.0.0"
-    "create-hash" "^1.1.0"
-    "create-hmac" "^1.1.0"
-    "diffie-hellman" "^5.0.0"
-    "inherits" "^2.0.1"
-    "pbkdf2" "^3.0.3"
-    "public-encrypt" "^4.0.0"
-    "randombytes" "^2.0.0"
-    "randomfill" "^1.0.3"
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
 
-"crypto-js@^4.0.0":
-  "integrity" "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
-  "resolved" "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz"
-  "version" "4.2.0"
+crypto-js@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz"
+  integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==
 
-"css-color-names@^0.0.4", "css-color-names@0.0.4":
-  "integrity" "sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q=="
-  "resolved" "https://registry.npmmirror.com/css-color-names/-/css-color-names-0.0.4.tgz"
-  "version" "0.0.4"
+css-color-names@^0.0.4, css-color-names@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.npmmirror.com/css-color-names/-/css-color-names-0.0.4.tgz"
+  integrity sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==
 
-"css-declaration-sorter@^4.0.1":
-  "integrity" "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="
-  "resolved" "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"
-  "version" "4.0.1"
+css-declaration-sorter@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"
+  integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==
   dependencies:
-    "postcss" "^7.0.1"
-    "timsort" "^0.3.0"
+    postcss "^7.0.1"
+    timsort "^0.3.0"
 
-"css-line-break@^2.1.0":
-  "integrity" "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w=="
-  "resolved" "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz"
-  "version" "2.1.0"
+css-line-break@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz"
+  integrity sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==
   dependencies:
-    "utrie" "^1.0.2"
+    utrie "^1.0.2"
 
-"css-loader@*", "css-loader@^3.5.3":
-  "integrity" "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ=="
-  "resolved" "https://registry.npmmirror.com/css-loader/-/css-loader-3.6.0.tgz"
-  "version" "3.6.0"
+css-loader@*, css-loader@^3.5.3:
+  version "3.6.0"
+  resolved "https://registry.npmmirror.com/css-loader/-/css-loader-3.6.0.tgz"
+  integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
   dependencies:
-    "camelcase" "^5.3.1"
-    "cssesc" "^3.0.0"
-    "icss-utils" "^4.1.1"
-    "loader-utils" "^1.2.3"
-    "normalize-path" "^3.0.0"
-    "postcss" "^7.0.32"
-    "postcss-modules-extract-imports" "^2.0.0"
-    "postcss-modules-local-by-default" "^3.0.2"
-    "postcss-modules-scope" "^2.2.0"
-    "postcss-modules-values" "^3.0.0"
-    "postcss-value-parser" "^4.1.0"
-    "schema-utils" "^2.7.0"
-    "semver" "^6.3.0"
+    camelcase "^5.3.1"
+    cssesc "^3.0.0"
+    icss-utils "^4.1.1"
+    loader-utils "^1.2.3"
+    normalize-path "^3.0.0"
+    postcss "^7.0.32"
+    postcss-modules-extract-imports "^2.0.0"
+    postcss-modules-local-by-default "^3.0.2"
+    postcss-modules-scope "^2.2.0"
+    postcss-modules-values "^3.0.0"
+    postcss-value-parser "^4.1.0"
+    schema-utils "^2.7.0"
+    semver "^6.3.0"
 
-"css-select-base-adapter@^0.1.1":
-  "integrity" "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
-  "resolved" "https://registry.npmmirror.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"
-  "version" "0.1.1"
+css-select-base-adapter@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npmmirror.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"
+  integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==
 
-"css-select@^2.0.0":
-  "integrity" "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="
-  "resolved" "https://registry.npmmirror.com/css-select/-/css-select-2.1.0.tgz"
-  "version" "2.1.0"
+css-select@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/css-select/-/css-select-2.1.0.tgz"
+  integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==
   dependencies:
-    "boolbase" "^1.0.0"
-    "css-what" "^3.2.1"
-    "domutils" "^1.7.0"
-    "nth-check" "^1.0.2"
+    boolbase "^1.0.0"
+    css-what "^3.2.1"
+    domutils "^1.7.0"
+    nth-check "^1.0.2"
 
-"css-select@^4.1.3":
-  "integrity" "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ=="
-  "resolved" "https://registry.npmmirror.com/css-select/-/css-select-4.3.0.tgz"
-  "version" "4.3.0"
+css-select@^4.1.3:
+  version "4.3.0"
+  resolved "https://registry.npmmirror.com/css-select/-/css-select-4.3.0.tgz"
+  integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
   dependencies:
-    "boolbase" "^1.0.0"
-    "css-what" "^6.0.1"
-    "domhandler" "^4.3.1"
-    "domutils" "^2.8.0"
-    "nth-check" "^2.0.1"
+    boolbase "^1.0.0"
+    css-what "^6.0.1"
+    domhandler "^4.3.1"
+    domutils "^2.8.0"
+    nth-check "^2.0.1"
 
-"css-tree@^1.1.2":
-  "integrity" "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="
-  "resolved" "https://registry.npmmirror.com/css-tree/-/css-tree-1.1.3.tgz"
-  "version" "1.1.3"
+css-tree@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.npmmirror.com/css-tree/-/css-tree-1.1.3.tgz"
+  integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
   dependencies:
-    "mdn-data" "2.0.14"
-    "source-map" "^0.6.1"
+    mdn-data "2.0.14"
+    source-map "^0.6.1"
 
-"css-tree@1.0.0-alpha.37":
-  "integrity" "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="
-  "resolved" "https://registry.npmmirror.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"
-  "version" "1.0.0-alpha.37"
+css-tree@1.0.0-alpha.37:
+  version "1.0.0-alpha.37"
+  resolved "https://registry.npmmirror.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"
+  integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==
   dependencies:
-    "mdn-data" "2.0.4"
-    "source-map" "^0.6.1"
+    mdn-data "2.0.4"
+    source-map "^0.6.1"
 
-"css-what@^3.2.1":
-  "integrity" "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="
-  "resolved" "https://registry.npmmirror.com/css-what/-/css-what-3.4.2.tgz"
-  "version" "3.4.2"
+css-what@^3.2.1:
+  version "3.4.2"
+  resolved "https://registry.npmmirror.com/css-what/-/css-what-3.4.2.tgz"
+  integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
 
-"css-what@^6.0.1":
-  "integrity" "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
-  "resolved" "https://registry.npmmirror.com/css-what/-/css-what-6.1.0.tgz"
-  "version" "6.1.0"
+css-what@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.npmmirror.com/css-what/-/css-what-6.1.0.tgz"
+  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
-"css.escape@^1.5.1":
-  "integrity" "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg=="
-  "resolved" "https://registry.npmmirror.com/css.escape/-/css.escape-1.5.1.tgz"
-  "version" "1.5.1"
+css.escape@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.npmmirror.com/css.escape/-/css.escape-1.5.1.tgz"
+  integrity sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==
 
-"cssesc@^3.0.0":
-  "integrity" "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
-  "resolved" "https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz"
-  "version" "3.0.0"
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-"cssnano-preset-default@^4.0.0", "cssnano-preset-default@^4.0.8":
-  "integrity" "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ=="
-  "resolved" "https://registry.npmmirror.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz"
-  "version" "4.0.8"
+cssnano-preset-default@^4.0.0, cssnano-preset-default@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.npmmirror.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz"
+  integrity sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==
   dependencies:
-    "css-declaration-sorter" "^4.0.1"
-    "cssnano-util-raw-cache" "^4.0.1"
-    "postcss" "^7.0.0"
-    "postcss-calc" "^7.0.1"
-    "postcss-colormin" "^4.0.3"
-    "postcss-convert-values" "^4.0.1"
-    "postcss-discard-comments" "^4.0.2"
-    "postcss-discard-duplicates" "^4.0.2"
-    "postcss-discard-empty" "^4.0.1"
-    "postcss-discard-overridden" "^4.0.1"
-    "postcss-merge-longhand" "^4.0.11"
-    "postcss-merge-rules" "^4.0.3"
-    "postcss-minify-font-values" "^4.0.2"
-    "postcss-minify-gradients" "^4.0.2"
-    "postcss-minify-params" "^4.0.2"
-    "postcss-minify-selectors" "^4.0.2"
-    "postcss-normalize-charset" "^4.0.1"
-    "postcss-normalize-display-values" "^4.0.2"
-    "postcss-normalize-positions" "^4.0.2"
-    "postcss-normalize-repeat-style" "^4.0.2"
-    "postcss-normalize-string" "^4.0.2"
-    "postcss-normalize-timing-functions" "^4.0.2"
-    "postcss-normalize-unicode" "^4.0.1"
-    "postcss-normalize-url" "^4.0.1"
-    "postcss-normalize-whitespace" "^4.0.2"
-    "postcss-ordered-values" "^4.1.2"
-    "postcss-reduce-initial" "^4.0.3"
-    "postcss-reduce-transforms" "^4.0.2"
-    "postcss-svgo" "^4.0.3"
-    "postcss-unique-selectors" "^4.0.1"
+    css-declaration-sorter "^4.0.1"
+    cssnano-util-raw-cache "^4.0.1"
+    postcss "^7.0.0"
+    postcss-calc "^7.0.1"
+    postcss-colormin "^4.0.3"
+    postcss-convert-values "^4.0.1"
+    postcss-discard-comments "^4.0.2"
+    postcss-discard-duplicates "^4.0.2"
+    postcss-discard-empty "^4.0.1"
+    postcss-discard-overridden "^4.0.1"
+    postcss-merge-longhand "^4.0.11"
+    postcss-merge-rules "^4.0.3"
+    postcss-minify-font-values "^4.0.2"
+    postcss-minify-gradients "^4.0.2"
+    postcss-minify-params "^4.0.2"
+    postcss-minify-selectors "^4.0.2"
+    postcss-normalize-charset "^4.0.1"
+    postcss-normalize-display-values "^4.0.2"
+    postcss-normalize-positions "^4.0.2"
+    postcss-normalize-repeat-style "^4.0.2"
+    postcss-normalize-string "^4.0.2"
+    postcss-normalize-timing-functions "^4.0.2"
+    postcss-normalize-unicode "^4.0.1"
+    postcss-normalize-url "^4.0.1"
+    postcss-normalize-whitespace "^4.0.2"
+    postcss-ordered-values "^4.1.2"
+    postcss-reduce-initial "^4.0.3"
+    postcss-reduce-transforms "^4.0.2"
+    postcss-svgo "^4.0.3"
+    postcss-unique-selectors "^4.0.1"
 
-"cssnano-util-get-arguments@^4.0.0":
-  "integrity" "sha512-6RIcwmV3/cBMG8Aj5gucQRsJb4vv4I4rn6YjPbVWd5+Pn/fuG+YseGvXGk00XLkoZkaj31QOD7vMUpNPC4FIuw=="
-  "resolved" "https://registry.npmmirror.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"
-  "version" "4.0.0"
+cssnano-util-get-arguments@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"
+  integrity sha512-6RIcwmV3/cBMG8Aj5gucQRsJb4vv4I4rn6YjPbVWd5+Pn/fuG+YseGvXGk00XLkoZkaj31QOD7vMUpNPC4FIuw==
 
-"cssnano-util-get-match@^4.0.0":
-  "integrity" "sha512-JPMZ1TSMRUPVIqEalIBNoBtAYbi8okvcFns4O0YIhcdGebeYZK7dMyHJiQ6GqNBA9kE0Hym4Aqym5rPdsV/4Cw=="
-  "resolved" "https://registry.npmmirror.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"
-  "version" "4.0.0"
+cssnano-util-get-match@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"
+  integrity sha512-JPMZ1TSMRUPVIqEalIBNoBtAYbi8okvcFns4O0YIhcdGebeYZK7dMyHJiQ6GqNBA9kE0Hym4Aqym5rPdsV/4Cw==
 
-"cssnano-util-raw-cache@^4.0.1":
-  "integrity" "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA=="
-  "resolved" "https://registry.npmmirror.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"
-  "version" "4.0.1"
+cssnano-util-raw-cache@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"
+  integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==
   dependencies:
-    "postcss" "^7.0.0"
+    postcss "^7.0.0"
 
-"cssnano-util-same-parent@^4.0.0":
-  "integrity" "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="
-  "resolved" "https://registry.npmmirror.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"
-  "version" "4.0.1"
+cssnano-util-same-parent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"
+  integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==
 
-"cssnano@^4.0.0", "cssnano@^4.1.10":
-  "integrity" "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g=="
-  "resolved" "https://registry.npmmirror.com/cssnano/-/cssnano-4.1.11.tgz"
-  "version" "4.1.11"
+cssnano@^4.0.0, cssnano@^4.1.10:
+  version "4.1.11"
+  resolved "https://registry.npmmirror.com/cssnano/-/cssnano-4.1.11.tgz"
+  integrity sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==
   dependencies:
-    "cosmiconfig" "^5.0.0"
-    "cssnano-preset-default" "^4.0.8"
-    "is-resolvable" "^1.0.0"
-    "postcss" "^7.0.0"
+    cosmiconfig "^5.0.0"
+    cssnano-preset-default "^4.0.8"
+    is-resolvable "^1.0.0"
+    postcss "^7.0.0"
 
-"csso@^4.0.2":
-  "integrity" "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="
-  "resolved" "https://registry.npmmirror.com/csso/-/csso-4.2.0.tgz"
-  "version" "4.2.0"
+csso@^4.0.2:
+  version "4.2.0"
+  resolved "https://registry.npmmirror.com/csso/-/csso-4.2.0.tgz"
+  integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
   dependencies:
-    "css-tree" "^1.1.2"
+    css-tree "^1.1.2"
 
-"csstype@^3.1.0":
-  "integrity" "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
-  "resolved" "https://registry.npmmirror.com/csstype/-/csstype-3.1.2.tgz"
-  "version" "3.1.2"
+csstype@^3.1.0:
+  version "3.1.2"
+  resolved "https://registry.npmmirror.com/csstype/-/csstype-3.1.2.tgz"
+  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
-"cyclist@^1.0.1":
-  "integrity" "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA=="
-  "resolved" "https://registry.npmmirror.com/cyclist/-/cyclist-1.0.2.tgz"
-  "version" "1.0.2"
+cyclist@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/cyclist/-/cyclist-1.0.2.tgz"
+  integrity sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==
 
-"dashdash@^1.12.0":
-  "integrity" "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="
-  "resolved" "https://registry.npmmirror.com/dashdash/-/dashdash-1.14.1.tgz"
-  "version" "1.14.1"
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.npmmirror.com/dashdash/-/dashdash-1.14.1.tgz"
+  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
   dependencies:
-    "assert-plus" "^1.0.0"
+    assert-plus "^1.0.0"
 
-"dayjs@^1.8.25":
-  "integrity" "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw=="
-  "resolved" "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.19.tgz"
-  "version" "1.11.19"
+dayjs@^1.8.25:
+  version "1.11.13"
+  resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz"
+  integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
 
-"debug@^2.2.0":
-  "integrity" "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-  "resolved" "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz"
-  "version" "2.6.9"
+debug@^2.2.0:
+  version "2.6.9"
+  resolved "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
-    "ms" "2.0.0"
+    ms "2.0.0"
 
-"debug@^2.3.3":
-  "integrity" "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-  "resolved" "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz"
-  "version" "2.6.9"
+debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
-    "ms" "2.0.0"
+    ms "2.0.0"
 
-"debug@^3.2.7":
-  "integrity" "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="
-  "resolved" "https://registry.npmmirror.com/debug/-/debug-3.2.7.tgz"
-  "version" "3.2.7"
+debug@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.npmmirror.com/debug/-/debug-3.2.7.tgz"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
-    "ms" "^2.1.1"
+    ms "^2.1.1"
 
-"debug@^4.0.1", "debug@^4.1.0", "debug@^4.1.1", "debug@^4.2.0", "debug@^4.3.4", "debug@~4.3.1", "debug@~4.3.2":
-  "integrity" "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="
-  "resolved" "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz"
-  "version" "4.3.4"
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
+  version "4.3.4"
+  resolved "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
-    "ms" "2.1.2"
+    ms "2.1.2"
 
-"debug@2.6.9":
-  "integrity" "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-  "resolved" "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz"
-  "version" "2.6.9"
+debug@2.6.9:
+  version "2.6.9"
+  resolved "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
-    "ms" "2.0.0"
+    ms "2.0.0"
 
-"decamelize@^1.2.0":
-  "integrity" "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
-  "resolved" "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz"
-  "version" "1.2.0"
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz"
+  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-"decode-uri-component@^0.2.0":
-  "integrity" "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="
-  "resolved" "https://registry.npmmirror.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz"
-  "version" "0.2.2"
+decode-uri-component@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.npmmirror.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
-"deep-equal@^1.0.1":
-  "integrity" "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="
-  "resolved" "https://registry.npmmirror.com/deep-equal/-/deep-equal-1.1.1.tgz"
-  "version" "1.1.1"
+deep-equal@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/deep-equal/-/deep-equal-1.1.1.tgz"
+  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
   dependencies:
-    "is-arguments" "^1.0.4"
-    "is-date-object" "^1.0.1"
-    "is-regex" "^1.0.4"
-    "object-is" "^1.0.1"
-    "object-keys" "^1.1.1"
-    "regexp.prototype.flags" "^1.2.0"
+    is-arguments "^1.0.4"
+    is-date-object "^1.0.1"
+    is-regex "^1.0.4"
+    object-is "^1.0.1"
+    object-keys "^1.1.1"
+    regexp.prototype.flags "^1.2.0"
 
-"deep-is@~0.1.3":
-  "integrity" "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
-  "resolved" "https://registry.npmmirror.com/deep-is/-/deep-is-0.1.4.tgz"
-  "version" "0.1.4"
+deep-is@~0.1.3:
+  version "0.1.4"
+  resolved "https://registry.npmmirror.com/deep-is/-/deep-is-0.1.4.tgz"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-"deepmerge@^1.2.0", "deepmerge@^1.5.2":
-  "integrity" "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
-  "resolved" "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.5.2.tgz"
-  "version" "1.5.2"
+deepmerge@^1.2.0, deepmerge@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.5.2.tgz"
+  integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==
 
-"deepmerge@^4.2.2":
-  "integrity" "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
-  "resolved" "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz"
-  "version" "4.3.1"
+deepmerge@^4.2.2:
+  version "4.3.1"
+  resolved "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
-"deepmerge@1.3.2":
-  "integrity" "sha512-qjMjTrk+RKv/sp4RPDpV5CnKhxjFI9p+GkLBOls5A8EEElldYWCWA9zceAkmfd0xIo2aU1nxiaLFoiya2sb6Cg=="
-  "resolved" "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.3.2.tgz"
-  "version" "1.3.2"
+deepmerge@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.3.2.tgz"
+  integrity sha512-qjMjTrk+RKv/sp4RPDpV5CnKhxjFI9p+GkLBOls5A8EEElldYWCWA9zceAkmfd0xIo2aU1nxiaLFoiya2sb6Cg==
 
-"default-gateway@^4.2.0":
-  "integrity" "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="
-  "resolved" "https://registry.npmmirror.com/default-gateway/-/default-gateway-4.2.0.tgz"
-  "version" "4.2.0"
+default-gateway@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.npmmirror.com/default-gateway/-/default-gateway-4.2.0.tgz"
+  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
   dependencies:
-    "execa" "^1.0.0"
-    "ip-regex" "^2.1.0"
+    execa "^1.0.0"
+    ip-regex "^2.1.0"
 
-"default-gateway@^5.0.5":
-  "integrity" "sha512-z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA=="
-  "resolved" "https://registry.npmmirror.com/default-gateway/-/default-gateway-5.0.5.tgz"
-  "version" "5.0.5"
+default-gateway@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.npmmirror.com/default-gateway/-/default-gateway-5.0.5.tgz"
+  integrity sha512-z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA==
   dependencies:
-    "execa" "^3.3.0"
+    execa "^3.3.0"
 
-"defaults@^1.0.3":
-  "integrity" "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A=="
-  "resolved" "https://registry.npmmirror.com/defaults/-/defaults-1.0.4.tgz"
-  "version" "1.0.4"
+defaults@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/defaults/-/defaults-1.0.4.tgz"
+  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
   dependencies:
-    "clone" "^1.0.2"
+    clone "^1.0.2"
 
-"define-data-property@^1.0.1", "define-data-property@^1.1.1":
-  "integrity" "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ=="
-  "resolved" "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.1.tgz"
-  "version" "1.1.1"
+define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.0.tgz"
+  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
   dependencies:
-    "get-intrinsic" "^1.2.1"
-    "gopd" "^1.0.1"
-    "has-property-descriptors" "^1.0.0"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
-"define-properties@^1.1.2", "define-properties@^1.1.3", "define-properties@^1.1.4", "define-properties@^1.2.0":
-  "integrity" "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg=="
-  "resolved" "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.1.tgz"
-  "version" "1.2.1"
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz"
+  integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==
   dependencies:
-    "define-data-property" "^1.0.1"
-    "has-property-descriptors" "^1.0.0"
-    "object-keys" "^1.1.1"
+    is-descriptor "^0.1.0"
 
-"define-property@^0.2.5":
-  "integrity" "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA=="
-  "resolved" "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz"
-  "version" "0.2.5"
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/define-property/-/define-property-1.0.0.tgz"
+  integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==
   dependencies:
-    "is-descriptor" "^0.1.0"
+    is-descriptor "^1.0.0"
 
-"define-property@^1.0.0":
-  "integrity" "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA=="
-  "resolved" "https://registry.npmmirror.com/define-property/-/define-property-1.0.0.tgz"
-  "version" "1.0.0"
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/define-property/-/define-property-2.0.2.tgz"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
-    "is-descriptor" "^1.0.0"
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
 
-"define-property@^2.0.2":
-  "integrity" "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="
-  "resolved" "https://registry.npmmirror.com/define-property/-/define-property-2.0.2.tgz"
-  "version" "2.0.2"
-  dependencies:
-    "is-descriptor" "^1.0.2"
-    "isobject" "^3.0.1"
-
-"del@^4.1.1":
-  "integrity" "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="
-  "resolved" "https://registry.npmmirror.com/del/-/del-4.1.1.tgz"
-  "version" "4.1.1"
+del@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmmirror.com/del/-/del-4.1.1.tgz"
+  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
   dependencies:
     "@types/glob" "^7.1.1"
-    "globby" "^6.1.0"
-    "is-path-cwd" "^2.0.0"
-    "is-path-in-cwd" "^2.0.0"
-    "p-map" "^2.0.0"
-    "pify" "^4.0.1"
-    "rimraf" "^2.6.3"
+    globby "^6.1.0"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.3"
 
-"delayed-stream@~1.0.0":
-  "integrity" "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
-  "resolved" "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz"
-  "version" "1.0.0"
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz"
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-"delegate@^3.1.2":
-  "integrity" "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
-  "resolved" "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz"
-  "version" "3.2.0"
+delegate@^3.1.2:
+  version "3.2.0"
+  resolved "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz"
+  integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
 
-"depd@~1.1.2":
-  "integrity" "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="
-  "resolved" "https://registry.npmmirror.com/depd/-/depd-1.1.2.tgz"
-  "version" "1.1.2"
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/depd/-/depd-1.1.2.tgz"
+  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
-"depd@2.0.0":
-  "integrity" "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-  "resolved" "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz"
-  "version" "2.0.0"
+depd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-"des.js@^1.0.0":
-  "integrity" "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg=="
-  "resolved" "https://registry.npmmirror.com/des.js/-/des.js-1.1.0.tgz"
-  "version" "1.1.0"
+des.js@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/des.js/-/des.js-1.1.0.tgz"
+  integrity sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==
   dependencies:
-    "inherits" "^2.0.1"
-    "minimalistic-assert" "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
 
-"destroy@1.2.0":
-  "integrity" "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
-  "resolved" "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz"
-  "version" "1.2.0"
+destroy@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz"
+  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
-"detect-node@^2.0.4":
-  "integrity" "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-  "resolved" "https://registry.npmmirror.com/detect-node/-/detect-node-2.1.0.tgz"
-  "version" "2.1.0"
+detect-node@^2.0.4:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/detect-node/-/detect-node-2.1.0.tgz"
+  integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-"diagram-js-direct-editing@^1.6.3":
-  "integrity" "sha512-B4Xj+PJfgBjbPEzT3uZQEkZI5xHFB0Izc+7BhDFuHidzrEMzQKZrFGdA3PqfWhReHf3dp+iB6Tt11G9eGNjKMw=="
-  "resolved" "https://registry.npmmirror.com/diagram-js-direct-editing/-/diagram-js-direct-editing-1.8.0.tgz"
-  "version" "1.8.0"
+diagram-js-direct-editing@^1.6.3:
+  version "1.8.0"
+  resolved "https://registry.npmmirror.com/diagram-js-direct-editing/-/diagram-js-direct-editing-1.8.0.tgz"
+  integrity sha512-B4Xj+PJfgBjbPEzT3uZQEkZI5xHFB0Izc+7BhDFuHidzrEMzQKZrFGdA3PqfWhReHf3dp+iB6Tt11G9eGNjKMw==
   dependencies:
-    "min-dash" "^3.5.2"
-    "min-dom" "^3.1.3"
+    min-dash "^3.5.2"
+    min-dom "^3.1.3"
 
-"diagram-js@*", "diagram-js@^12.3.0":
-  "integrity" "sha512-jrX+NFUPVcCdrUD11Fo1frwWHF9FWys4r/lhi8M4CBuQ8eSePkOq5osFhc6tUoXZawS3sjhbNvd2AYAZZBUjnQ=="
-  "resolved" "https://registry.npmmirror.com/diagram-js/-/diagram-js-12.5.0.tgz"
-  "version" "12.5.0"
+diagram-js@*, diagram-js@^12.3.0:
+  version "12.4.0"
+  resolved "https://registry.npmmirror.com/diagram-js/-/diagram-js-12.4.0.tgz"
+  integrity sha512-13FdUkX+HsAnOmfiFtmdPUB3qImsy3ulwLWJ4qZCCY3p4GyTTWSDfsFnowr34CDtBIfpo4HVF9HGIRh9z/a6+A==
   dependencies:
     "@bpmn-io/diagram-js-ui" "^0.2.2"
-    "clsx" "^2.0.0"
-    "didi" "^9.0.2"
-    "hammerjs" "^2.0.1"
-    "inherits-browser" "^0.1.0"
-    "min-dash" "^4.1.0"
-    "min-dom" "^4.1.0"
-    "object-refs" "^0.3.0"
-    "path-intersection" "^2.2.1"
-    "tiny-svg" "^3.0.1"
+    clsx "^2.0.0"
+    didi "^9.0.2"
+    hammerjs "^2.0.1"
+    inherits-browser "^0.1.0"
+    min-dash "^4.1.0"
+    min-dom "^4.1.0"
+    object-refs "^0.3.0"
+    path-intersection "^2.2.1"
+    tiny-svg "^3.0.1"
 
-"diagram-js@^7.8.2":
-  "integrity" "sha512-o1yUtX5TXV1pmpevP55gxU/AEG6nCidOXGs/HLuxNXG0zMZ3jQta7kMqRxTK93rNw/XuHmP1eMOwdvdJ2RP5qA=="
-  "resolved" "https://registry.npmmirror.com/diagram-js/-/diagram-js-7.9.0.tgz"
-  "version" "7.9.0"
+diagram-js@^7.8.2:
+  version "7.9.0"
+  resolved "https://registry.npmmirror.com/diagram-js/-/diagram-js-7.9.0.tgz"
+  integrity sha512-o1yUtX5TXV1pmpevP55gxU/AEG6nCidOXGs/HLuxNXG0zMZ3jQta7kMqRxTK93rNw/XuHmP1eMOwdvdJ2RP5qA==
   dependencies:
-    "css.escape" "^1.5.1"
-    "didi" "^5.2.1"
-    "hammerjs" "^2.0.1"
-    "inherits" "^2.0.4"
-    "min-dash" "^3.5.2"
-    "min-dom" "^3.1.3"
-    "object-refs" "^0.3.0"
-    "path-intersection" "^2.2.1"
-    "tiny-svg" "^2.2.2"
+    css.escape "^1.5.1"
+    didi "^5.2.1"
+    hammerjs "^2.0.1"
+    inherits "^2.0.4"
+    min-dash "^3.5.2"
+    min-dom "^3.1.3"
+    object-refs "^0.3.0"
+    path-intersection "^2.2.1"
+    tiny-svg "^2.2.2"
 
-"didi@^5.2.1":
-  "integrity" "sha512-IKNnajUlD4lWMy/Q9Emkk7H1qnzREgY4UyE3IhmOi/9IKua0JYtYldk928bOdt1yNxN8EiOy1sqtSozEYsmjCg=="
-  "resolved" "https://registry.npmmirror.com/didi/-/didi-5.2.1.tgz"
-  "version" "5.2.1"
+didi@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.npmmirror.com/didi/-/didi-5.2.1.tgz"
+  integrity sha512-IKNnajUlD4lWMy/Q9Emkk7H1qnzREgY4UyE3IhmOi/9IKua0JYtYldk928bOdt1yNxN8EiOy1sqtSozEYsmjCg==
 
-"didi@^9.0.2":
-  "integrity" "sha512-q2+aj+lnJcUweV7A9pdUrwFr4LHVmRPwTmQLtHPFz4aT7IBoryN6Iy+jmFku+oIzr5ebBkvtBCOb87+dJhb7bg=="
-  "resolved" "https://registry.npmmirror.com/didi/-/didi-9.0.2.tgz"
-  "version" "9.0.2"
+didi@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.npmmirror.com/didi/-/didi-9.0.2.tgz"
+  integrity sha512-q2+aj+lnJcUweV7A9pdUrwFr4LHVmRPwTmQLtHPFz4aT7IBoryN6Iy+jmFku+oIzr5ebBkvtBCOb87+dJhb7bg==
 
-"diffie-hellman@^5.0.0":
-  "integrity" "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="
-  "resolved" "https://registry.npmmirror.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz"
-  "version" "5.0.3"
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.npmmirror.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
-    "bn.js" "^4.1.0"
-    "miller-rabin" "^4.0.0"
-    "randombytes" "^2.0.0"
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
 
-"dir-glob@^2.0.0", "dir-glob@^2.2.2":
-  "integrity" "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="
-  "resolved" "https://registry.npmmirror.com/dir-glob/-/dir-glob-2.2.2.tgz"
-  "version" "2.2.2"
+dir-glob@^2.0.0, dir-glob@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.npmmirror.com/dir-glob/-/dir-glob-2.2.2.tgz"
+  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
   dependencies:
-    "path-type" "^3.0.0"
+    path-type "^3.0.0"
 
-"dns-equal@^1.0.0":
-  "integrity" "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
-  "resolved" "https://registry.npmmirror.com/dns-equal/-/dns-equal-1.0.0.tgz"
-  "version" "1.0.0"
+dns-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/dns-equal/-/dns-equal-1.0.0.tgz"
+  integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==
 
-"dns-packet@^1.3.1":
-  "integrity" "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA=="
-  "resolved" "https://registry.npmmirror.com/dns-packet/-/dns-packet-1.3.4.tgz"
-  "version" "1.3.4"
+dns-packet@^1.3.1:
+  version "1.3.4"
+  resolved "https://registry.npmmirror.com/dns-packet/-/dns-packet-1.3.4.tgz"
+  integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
   dependencies:
-    "ip" "^1.1.0"
-    "safe-buffer" "^5.0.1"
+    ip "^1.1.0"
+    safe-buffer "^5.0.1"
 
-"dns-txt@^2.0.2":
-  "integrity" "sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ=="
-  "resolved" "https://registry.npmmirror.com/dns-txt/-/dns-txt-2.0.2.tgz"
-  "version" "2.0.2"
+dns-txt@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/dns-txt/-/dns-txt-2.0.2.tgz"
+  integrity sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==
   dependencies:
-    "buffer-indexof" "^1.0.0"
+    buffer-indexof "^1.0.0"
 
-"doctrine@^2.1.0":
-  "integrity" "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="
-  "resolved" "https://registry.npmmirror.com/doctrine/-/doctrine-2.1.0.tgz"
-  "version" "2.1.0"
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/doctrine/-/doctrine-2.1.0.tgz"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
   dependencies:
-    "esutils" "^2.0.2"
+    esutils "^2.0.2"
 
-"doctrine@^3.0.0":
-  "integrity" "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="
-  "resolved" "https://registry.npmmirror.com/doctrine/-/doctrine-3.0.0.tgz"
-  "version" "3.0.0"
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/doctrine/-/doctrine-3.0.0.tgz"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
   dependencies:
-    "esutils" "^2.0.2"
+    esutils "^2.0.2"
 
-"dom-converter@^0.2.0":
-  "integrity" "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="
-  "resolved" "https://registry.npmmirror.com/dom-converter/-/dom-converter-0.2.0.tgz"
-  "version" "0.2.0"
+dom-converter@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmmirror.com/dom-converter/-/dom-converter-0.2.0.tgz"
+  integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
   dependencies:
-    "utila" "~0.4"
+    utila "~0.4"
 
-"dom-serializer@^1.0.1":
-  "integrity" "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="
-  "resolved" "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz"
-  "version" "1.4.1"
+dom-serializer@^1.0.1:
+  version "1.4.1"
+  resolved "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz"
+  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
   dependencies:
-    "domelementtype" "^2.0.1"
-    "domhandler" "^4.2.0"
-    "entities" "^2.0.0"
+    domelementtype "^2.0.1"
+    domhandler "^4.2.0"
+    entities "^2.0.0"
 
-"dom-serializer@0":
-  "integrity" "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="
-  "resolved" "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-0.2.2.tgz"
-  "version" "0.2.2"
+dom-serializer@0:
+  version "0.2.2"
+  resolved "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-0.2.2.tgz"
+  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
   dependencies:
-    "domelementtype" "^2.0.1"
-    "entities" "^2.0.0"
+    domelementtype "^2.0.1"
+    entities "^2.0.0"
 
-"dom-walk@^0.1.0":
-  "integrity" "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
-  "resolved" "https://registry.npmmirror.com/dom-walk/-/dom-walk-0.1.2.tgz"
-  "version" "0.1.2"
+dom-walk@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.npmmirror.com/dom-walk/-/dom-walk-0.1.2.tgz"
+  integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
 
-"domain-browser@^1.1.1":
-  "integrity" "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
-  "resolved" "https://registry.npmmirror.com/domain-browser/-/domain-browser-1.2.0.tgz"
-  "version" "1.2.0"
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/domain-browser/-/domain-browser-1.2.0.tgz"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-"domelementtype@^1.3.1", "domelementtype@1":
-  "integrity" "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-  "resolved" "https://registry.npmmirror.com/domelementtype/-/domelementtype-1.3.1.tgz"
-  "version" "1.3.1"
+domelementtype@^1.3.1, domelementtype@1:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/domelementtype/-/domelementtype-1.3.1.tgz"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
-"domelementtype@^2.0.1", "domelementtype@^2.2.0":
-  "integrity" "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
-  "resolved" "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz"
-  "version" "2.3.0"
+domelementtype@^2.0.1, domelementtype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
-"domhandler@^2.3.0":
-  "integrity" "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="
-  "resolved" "https://registry.npmmirror.com/domhandler/-/domhandler-2.4.2.tgz"
-  "version" "2.4.2"
+domhandler@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.npmmirror.com/domhandler/-/domhandler-2.4.2.tgz"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
   dependencies:
-    "domelementtype" "1"
+    domelementtype "1"
 
-"domhandler@^4.0.0", "domhandler@^4.2.0", "domhandler@^4.3.1":
-  "integrity" "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="
-  "resolved" "https://registry.npmmirror.com/domhandler/-/domhandler-4.3.1.tgz"
-  "version" "4.3.1"
+domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.npmmirror.com/domhandler/-/domhandler-4.3.1.tgz"
+  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
   dependencies:
-    "domelementtype" "^2.2.0"
+    domelementtype "^2.2.0"
 
-"domify@^1.3.1", "domify@^1.4.1":
-  "integrity" "sha512-x18nuiDHMCZGXr4KJSRMf/TWYtiaRo6RX8KN9fEbW54mvbQ6pieUuerC2ahBg+kEp1wycFj8MPUI0WkIOw5E9w=="
-  "resolved" "https://registry.npmmirror.com/domify/-/domify-1.4.1.tgz"
-  "version" "1.4.1"
+domify@^1.3.1, domify@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.npmmirror.com/domify/-/domify-1.4.1.tgz"
+  integrity sha512-x18nuiDHMCZGXr4KJSRMf/TWYtiaRo6RX8KN9fEbW54mvbQ6pieUuerC2ahBg+kEp1wycFj8MPUI0WkIOw5E9w==
 
-"dompurify@^2.2.0":
-  "integrity" "sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ=="
-  "resolved" "https://registry.npmmirror.com/dompurify/-/dompurify-2.4.7.tgz"
-  "version" "2.4.7"
+dompurify@^2.2.0:
+  version "2.4.7"
+  resolved "https://registry.npmmirror.com/dompurify/-/dompurify-2.4.7.tgz"
+  integrity sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ==
 
-"domready@1.0.8":
-  "integrity" "sha512-uIzsOJUNk+AdGE9a6VDeessoMCzF8RrZvJCX/W8QtyfgdR6Uofn/MvRonih3OtCO79b2VDzDOymuiABrQ4z3XA=="
-  "resolved" "https://registry.npmmirror.com/domready/-/domready-1.0.8.tgz"
-  "version" "1.0.8"
+domready@1.0.8:
+  version "1.0.8"
+  resolved "https://registry.npmmirror.com/domready/-/domready-1.0.8.tgz"
+  integrity sha512-uIzsOJUNk+AdGE9a6VDeessoMCzF8RrZvJCX/W8QtyfgdR6Uofn/MvRonih3OtCO79b2VDzDOymuiABrQ4z3XA==
 
-"domutils@^1.5.1", "domutils@^1.7.0":
-  "integrity" "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="
-  "resolved" "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz"
-  "version" "1.7.0"
+domutils@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
   dependencies:
-    "dom-serializer" "0"
-    "domelementtype" "1"
+    dom-serializer "0"
+    domelementtype "1"
 
-"domutils@^2.5.2":
-  "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
-  "resolved" "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz"
-  "version" "2.8.0"
+domutils@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
   dependencies:
-    "dom-serializer" "^1.0.1"
-    "domelementtype" "^2.2.0"
-    "domhandler" "^4.2.0"
+    dom-serializer "0"
+    domelementtype "1"
 
-"domutils@^2.8.0":
-  "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
-  "resolved" "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz"
-  "version" "2.8.0"
+domutils@^2.5.2, domutils@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz"
+  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
   dependencies:
-    "dom-serializer" "^1.0.1"
-    "domelementtype" "^2.2.0"
-    "domhandler" "^4.2.0"
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
 
-"dot-prop@^5.2.0":
-  "integrity" "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="
-  "resolved" "https://registry.npmmirror.com/dot-prop/-/dot-prop-5.3.0.tgz"
-  "version" "5.3.0"
+dot-prop@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.npmmirror.com/dot-prop/-/dot-prop-5.3.0.tgz"
+  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
   dependencies:
-    "is-obj" "^2.0.0"
+    is-obj "^2.0.0"
 
-"dotenv-expand@^5.1.0":
-  "integrity" "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
-  "resolved" "https://registry.npmmirror.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"
-  "version" "5.1.0"
+dotenv-expand@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.npmmirror.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"
+  integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
-"dotenv@^8.2.0":
-  "integrity" "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="
-  "resolved" "https://registry.npmmirror.com/dotenv/-/dotenv-8.6.0.tgz"
-  "version" "8.6.0"
+dotenv@^8.2.0:
+  version "8.6.0"
+  resolved "https://registry.npmmirror.com/dotenv/-/dotenv-8.6.0.tgz"
+  integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
 
-"duplexer@^0.1.1":
-  "integrity" "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
-  "resolved" "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz"
-  "version" "0.1.2"
+duplexer@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz"
+  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
-"duplexify@^3.4.2", "duplexify@^3.6.0":
-  "integrity" "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="
-  "resolved" "https://registry.npmmirror.com/duplexify/-/duplexify-3.7.1.tgz"
-  "version" "3.7.1"
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.npmmirror.com/duplexify/-/duplexify-3.7.1.tgz"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
   dependencies:
-    "end-of-stream" "^1.0.0"
-    "inherits" "^2.0.1"
-    "readable-stream" "^2.0.0"
-    "stream-shift" "^1.0.0"
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
 
-"easings-css@^1.0.0":
-  "integrity" "sha512-7Uq7NdazNfVtr0RNmPAys8it0zKCuaqxJStYKEl72D3j4gbvXhhaM7iWNbqhA4C94ygCye6VuyhzBRQC4szeBg=="
-  "resolved" "https://registry.npmmirror.com/easings-css/-/easings-css-1.0.0.tgz"
-  "version" "1.0.0"
+easings-css@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/easings-css/-/easings-css-1.0.0.tgz"
+  integrity sha512-7Uq7NdazNfVtr0RNmPAys8it0zKCuaqxJStYKEl72D3j4gbvXhhaM7iWNbqhA4C94ygCye6VuyhzBRQC4szeBg==
 
-"eastasianwidth@^0.2.0":
-  "integrity" "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
-  "resolved" "https://registry.npmmirror.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz"
-  "version" "0.2.0"
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmmirror.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-"easy-stack@1.0.1":
-  "integrity" "sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w=="
-  "resolved" "https://registry.npmmirror.com/easy-stack/-/easy-stack-1.0.1.tgz"
-  "version" "1.0.1"
+easy-stack@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/easy-stack/-/easy-stack-1.0.1.tgz"
+  integrity sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==
 
-"ecc-jsbn@~0.1.1":
-  "integrity" "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="
-  "resolved" "https://registry.npmmirror.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"
-  "version" "0.1.2"
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.npmmirror.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"
+  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
   dependencies:
-    "jsbn" "~0.1.0"
-    "safer-buffer" "^2.1.0"
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
 
-"echarts@5.4.0":
-  "integrity" "sha512-uPsO9VRUIKAdFOoH3B0aNg7NRVdN7aM39/OjovjO9MwmWsAkfGyeXJhK+dbRi51iDrQWliXV60/XwLA7kg3z0w=="
-  "resolved" "https://registry.npmmirror.com/echarts/-/echarts-5.4.0.tgz"
-  "version" "5.4.0"
+echarts@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.npmmirror.com/echarts/-/echarts-5.4.0.tgz"
+  integrity sha512-uPsO9VRUIKAdFOoH3B0aNg7NRVdN7aM39/OjovjO9MwmWsAkfGyeXJhK+dbRi51iDrQWliXV60/XwLA7kg3z0w==
   dependencies:
-    "tslib" "2.3.0"
-    "zrender" "5.4.0"
+    tslib "2.3.0"
+    zrender "5.4.0"
 
-"editorconfig@^0.15.3":
-  "integrity" "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="
-  "resolved" "https://registry.npmmirror.com/editorconfig/-/editorconfig-0.15.3.tgz"
-  "version" "0.15.3"
+editorconfig@^0.15.3:
+  version "0.15.3"
+  resolved "https://registry.npmmirror.com/editorconfig/-/editorconfig-0.15.3.tgz"
+  integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
   dependencies:
-    "commander" "^2.19.0"
-    "lru-cache" "^4.1.5"
-    "semver" "^5.6.0"
-    "sigmund" "^1.0.1"
+    commander "^2.19.0"
+    lru-cache "^4.1.5"
+    semver "^5.6.0"
+    sigmund "^1.0.1"
 
-"ee-first@1.1.1":
-  "integrity" "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-  "resolved" "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz"
-  "version" "1.1.1"
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz"
+  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-"ejs@^2.6.1":
-  "integrity" "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="
-  "resolved" "https://registry.npmmirror.com/ejs/-/ejs-2.7.4.tgz"
-  "version" "2.7.4"
+ejs@^2.6.1:
+  version "2.7.4"
+  resolved "https://registry.npmmirror.com/ejs/-/ejs-2.7.4.tgz"
+  integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-"el-tree-transfer@^2.4.7":
-  "integrity" "sha512-wcjQyqzmiJMDhF3qHR1NcqXp27Q65Td1EsMOVkqqOo9Z2mkVC+cGJEu3V4L90x8c1XgEciQL7tMuSjCP7/8G4g=="
-  "resolved" "https://registry.npmmirror.com/el-tree-transfer/-/el-tree-transfer-2.4.7.tgz"
-  "version" "2.4.7"
+el-tree-transfer@^2.4.7:
+  version "2.4.7"
+  resolved "https://registry.npmmirror.com/el-tree-transfer/-/el-tree-transfer-2.4.7.tgz"
+  integrity sha512-wcjQyqzmiJMDhF3qHR1NcqXp27Q65Td1EsMOVkqqOo9Z2mkVC+cGJEu3V4L90x8c1XgEciQL7tMuSjCP7/8G4g==
   dependencies:
-    "lodash" "^4.17.20"
-    "wl-core" "^1.1.4"
+    lodash "^4.17.20"
+    wl-core "^1.1.4"
 
-"electron-to-chromium@^1.4.535":
-  "integrity" "sha512-LsrJjZ0IbVy12ApW3gpYpcmHS3iRxH4bkKOW98y1/D+3cvDUWGcbzbsFinfUS8knpcZk/PG/2p/RnkMCYN7PVg=="
-  "resolved" "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.569.tgz"
-  "version" "1.4.569"
+electron-to-chromium@^1.4.431:
+  version "1.4.473"
+  resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.473.tgz"
+  integrity sha512-aVfC8+440vGfl06l8HKKn8/PD5jRfSnLkTTD65EFvU46igbpQRri1gxSzW9/+TeUlwYzrXk1sw867T96zlyECA==
 
-"element-ui@2.15.12":
-  "integrity" "sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg=="
-  "resolved" "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.12.tgz"
-  "version" "2.15.12"
+element-ui@2.15.12:
+  version "2.15.12"
+  resolved "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.12.tgz"
+  integrity sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg==
   dependencies:
-    "async-validator" "~1.8.1"
-    "babel-helper-vue-jsx-merge-props" "^2.0.0"
-    "deepmerge" "^1.2.0"
-    "normalize-wheel" "^1.0.1"
-    "resize-observer-polyfill" "^1.5.0"
-    "throttle-debounce" "^1.0.1"
+    async-validator "~1.8.1"
+    babel-helper-vue-jsx-merge-props "^2.0.0"
+    deepmerge "^1.2.0"
+    normalize-wheel "^1.0.1"
+    resize-observer-polyfill "^1.5.0"
+    throttle-debounce "^1.0.1"
 
-"elliptic@^6.5.3", "elliptic@^6.5.4":
-  "integrity" "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="
-  "resolved" "https://registry.npmmirror.com/elliptic/-/elliptic-6.5.4.tgz"
-  "version" "6.5.4"
+elliptic@^6.5.3:
+  version "6.5.4"
+  resolved "https://registry.npmmirror.com/elliptic/-/elliptic-6.5.4.tgz"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
   dependencies:
-    "bn.js" "^4.11.9"
-    "brorand" "^1.1.0"
-    "hash.js" "^1.0.0"
-    "hmac-drbg" "^1.0.1"
-    "inherits" "^2.0.4"
-    "minimalistic-assert" "^1.0.1"
-    "minimalistic-crypto-utils" "^1.0.1"
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
 
-"emoji-regex@^7.0.1":
-  "integrity" "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-  "resolved" "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-7.0.3.tgz"
-  "version" "7.0.3"
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-7.0.3.tgz"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
-"emoji-regex@^8.0.0":
-  "integrity" "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-  "resolved" "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz"
-  "version" "8.0.0"
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-"emoji-regex@^9.2.2":
-  "integrity" "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
-  "resolved" "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-9.2.2.tgz"
-  "version" "9.2.2"
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-9.2.2.tgz"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
-"emojis-list@^2.0.0":
-  "integrity" "sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng=="
-  "resolved" "https://registry.npmmirror.com/emojis-list/-/emojis-list-2.1.0.tgz"
-  "version" "2.1.0"
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/emojis-list/-/emojis-list-2.1.0.tgz"
+  integrity sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==
 
-"emojis-list@^3.0.0":
-  "integrity" "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
-  "resolved" "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz"
-  "version" "3.0.0"
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-"encodeurl@~1.0.1", "encodeurl@~1.0.2":
-  "integrity" "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
-  "resolved" "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz"
-  "version" "1.0.2"
+encodeurl@~1.0.1, encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz"
+  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-"end-of-stream@^1.0.0", "end-of-stream@^1.1.0":
-  "integrity" "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="
-  "resolved" "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz"
-  "version" "1.4.4"
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
-    "once" "^1.4.0"
+    once "^1.4.0"
 
-"engine.io-client@~6.5.2":
-  "integrity" "sha512-CQZqbrpEYnrpGqC07a9dJDz4gePZUgTPMU3NKJPSeQOyw27Tst4Pl3FemKoFGAlHzgZmKjoRmiJvbWfhCXUlIg=="
-  "resolved" "https://registry.npmmirror.com/engine.io-client/-/engine.io-client-6.5.2.tgz"
-  "version" "6.5.2"
+engine.io-client@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.npmmirror.com/engine.io-client/-/engine.io-client-6.5.2.tgz"
+  integrity sha512-CQZqbrpEYnrpGqC07a9dJDz4gePZUgTPMU3NKJPSeQOyw27Tst4Pl3FemKoFGAlHzgZmKjoRmiJvbWfhCXUlIg==
   dependencies:
     "@socket.io/component-emitter" "~3.1.0"
-    "debug" "~4.3.1"
-    "engine.io-parser" "~5.2.1"
-    "ws" "~8.11.0"
-    "xmlhttprequest-ssl" "~2.0.0"
+    debug "~4.3.1"
+    engine.io-parser "~5.2.1"
+    ws "~8.11.0"
+    xmlhttprequest-ssl "~2.0.0"
 
-"engine.io-parser@~5.2.1":
-  "integrity" "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ=="
-  "resolved" "https://registry.npmmirror.com/engine.io-parser/-/engine.io-parser-5.2.1.tgz"
-  "version" "5.2.1"
+engine.io-parser@~5.2.1:
+  version "5.2.1"
+  resolved "https://registry.npmmirror.com/engine.io-parser/-/engine.io-parser-5.2.1.tgz"
+  integrity sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==
 
-"enhanced-resolve@^4.5.0":
-  "integrity" "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="
-  "resolved" "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"
-  "version" "4.5.0"
+enhanced-resolve@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
   dependencies:
-    "graceful-fs" "^4.1.2"
-    "memory-fs" "^0.5.0"
-    "tapable" "^1.0.0"
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
 
-"entities@^1.1.1":
-  "integrity" "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
-  "resolved" "https://registry.npmmirror.com/entities/-/entities-1.1.2.tgz"
-  "version" "1.1.2"
+entities@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/entities/-/entities-1.1.2.tgz"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-"entities@^2.0.0":
-  "integrity" "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
-  "resolved" "https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz"
-  "version" "2.2.0"
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
-"errno@^0.1.3", "errno@~0.1.7":
-  "integrity" "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="
-  "resolved" "https://registry.npmmirror.com/errno/-/errno-0.1.8.tgz"
-  "version" "0.1.8"
+errno@^0.1.3, errno@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.npmmirror.com/errno/-/errno-0.1.8.tgz"
+  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
   dependencies:
-    "prr" "~1.0.1"
+    prr "~1.0.1"
 
-"error-ex@^1.3.1":
-  "integrity" "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="
-  "resolved" "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz"
-  "version" "1.3.2"
+error-ex@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
-    "is-arrayish" "^0.2.1"
+    is-arrayish "^0.2.1"
 
-"error-stack-parser@^2.0.6":
-  "integrity" "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ=="
-  "resolved" "https://registry.npmmirror.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz"
-  "version" "2.1.4"
+error-stack-parser@^2.0.6:
+  version "2.1.4"
+  resolved "https://registry.npmmirror.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz"
+  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
   dependencies:
-    "stackframe" "^1.3.4"
+    stackframe "^1.3.4"
 
-"es-abstract@^1.17.2", "es-abstract@^1.22.1":
-  "integrity" "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA=="
-  "resolved" "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.22.3.tgz"
-  "version" "1.22.3"
+es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2:
+  version "1.22.1"
+  resolved "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.22.1.tgz"
+  integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
   dependencies:
-    "array-buffer-byte-length" "^1.0.0"
-    "arraybuffer.prototype.slice" "^1.0.2"
-    "available-typed-arrays" "^1.0.5"
-    "call-bind" "^1.0.5"
-    "es-set-tostringtag" "^2.0.1"
-    "es-to-primitive" "^1.2.1"
-    "function.prototype.name" "^1.1.6"
-    "get-intrinsic" "^1.2.2"
-    "get-symbol-description" "^1.0.0"
-    "globalthis" "^1.0.3"
-    "gopd" "^1.0.1"
-    "has-property-descriptors" "^1.0.0"
-    "has-proto" "^1.0.1"
-    "has-symbols" "^1.0.3"
-    "hasown" "^2.0.0"
-    "internal-slot" "^1.0.5"
-    "is-array-buffer" "^3.0.2"
-    "is-callable" "^1.2.7"
-    "is-negative-zero" "^2.0.2"
-    "is-regex" "^1.1.4"
-    "is-shared-array-buffer" "^1.0.2"
-    "is-string" "^1.0.7"
-    "is-typed-array" "^1.1.12"
-    "is-weakref" "^1.0.2"
-    "object-inspect" "^1.13.1"
-    "object-keys" "^1.1.1"
-    "object.assign" "^4.1.4"
-    "regexp.prototype.flags" "^1.5.1"
-    "safe-array-concat" "^1.0.1"
-    "safe-regex-test" "^1.0.0"
-    "string.prototype.trim" "^1.2.8"
-    "string.prototype.trimend" "^1.0.7"
-    "string.prototype.trimstart" "^1.0.7"
-    "typed-array-buffer" "^1.0.0"
-    "typed-array-byte-length" "^1.0.0"
-    "typed-array-byte-offset" "^1.0.0"
-    "typed-array-length" "^1.0.4"
-    "unbox-primitive" "^1.0.2"
-    "which-typed-array" "^1.1.13"
+    array-buffer-byte-length "^1.0.0"
+    arraybuffer.prototype.slice "^1.0.1"
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    es-set-tostringtag "^2.0.1"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.2.1"
+    get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.5"
+    is-array-buffer "^3.0.2"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.10"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.3"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.5.0"
+    safe-array-concat "^1.0.0"
+    safe-regex-test "^1.0.0"
+    string.prototype.trim "^1.2.7"
+    string.prototype.trimend "^1.0.6"
+    string.prototype.trimstart "^1.0.6"
+    typed-array-buffer "^1.0.0"
+    typed-array-byte-length "^1.0.0"
+    typed-array-byte-offset "^1.0.0"
+    typed-array-length "^1.0.4"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.10"
 
-"es-array-method-boxes-properly@^1.0.0":
-  "integrity" "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
-  "resolved" "https://registry.npmmirror.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"
-  "version" "1.0.0"
+es-array-method-boxes-properly@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"
+  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
 
-"es-set-tostringtag@^2.0.1":
-  "integrity" "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q=="
-  "resolved" "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz"
-  "version" "2.0.2"
+es-set-tostringtag@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"
+  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
   dependencies:
-    "get-intrinsic" "^1.2.2"
-    "has-tostringtag" "^1.0.0"
-    "hasown" "^2.0.0"
+    get-intrinsic "^1.1.3"
+    has "^1.0.3"
+    has-tostringtag "^1.0.0"
 
-"es-shim-unscopables@^1.0.0":
-  "integrity" "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw=="
-  "resolved" "https://registry.npmmirror.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz"
-  "version" "1.0.2"
+es-shim-unscopables@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"
+  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
   dependencies:
-    "hasown" "^2.0.0"
+    has "^1.0.3"
 
-"es-to-primitive@^1.2.1":
-  "integrity" "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="
-  "resolved" "https://registry.npmmirror.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"
-  "version" "1.2.1"
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmmirror.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
   dependencies:
-    "is-callable" "^1.1.4"
-    "is-date-object" "^1.0.1"
-    "is-symbol" "^1.0.2"
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
 
-"es5-shim@^4.5.1":
-  "integrity" "sha512-jg21/dmlrNQI7JyyA2w7n+yifSxBng0ZralnSfVZjoCawgNTCnS+yBCyVM9DL5itm7SUnDGgv7hcq2XCZX4iRQ=="
-  "resolved" "https://registry.npmmirror.com/es5-shim/-/es5-shim-4.6.7.tgz"
-  "version" "4.6.7"
+es5-shim@^4.5.1:
+  version "4.6.7"
+  resolved "https://registry.npmmirror.com/es5-shim/-/es5-shim-4.6.7.tgz"
+  integrity sha512-jg21/dmlrNQI7JyyA2w7n+yifSxBng0ZralnSfVZjoCawgNTCnS+yBCyVM9DL5itm7SUnDGgv7hcq2XCZX4iRQ==
 
-"escalade@^3.1.1":
-  "integrity" "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-  "resolved" "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz"
-  "version" "3.1.1"
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
-"escape-html@~1.0.3":
-  "integrity" "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-  "resolved" "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz"
-  "version" "1.0.3"
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz"
+  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
-"escape-string-regexp@^1.0.2", "escape-string-regexp@^1.0.5", "escape-string-regexp@1.0.5":
-  "integrity" "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-  "resolved" "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-  "version" "1.0.5"
+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.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
-"eslint-config-airbnb-base@^14.0.0":
-  "integrity" "sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA=="
-  "resolved" "https://registry.npmmirror.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz"
-  "version" "14.2.1"
+eslint-config-airbnb-base@^14.0.0:
+  version "14.2.1"
+  resolved "https://registry.npmmirror.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz"
+  integrity sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==
   dependencies:
-    "confusing-browser-globals" "^1.0.10"
-    "object.assign" "^4.1.2"
-    "object.entries" "^1.1.2"
+    confusing-browser-globals "^1.0.10"
+    object.assign "^4.1.2"
+    object.entries "^1.1.2"
 
-"eslint-config-prettier@^6.0.0":
-  "integrity" "sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw=="
-  "resolved" "https://registry.npmmirror.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz"
-  "version" "6.15.0"
+eslint-config-prettier@^6.0.0:
+  version "6.15.0"
+  resolved "https://registry.npmmirror.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz"
+  integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==
   dependencies:
-    "get-stdin" "^6.0.0"
+    get-stdin "^6.0.0"
 
-"eslint-import-resolver-node@^0.3.9":
-  "integrity" "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g=="
-  "resolved" "https://registry.npmmirror.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz"
-  "version" "0.3.9"
+eslint-import-resolver-node@^0.3.7:
+  version "0.3.7"
+  resolved "https://registry.npmmirror.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz"
+  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
   dependencies:
-    "debug" "^3.2.7"
-    "is-core-module" "^2.13.0"
-    "resolve" "^1.22.4"
+    debug "^3.2.7"
+    is-core-module "^2.11.0"
+    resolve "^1.22.1"
 
-"eslint-loader@^2.2.1":
-  "integrity" "sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg=="
-  "resolved" "https://registry.npmmirror.com/eslint-loader/-/eslint-loader-2.2.1.tgz"
-  "version" "2.2.1"
+eslint-loader@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.npmmirror.com/eslint-loader/-/eslint-loader-2.2.1.tgz"
+  integrity sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==
   dependencies:
-    "loader-fs-cache" "^1.0.0"
-    "loader-utils" "^1.0.2"
-    "object-assign" "^4.0.1"
-    "object-hash" "^1.1.4"
-    "rimraf" "^2.6.1"
+    loader-fs-cache "^1.0.0"
+    loader-utils "^1.0.2"
+    object-assign "^4.0.1"
+    object-hash "^1.1.4"
+    rimraf "^2.6.1"
 
-"eslint-module-utils@^2.8.0":
-  "integrity" "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw=="
-  "resolved" "https://registry.npmmirror.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz"
-  "version" "2.8.0"
+eslint-module-utils@^2.7.4:
+  version "2.8.0"
+  resolved "https://registry.npmmirror.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz"
+  integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
   dependencies:
-    "debug" "^3.2.7"
+    debug "^3.2.7"
 
-"eslint-plugin-import@^2.22.1", "eslint-plugin-import@^2.26.0":
-  "integrity" "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg=="
-  "resolved" "https://registry.npmmirror.com/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz"
-  "version" "2.29.0"
+eslint-plugin-import@^2.22.1, eslint-plugin-import@^2.26.0:
+  version "2.27.5"
+  resolved "https://registry.npmmirror.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz"
+  integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
   dependencies:
-    "array-includes" "^3.1.7"
-    "array.prototype.findlastindex" "^1.2.3"
-    "array.prototype.flat" "^1.3.2"
-    "array.prototype.flatmap" "^1.3.2"
-    "debug" "^3.2.7"
-    "doctrine" "^2.1.0"
-    "eslint-import-resolver-node" "^0.3.9"
-    "eslint-module-utils" "^2.8.0"
-    "hasown" "^2.0.0"
-    "is-core-module" "^2.13.1"
-    "is-glob" "^4.0.3"
-    "minimatch" "^3.1.2"
-    "object.fromentries" "^2.0.7"
-    "object.groupby" "^1.0.1"
-    "object.values" "^1.1.7"
-    "semver" "^6.3.1"
-    "tsconfig-paths" "^3.14.2"
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    array.prototype.flatmap "^1.3.1"
+    debug "^3.2.7"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.7"
+    eslint-module-utils "^2.7.4"
+    has "^1.0.3"
+    is-core-module "^2.11.0"
+    is-glob "^4.0.3"
+    minimatch "^3.1.2"
+    object.values "^1.1.6"
+    resolve "^1.22.1"
+    semver "^6.3.0"
+    tsconfig-paths "^3.14.1"
 
-"eslint-plugin-prettier@^3.1.0":
-  "integrity" "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g=="
-  "resolved" "https://registry.npmmirror.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz"
-  "version" "3.4.1"
+eslint-plugin-prettier@^3.1.0:
+  version "3.4.1"
+  resolved "https://registry.npmmirror.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz"
+  integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==
   dependencies:
-    "prettier-linter-helpers" "^1.0.0"
+    prettier-linter-helpers "^1.0.0"
 
-"eslint-plugin-vue@9.0.0":
-  "integrity" "sha512-UD1uQp8bzMi1b0/YS1ErmZY2/zJ7YVcVp40KniccN+yka0Agji/5X3SJ/gmrjFYXpEaXRebxa49uegZ4NamFHg=="
-  "resolved" "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-9.0.0.tgz"
-  "version" "9.0.0"
+eslint-plugin-vue@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-9.0.0.tgz"
+  integrity sha512-UD1uQp8bzMi1b0/YS1ErmZY2/zJ7YVcVp40KniccN+yka0Agji/5X3SJ/gmrjFYXpEaXRebxa49uegZ4NamFHg==
   dependencies:
-    "eslint-utils" "^3.0.0"
-    "natural-compare" "^1.4.0"
-    "nth-check" "^2.0.1"
-    "postcss-selector-parser" "^6.0.9"
-    "semver" "^7.3.5"
-    "vue-eslint-parser" "^9.0.1"
-    "xml-name-validator" "^4.0.0"
+    eslint-utils "^3.0.0"
+    natural-compare "^1.4.0"
+    nth-check "^2.0.1"
+    postcss-selector-parser "^6.0.9"
+    semver "^7.3.5"
+    vue-eslint-parser "^9.0.1"
+    xml-name-validator "^4.0.0"
 
-"eslint-scope@^4.0.3":
-  "integrity" "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="
-  "resolved" "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-4.0.3.tgz"
-  "version" "4.0.3"
+eslint-scope@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-4.0.3.tgz"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
   dependencies:
-    "esrecurse" "^4.1.0"
-    "estraverse" "^4.1.1"
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
 
-"eslint-scope@^5.0.0":
-  "integrity" "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="
-  "resolved" "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz"
-  "version" "5.1.1"
+eslint-scope@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
-    "esrecurse" "^4.3.0"
-    "estraverse" "^4.1.1"
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
 
-"eslint-scope@^7.1.1":
-  "integrity" "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg=="
-  "resolved" "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.2.2.tgz"
-  "version" "7.2.2"
+eslint-scope@^7.1.1:
+  version "7.2.1"
+  resolved "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.2.1.tgz"
+  integrity sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==
   dependencies:
-    "esrecurse" "^4.3.0"
-    "estraverse" "^5.2.0"
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
-"eslint-utils@^1.4.3":
-  "integrity" "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q=="
-  "resolved" "https://registry.npmmirror.com/eslint-utils/-/eslint-utils-1.4.3.tgz"
-  "version" "1.4.3"
+eslint-utils@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.npmmirror.com/eslint-utils/-/eslint-utils-1.4.3.tgz"
+  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
   dependencies:
-    "eslint-visitor-keys" "^1.1.0"
+    eslint-visitor-keys "^1.1.0"
 
-"eslint-utils@^3.0.0":
-  "integrity" "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="
-  "resolved" "https://registry.npmmirror.com/eslint-utils/-/eslint-utils-3.0.0.tgz"
-  "version" "3.0.0"
+eslint-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/eslint-utils/-/eslint-utils-3.0.0.tgz"
+  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
   dependencies:
-    "eslint-visitor-keys" "^2.0.0"
+    eslint-visitor-keys "^2.0.0"
 
-"eslint-visitor-keys@^1.0.0", "eslint-visitor-keys@^1.1.0":
-  "integrity" "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
-  "resolved" "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"
-  "version" "1.3.0"
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-"eslint-visitor-keys@^2.0.0":
-  "integrity" "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
-  "resolved" "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
-  "version" "2.1.0"
+eslint-visitor-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-"eslint-visitor-keys@^3.3.0", "eslint-visitor-keys@^3.4.1":
-  "integrity" "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="
-  "resolved" "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz"
-  "version" "3.4.3"
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
 
-"eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^5.16.0 || ^6.8.0 || ^7.2.0", "eslint@^6.2.0 || ^7.0.0 || ^8.0.0", "eslint@>= 1.6.0 < 7.0.0", "eslint@>= 4.12.1", "eslint@>= 5.0.0", "eslint@>=1.6.0 <7.0.0", "eslint@>=3.14.1", "eslint@>=5", "eslint@>=5.0.0", "eslint@>=6.0.0", "eslint@6.8.0":
-  "integrity" "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="
-  "resolved" "https://registry.npmmirror.com/eslint/-/eslint-6.8.0.tgz"
-  "version" "6.8.0"
+"eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^5.16.0 || ^6.8.0 || ^7.2.0", "eslint@^6.2.0 || ^7.0.0 || ^8.0.0", "eslint@>= 1.6.0 < 7.0.0", "eslint@>= 4.12.1", "eslint@>= 5.0.0", "eslint@>=1.6.0 <7.0.0", eslint@>=3.14.1, eslint@>=5, eslint@>=5.0.0, eslint@>=6.0.0, eslint@6.8.0:
+  version "6.8.0"
+  resolved "https://registry.npmmirror.com/eslint/-/eslint-6.8.0.tgz"
+  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "ajv" "^6.10.0"
-    "chalk" "^2.1.0"
-    "cross-spawn" "^6.0.5"
-    "debug" "^4.0.1"
-    "doctrine" "^3.0.0"
-    "eslint-scope" "^5.0.0"
-    "eslint-utils" "^1.4.3"
-    "eslint-visitor-keys" "^1.1.0"
-    "espree" "^6.1.2"
-    "esquery" "^1.0.1"
-    "esutils" "^2.0.2"
-    "file-entry-cache" "^5.0.1"
-    "functional-red-black-tree" "^1.0.1"
-    "glob-parent" "^5.0.0"
-    "globals" "^12.1.0"
-    "ignore" "^4.0.6"
-    "import-fresh" "^3.0.0"
-    "imurmurhash" "^0.1.4"
-    "inquirer" "^7.0.0"
-    "is-glob" "^4.0.0"
-    "js-yaml" "^3.13.1"
-    "json-stable-stringify-without-jsonify" "^1.0.1"
-    "levn" "^0.3.0"
-    "lodash" "^4.17.14"
-    "minimatch" "^3.0.4"
-    "mkdirp" "^0.5.1"
-    "natural-compare" "^1.4.0"
-    "optionator" "^0.8.3"
-    "progress" "^2.0.0"
-    "regexpp" "^2.0.1"
-    "semver" "^6.1.2"
-    "strip-ansi" "^5.2.0"
-    "strip-json-comments" "^3.0.1"
-    "table" "^5.2.3"
-    "text-table" "^0.2.0"
-    "v8-compile-cache" "^2.0.3"
+    ajv "^6.10.0"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    eslint-scope "^5.0.0"
+    eslint-utils "^1.4.3"
+    eslint-visitor-keys "^1.1.0"
+    espree "^6.1.2"
+    esquery "^1.0.1"
+    esutils "^2.0.2"
+    file-entry-cache "^5.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^5.0.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    inquirer "^7.0.0"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.14"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.3"
+    progress "^2.0.0"
+    regexpp "^2.0.1"
+    semver "^6.1.2"
+    strip-ansi "^5.2.0"
+    strip-json-comments "^3.0.1"
+    table "^5.2.3"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
 
-"espree@^6.1.2":
-  "integrity" "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw=="
-  "resolved" "https://registry.npmmirror.com/espree/-/espree-6.2.1.tgz"
-  "version" "6.2.1"
+espree@^6.1.2:
+  version "6.2.1"
+  resolved "https://registry.npmmirror.com/espree/-/espree-6.2.1.tgz"
+  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
   dependencies:
-    "acorn" "^7.1.1"
-    "acorn-jsx" "^5.2.0"
-    "eslint-visitor-keys" "^1.1.0"
+    acorn "^7.1.1"
+    acorn-jsx "^5.2.0"
+    eslint-visitor-keys "^1.1.0"
 
-"espree@^9.3.1":
-  "integrity" "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ=="
-  "resolved" "https://registry.npmmirror.com/espree/-/espree-9.6.1.tgz"
-  "version" "9.6.1"
+espree@^9.3.1:
+  version "9.6.1"
+  resolved "https://registry.npmmirror.com/espree/-/espree-9.6.1.tgz"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    "acorn" "^8.9.0"
-    "acorn-jsx" "^5.3.2"
-    "eslint-visitor-keys" "^3.4.1"
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
 
-"esprima@^4.0.0":
-  "integrity" "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-  "resolved" "https://registry.npmmirror.com/esprima/-/esprima-4.0.1.tgz"
-  "version" "4.0.1"
+esprima@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/esprima/-/esprima-4.0.1.tgz"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-"esquery@^1.0.1", "esquery@^1.4.0":
-  "integrity" "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg=="
-  "resolved" "https://registry.npmmirror.com/esquery/-/esquery-1.5.0.tgz"
-  "version" "1.5.0"
+esquery@^1.0.1, esquery@^1.4.0:
+  version "1.5.0"
+  resolved "https://registry.npmmirror.com/esquery/-/esquery-1.5.0.tgz"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
-    "estraverse" "^5.1.0"
+    estraverse "^5.1.0"
 
-"esrecurse@^4.1.0", "esrecurse@^4.3.0":
-  "integrity" "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="
-  "resolved" "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz"
-  "version" "4.3.0"
+esrecurse@^4.1.0, esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
-    "estraverse" "^5.2.0"
+    estraverse "^5.2.0"
 
-"estraverse@^4.1.1":
-  "integrity" "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
-  "resolved" "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz"
-  "version" "4.3.0"
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-"estraverse@^5.1.0":
-  "integrity" "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-  "resolved" "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz"
-  "version" "5.3.0"
+estraverse@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
-"estraverse@^5.2.0":
-  "integrity" "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-  "resolved" "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz"
-  "version" "5.3.0"
+estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
-"estree-walker@^2.0.2":
-  "integrity" "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-  "resolved" "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz"
-  "version" "2.0.2"
+estree-walker@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
-"esutils@^2.0.2":
-  "integrity" "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
-  "resolved" "https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz"
-  "version" "2.0.3"
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-"etag@~1.8.1":
-  "integrity" "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
-  "resolved" "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz"
-  "version" "1.8.1"
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz"
+  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
-"event-pubsub@4.3.0":
-  "integrity" "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ=="
-  "resolved" "https://registry.npmmirror.com/event-pubsub/-/event-pubsub-4.3.0.tgz"
-  "version" "4.3.0"
+event-pubsub@4.3.0:
+  version "4.3.0"
+  resolved "https://registry.npmmirror.com/event-pubsub/-/event-pubsub-4.3.0.tgz"
+  integrity sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==
 
-"eventemitter3@^2.0.3":
-  "integrity" "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
-  "resolved" "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-2.0.3.tgz"
-  "version" "2.0.3"
+eventemitter3@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-2.0.3.tgz"
+  integrity sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==
 
-"eventemitter3@^4.0.0":
-  "integrity" "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-  "resolved" "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-4.0.7.tgz"
-  "version" "4.0.7"
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-4.0.7.tgz"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
-"events@^3.0.0":
-  "integrity" "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
-  "resolved" "https://registry.npmmirror.com/events/-/events-3.3.0.tgz"
-  "version" "3.3.0"
+events@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.npmmirror.com/events/-/events-3.3.0.tgz"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-"eventsource@^2.0.2":
-  "integrity" "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA=="
-  "resolved" "https://registry.npmmirror.com/eventsource/-/eventsource-2.0.2.tgz"
-  "version" "2.0.2"
+eventsource@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/eventsource/-/eventsource-2.0.2.tgz"
+  integrity sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==
 
-"evp_bytestokey@^1.0.0", "evp_bytestokey@^1.0.3":
-  "integrity" "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="
-  "resolved" "https://registry.npmmirror.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"
-  "version" "1.0.3"
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
   dependencies:
-    "md5.js" "^1.3.4"
-    "safe-buffer" "^5.1.1"
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
 
-"execa@^0.8.0":
-  "integrity" "sha512-zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA=="
-  "resolved" "https://registry.npmmirror.com/execa/-/execa-0.8.0.tgz"
-  "version" "0.8.0"
+execa@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.npmmirror.com/execa/-/execa-0.8.0.tgz"
+  integrity sha512-zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA==
   dependencies:
-    "cross-spawn" "^5.0.1"
-    "get-stream" "^3.0.0"
-    "is-stream" "^1.1.0"
-    "npm-run-path" "^2.0.0"
-    "p-finally" "^1.0.0"
-    "signal-exit" "^3.0.0"
-    "strip-eof" "^1.0.0"
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
 
-"execa@^1.0.0":
-  "integrity" "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="
-  "resolved" "https://registry.npmmirror.com/execa/-/execa-1.0.0.tgz"
-  "version" "1.0.0"
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/execa/-/execa-1.0.0.tgz"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
   dependencies:
-    "cross-spawn" "^6.0.0"
-    "get-stream" "^4.0.0"
-    "is-stream" "^1.1.0"
-    "npm-run-path" "^2.0.0"
-    "p-finally" "^1.0.0"
-    "signal-exit" "^3.0.0"
-    "strip-eof" "^1.0.0"
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
 
-"execa@^3.3.0":
-  "integrity" "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g=="
-  "resolved" "https://registry.npmmirror.com/execa/-/execa-3.4.0.tgz"
-  "version" "3.4.0"
+execa@^3.3.0:
+  version "3.4.0"
+  resolved "https://registry.npmmirror.com/execa/-/execa-3.4.0.tgz"
+  integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==
   dependencies:
-    "cross-spawn" "^7.0.0"
-    "get-stream" "^5.0.0"
-    "human-signals" "^1.1.1"
-    "is-stream" "^2.0.0"
-    "merge-stream" "^2.0.0"
-    "npm-run-path" "^4.0.0"
-    "onetime" "^5.1.0"
-    "p-finally" "^2.0.0"
-    "signal-exit" "^3.0.2"
-    "strip-final-newline" "^2.0.0"
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
 
-"execa@^5.1.1":
-  "integrity" "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="
-  "resolved" "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz"
-  "version" "5.1.1"
+execa@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
-    "cross-spawn" "^7.0.3"
-    "get-stream" "^6.0.0"
-    "human-signals" "^2.1.0"
-    "is-stream" "^2.0.0"
-    "merge-stream" "^2.0.0"
-    "npm-run-path" "^4.0.1"
-    "onetime" "^5.1.2"
-    "signal-exit" "^3.0.3"
-    "strip-final-newline" "^2.0.0"
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
 
-"expand-brackets@^2.1.4":
-  "integrity" "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA=="
-  "resolved" "https://registry.npmmirror.com/expand-brackets/-/expand-brackets-2.1.4.tgz"
-  "version" "2.1.4"
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.npmmirror.com/expand-brackets/-/expand-brackets-2.1.4.tgz"
+  integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==
   dependencies:
-    "debug" "^2.3.3"
-    "define-property" "^0.2.5"
-    "extend-shallow" "^2.0.1"
-    "posix-character-classes" "^0.1.0"
-    "regex-not" "^1.0.0"
-    "snapdragon" "^0.8.1"
-    "to-regex" "^3.0.1"
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
 
-"express@^4.16.3", "express@^4.17.1":
-  "integrity" "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="
-  "resolved" "https://registry.npmmirror.com/express/-/express-4.18.2.tgz"
-  "version" "4.18.2"
+express@^4.16.3, express@^4.17.1:
+  version "4.18.2"
+  resolved "https://registry.npmmirror.com/express/-/express-4.18.2.tgz"
+  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
   dependencies:
-    "accepts" "~1.3.8"
-    "array-flatten" "1.1.1"
-    "body-parser" "1.20.1"
-    "content-disposition" "0.5.4"
-    "content-type" "~1.0.4"
-    "cookie" "0.5.0"
-    "cookie-signature" "1.0.6"
-    "debug" "2.6.9"
-    "depd" "2.0.0"
-    "encodeurl" "~1.0.2"
-    "escape-html" "~1.0.3"
-    "etag" "~1.8.1"
-    "finalhandler" "1.2.0"
-    "fresh" "0.5.2"
-    "http-errors" "2.0.0"
-    "merge-descriptors" "1.0.1"
-    "methods" "~1.1.2"
-    "on-finished" "2.4.1"
-    "parseurl" "~1.3.3"
-    "path-to-regexp" "0.1.7"
-    "proxy-addr" "~2.0.7"
-    "qs" "6.11.0"
-    "range-parser" "~1.2.1"
-    "safe-buffer" "5.2.1"
-    "send" "0.18.0"
-    "serve-static" "1.15.0"
-    "setprototypeof" "1.2.0"
-    "statuses" "2.0.1"
-    "type-is" "~1.6.18"
-    "utils-merge" "1.0.1"
-    "vary" "~1.1.2"
+    accepts "~1.3.8"
+    array-flatten "1.1.1"
+    body-parser "1.20.1"
+    content-disposition "0.5.4"
+    content-type "~1.0.4"
+    cookie "0.5.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "2.0.0"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.2.0"
+    fresh "0.5.2"
+    http-errors "2.0.0"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "2.4.1"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.7"
+    qs "6.11.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.2.1"
+    send "0.18.0"
+    serve-static "1.15.0"
+    setprototypeof "1.2.0"
+    statuses "2.0.1"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
 
-"extend-shallow@^2.0.1":
-  "integrity" "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug=="
-  "resolved" "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-2.0.1.tgz"
-  "version" "2.0.1"
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-2.0.1.tgz"
+  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
   dependencies:
-    "is-extendable" "^0.1.0"
+    is-extendable "^0.1.0"
 
-"extend-shallow@^3.0.0", "extend-shallow@^3.0.2":
-  "integrity" "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q=="
-  "resolved" "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz"
-  "version" "3.0.2"
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz"
+  integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
   dependencies:
-    "assign-symbols" "^1.0.0"
-    "is-extendable" "^1.0.1"
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
 
-"extend@^3.0.2", "extend@~3.0.2":
-  "integrity" "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-  "resolved" "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz"
-  "version" "3.0.2"
+extend@^3.0.2, extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-"external-editor@^3.0.3":
-  "integrity" "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="
-  "resolved" "https://registry.npmmirror.com/external-editor/-/external-editor-3.1.0.tgz"
-  "version" "3.1.0"
+external-editor@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/external-editor/-/external-editor-3.1.0.tgz"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
   dependencies:
-    "chardet" "^0.7.0"
-    "iconv-lite" "^0.4.24"
-    "tmp" "^0.0.33"
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
 
-"extglob@^2.0.2", "extglob@^2.0.4":
-  "integrity" "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="
-  "resolved" "https://registry.npmmirror.com/extglob/-/extglob-2.0.4.tgz"
-  "version" "2.0.4"
+extglob@^2.0.2, extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.npmmirror.com/extglob/-/extglob-2.0.4.tgz"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
-    "array-unique" "^0.3.2"
-    "define-property" "^1.0.0"
-    "expand-brackets" "^2.1.4"
-    "extend-shallow" "^2.0.1"
-    "fragment-cache" "^0.2.1"
-    "regex-not" "^1.0.0"
-    "snapdragon" "^0.8.1"
-    "to-regex" "^3.0.1"
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
 
-"extsprintf@^1.2.0", "extsprintf@1.3.0":
-  "integrity" "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="
-  "resolved" "https://registry.npmmirror.com/extsprintf/-/extsprintf-1.3.0.tgz"
-  "version" "1.3.0"
+extsprintf@^1.2.0, extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npmmirror.com/extsprintf/-/extsprintf-1.3.0.tgz"
+  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
 
-"fast-deep-equal@^3.1.1":
-  "integrity" "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-  "resolved" "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
-  "version" "3.1.3"
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-"fast-diff@^1.1.2", "fast-diff@1.1.2":
-  "integrity" "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
-  "resolved" "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.1.2.tgz"
-  "version" "1.1.2"
+fast-diff@^1.1.2, fast-diff@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.1.2.tgz"
+  integrity sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==
 
-"fast-glob@^2.2.6":
-  "integrity" "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="
-  "resolved" "https://registry.npmmirror.com/fast-glob/-/fast-glob-2.2.7.tgz"
-  "version" "2.2.7"
+fast-glob@^2.2.6:
+  version "2.2.7"
+  resolved "https://registry.npmmirror.com/fast-glob/-/fast-glob-2.2.7.tgz"
+  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
     "@nodelib/fs.stat" "^1.1.2"
-    "glob-parent" "^3.1.0"
-    "is-glob" "^4.0.0"
-    "merge2" "^1.2.3"
-    "micromatch" "^3.1.10"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.3"
+    micromatch "^3.1.10"
 
-"fast-json-stable-stringify@^2.0.0":
-  "integrity" "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-  "resolved" "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
-  "version" "2.1.0"
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-"fast-levenshtein@~2.0.6":
-  "integrity" "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
-  "resolved" "https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
-  "version" "2.0.6"
+fast-levenshtein@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-"faye-websocket@^0.11.3", "faye-websocket@^0.11.4":
-  "integrity" "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="
-  "resolved" "https://registry.npmmirror.com/faye-websocket/-/faye-websocket-0.11.4.tgz"
-  "version" "0.11.4"
+faye-websocket@^0.11.3, faye-websocket@^0.11.4:
+  version "0.11.4"
+  resolved "https://registry.npmmirror.com/faye-websocket/-/faye-websocket-0.11.4.tgz"
+  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
   dependencies:
-    "websocket-driver" ">=0.5.1"
+    websocket-driver ">=0.5.1"
 
-"fflate@^0.4.8":
-  "integrity" "sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA=="
-  "resolved" "https://registry.npmmirror.com/fflate/-/fflate-0.4.8.tgz"
-  "version" "0.4.8"
+fflate@^0.4.8:
+  version "0.4.8"
+  resolved "https://registry.npmmirror.com/fflate/-/fflate-0.4.8.tgz"
+  integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==
 
-"figgy-pudding@^3.5.1":
-  "integrity" "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="
-  "resolved" "https://registry.npmmirror.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"
-  "version" "3.5.2"
+figgy-pudding@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.npmmirror.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"
+  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
-"figures@^3.0.0":
-  "integrity" "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="
-  "resolved" "https://registry.npmmirror.com/figures/-/figures-3.2.0.tgz"
-  "version" "3.2.0"
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.npmmirror.com/figures/-/figures-3.2.0.tgz"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
-    "escape-string-regexp" "^1.0.5"
+    escape-string-regexp "^1.0.5"
 
-"file-entry-cache@^5.0.1":
-  "integrity" "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="
-  "resolved" "https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"
-  "version" "5.0.1"
+file-entry-cache@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"
+  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
   dependencies:
-    "flat-cache" "^2.0.1"
+    flat-cache "^2.0.1"
 
-"file-loader@*", "file-loader@^4.2.0":
-  "integrity" "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA=="
-  "resolved" "https://registry.npmmirror.com/file-loader/-/file-loader-4.3.0.tgz"
-  "version" "4.3.0"
+file-loader@*, file-loader@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.npmmirror.com/file-loader/-/file-loader-4.3.0.tgz"
+  integrity sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==
   dependencies:
-    "loader-utils" "^1.2.3"
-    "schema-utils" "^2.5.0"
+    loader-utils "^1.2.3"
+    schema-utils "^2.5.0"
 
-"file-saver@^2.0.5":
-  "integrity" "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
-  "resolved" "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz"
-  "version" "2.0.5"
+file-saver@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz"
+  integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
 
-"file-uri-to-path@1.0.0":
-  "integrity" "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
-  "resolved" "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
-  "version" "1.0.0"
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
-"filesize@^3.6.1":
-  "integrity" "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="
-  "resolved" "https://registry.npmmirror.com/filesize/-/filesize-3.6.1.tgz"
-  "version" "3.6.1"
+filesize@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.npmmirror.com/filesize/-/filesize-3.6.1.tgz"
+  integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
 
-"fill-range@^4.0.0":
-  "integrity" "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ=="
-  "resolved" "https://registry.npmmirror.com/fill-range/-/fill-range-4.0.0.tgz"
-  "version" "4.0.0"
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/fill-range/-/fill-range-4.0.0.tgz"
+  integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==
   dependencies:
-    "extend-shallow" "^2.0.1"
-    "is-number" "^3.0.0"
-    "repeat-string" "^1.6.1"
-    "to-regex-range" "^2.1.0"
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
 
-"fill-range@^7.0.1":
-  "integrity" "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="
-  "resolved" "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz"
-  "version" "7.0.1"
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
   dependencies:
-    "to-regex-range" "^5.0.1"
+    to-regex-range "^5.0.1"
 
-"finalhandler@1.1.0":
-  "integrity" "sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw=="
-  "resolved" "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.1.0.tgz"
-  "version" "1.1.0"
+finalhandler@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.1.0.tgz"
+  integrity sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==
   dependencies:
-    "debug" "2.6.9"
-    "encodeurl" "~1.0.1"
-    "escape-html" "~1.0.3"
-    "on-finished" "~2.3.0"
-    "parseurl" "~1.3.2"
-    "statuses" "~1.3.1"
-    "unpipe" "~1.0.0"
+    debug "2.6.9"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.3.1"
+    unpipe "~1.0.0"
 
-"finalhandler@1.2.0":
-  "integrity" "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="
-  "resolved" "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.2.0.tgz"
-  "version" "1.2.0"
+finalhandler@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.2.0.tgz"
+  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
   dependencies:
-    "debug" "2.6.9"
-    "encodeurl" "~1.0.2"
-    "escape-html" "~1.0.3"
-    "on-finished" "2.4.1"
-    "parseurl" "~1.3.3"
-    "statuses" "2.0.1"
-    "unpipe" "~1.0.0"
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "2.4.1"
+    parseurl "~1.3.3"
+    statuses "2.0.1"
+    unpipe "~1.0.0"
 
-"find-cache-dir@^0.1.1":
-  "integrity" "sha512-Z9XSBoNE7xQiV6MSgPuCfyMokH2K7JdpRkOYE1+mu3d4BFJtx3GW+f6Bo4q8IX6rlf5MYbLBKW0pjl2cWdkm2A=="
-  "resolved" "https://registry.npmmirror.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz"
-  "version" "0.1.1"
+find-cache-dir@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npmmirror.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz"
+  integrity sha512-Z9XSBoNE7xQiV6MSgPuCfyMokH2K7JdpRkOYE1+mu3d4BFJtx3GW+f6Bo4q8IX6rlf5MYbLBKW0pjl2cWdkm2A==
   dependencies:
-    "commondir" "^1.0.1"
-    "mkdirp" "^0.5.1"
-    "pkg-dir" "^1.0.0"
+    commondir "^1.0.1"
+    mkdirp "^0.5.1"
+    pkg-dir "^1.0.0"
 
-"find-cache-dir@^2.1.0":
-  "integrity" "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="
-  "resolved" "https://registry.npmmirror.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz"
-  "version" "2.1.0"
+find-cache-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
   dependencies:
-    "commondir" "^1.0.1"
-    "make-dir" "^2.0.0"
-    "pkg-dir" "^3.0.0"
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
 
-"find-cache-dir@^3.0.0", "find-cache-dir@^3.3.1":
-  "integrity" "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="
-  "resolved" "https://registry.npmmirror.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz"
-  "version" "3.3.2"
+find-cache-dir@^3.0.0, find-cache-dir@^3.3.1:
+  version "3.3.2"
+  resolved "https://registry.npmmirror.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz"
+  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
   dependencies:
-    "commondir" "^1.0.1"
-    "make-dir" "^3.0.2"
-    "pkg-dir" "^4.1.0"
+    commondir "^1.0.1"
+    make-dir "^3.0.2"
+    pkg-dir "^4.1.0"
 
-"find-up@^1.0.0":
-  "integrity" "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA=="
-  "resolved" "https://registry.npmmirror.com/find-up/-/find-up-1.1.2.tgz"
-  "version" "1.1.2"
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/find-up/-/find-up-1.1.2.tgz"
+  integrity sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==
   dependencies:
-    "path-exists" "^2.0.0"
-    "pinkie-promise" "^2.0.0"
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
 
-"find-up@^3.0.0":
-  "integrity" "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="
-  "resolved" "https://registry.npmmirror.com/find-up/-/find-up-3.0.0.tgz"
-  "version" "3.0.0"
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/find-up/-/find-up-3.0.0.tgz"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
-    "locate-path" "^3.0.0"
+    locate-path "^3.0.0"
 
-"find-up@^4.0.0":
-  "integrity" "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="
-  "resolved" "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz"
-  "version" "4.1.0"
+find-up@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
   dependencies:
-    "locate-path" "^5.0.0"
-    "path-exists" "^4.0.0"
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
 
-"flat-cache@^2.0.1":
-  "integrity" "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="
-  "resolved" "https://registry.npmmirror.com/flat-cache/-/flat-cache-2.0.1.tgz"
-  "version" "2.0.1"
+flat-cache@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/flat-cache/-/flat-cache-2.0.1.tgz"
+  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
   dependencies:
-    "flatted" "^2.0.0"
-    "rimraf" "2.6.3"
-    "write" "1.0.3"
+    flatted "^2.0.0"
+    rimraf "2.6.3"
+    write "1.0.3"
 
-"flatted@^2.0.0":
-  "integrity" "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="
-  "resolved" "https://registry.npmmirror.com/flatted/-/flatted-2.0.2.tgz"
-  "version" "2.0.2"
+flatted@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/flatted/-/flatted-2.0.2.tgz"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
-"flush-write-stream@^1.0.0":
-  "integrity" "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="
-  "resolved" "https://registry.npmmirror.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"
-  "version" "1.1.1"
+flush-write-stream@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
   dependencies:
-    "inherits" "^2.0.3"
-    "readable-stream" "^2.3.6"
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
 
-"follow-redirects@^1.0.0", "follow-redirects@^1.14.9":
-  "integrity" "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q=="
-  "resolved" "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.3.tgz"
-  "version" "1.15.3"
+follow-redirects@^1.0.0, follow-redirects@^1.14.9:
+  version "1.15.2"
+  resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
-"for-each@^0.3.3":
-  "integrity" "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="
-  "resolved" "https://registry.npmmirror.com/for-each/-/for-each-0.3.3.tgz"
-  "version" "0.3.3"
+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.npmmirror.com/for-each/-/for-each-0.3.3.tgz"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
   dependencies:
-    "is-callable" "^1.1.3"
+    is-callable "^1.1.3"
 
-"for-in@^1.0.2":
-  "integrity" "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="
-  "resolved" "https://registry.npmmirror.com/for-in/-/for-in-1.0.2.tgz"
-  "version" "1.0.2"
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/for-in/-/for-in-1.0.2.tgz"
+  integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
 
-"forever-agent@~0.6.1":
-  "integrity" "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="
-  "resolved" "https://registry.npmmirror.com/forever-agent/-/forever-agent-0.6.1.tgz"
-  "version" "0.6.1"
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.npmmirror.com/forever-agent/-/forever-agent-0.6.1.tgz"
+  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
 
-"form-data@^4.0.0":
-  "integrity" "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="
-  "resolved" "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz"
-  "version" "4.0.0"
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
-    "asynckit" "^0.4.0"
-    "combined-stream" "^1.0.8"
-    "mime-types" "^2.1.12"
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
 
-"form-data@~2.3.2":
-  "integrity" "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="
-  "resolved" "https://registry.npmmirror.com/form-data/-/form-data-2.3.3.tgz"
-  "version" "2.3.3"
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.npmmirror.com/form-data/-/form-data-2.3.3.tgz"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
-    "asynckit" "^0.4.0"
-    "combined-stream" "^1.0.6"
-    "mime-types" "^2.1.12"
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
 
-"forwarded@0.2.0":
-  "integrity" "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
-  "resolved" "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz"
-  "version" "0.2.0"
+forwarded@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz"
+  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-"frac@~1.1.2":
-  "integrity" "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="
-  "resolved" "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz"
-  "version" "1.1.2"
+frac@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz"
+  integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
 
-"fragment-cache@^0.2.1":
-  "integrity" "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA=="
-  "resolved" "https://registry.npmmirror.com/fragment-cache/-/fragment-cache-0.2.1.tgz"
-  "version" "0.2.1"
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.npmmirror.com/fragment-cache/-/fragment-cache-0.2.1.tgz"
+  integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
   dependencies:
-    "map-cache" "^0.2.2"
+    map-cache "^0.2.2"
 
-"fresh@0.5.2":
-  "integrity" "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
-  "resolved" "https://registry.npmmirror.com/fresh/-/fresh-0.5.2.tgz"
-  "version" "0.5.2"
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.npmmirror.com/fresh/-/fresh-0.5.2.tgz"
+  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
-"from2@^2.1.0":
-  "integrity" "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g=="
-  "resolved" "https://registry.npmmirror.com/from2/-/from2-2.3.0.tgz"
-  "version" "2.3.0"
+from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/from2/-/from2-2.3.0.tgz"
+  integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==
   dependencies:
-    "inherits" "^2.0.1"
-    "readable-stream" "^2.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
 
-"fs-extra@^7.0.1":
-  "integrity" "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="
-  "resolved" "https://registry.npmmirror.com/fs-extra/-/fs-extra-7.0.1.tgz"
-  "version" "7.0.1"
+fs-extra@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.npmmirror.com/fs-extra/-/fs-extra-7.0.1.tgz"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
   dependencies:
-    "graceful-fs" "^4.1.2"
-    "jsonfile" "^4.0.0"
-    "universalify" "^0.1.0"
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
 
-"fs-extra@^8.1.0":
-  "integrity" "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="
-  "resolved" "https://registry.npmmirror.com/fs-extra/-/fs-extra-8.1.0.tgz"
-  "version" "8.1.0"
+fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.npmmirror.com/fs-extra/-/fs-extra-8.1.0.tgz"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
   dependencies:
-    "graceful-fs" "^4.2.0"
-    "jsonfile" "^4.0.0"
-    "universalify" "^0.1.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
 
-"fs-minipass@^2.0.0":
-  "integrity" "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="
-  "resolved" "https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz"
-  "version" "2.1.0"
+fs-minipass@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
   dependencies:
-    "minipass" "^3.0.0"
+    minipass "^3.0.0"
 
-"fs-write-stream-atomic@^1.0.8":
-  "integrity" "sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA=="
-  "resolved" "https://registry.npmmirror.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"
-  "version" "1.0.10"
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.npmmirror.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"
+  integrity sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==
   dependencies:
-    "graceful-fs" "^4.1.2"
-    "iferr" "^0.1.5"
-    "imurmurhash" "^0.1.4"
-    "readable-stream" "1 || 2"
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
 
-"fs.realpath@^1.0.0":
-  "integrity" "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-  "resolved" "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
-  "version" "1.0.0"
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-"function-bind@^1.1.2":
-  "integrity" "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-  "resolved" "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz"
-  "version" "1.1.2"
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-"function.prototype.name@^1.1.6":
-  "integrity" "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg=="
-  "resolved" "https://registry.npmmirror.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz"
-  "version" "1.1.6"
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.npmmirror.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "functions-have-names" "^1.2.3"
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
 
-"functional-red-black-tree@^1.0.1":
-  "integrity" "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="
-  "resolved" "https://registry.npmmirror.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"
-  "version" "1.0.1"
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"
+  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
 
-"functions-have-names@^1.2.3":
-  "integrity" "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
-  "resolved" "https://registry.npmmirror.com/functions-have-names/-/functions-have-names-1.2.3.tgz"
-  "version" "1.2.3"
+functions-have-names@^1.2.2, functions-have-names@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.npmmirror.com/functions-have-names/-/functions-have-names-1.2.3.tgz"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-"fuse.js@6.6.2":
-  "integrity" "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA=="
-  "resolved" "https://registry.npmmirror.com/fuse.js/-/fuse.js-6.6.2.tgz"
-  "version" "6.6.2"
+fuse.js@6.6.2:
+  version "6.6.2"
+  resolved "https://registry.npmmirror.com/fuse.js/-/fuse.js-6.6.2.tgz"
+  integrity sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==
 
-"fuzzysearch@^1.0.3":
-  "integrity" "sha512-s+kNWQuI3mo9OALw0HJ6YGmMbLqEufCh2nX/zzV5CrICQ/y4AwPxM+6TIiF9ItFCHXFCyM/BfCCmN57NTIJuPg=="
-  "resolved" "https://registry.npmmirror.com/fuzzysearch/-/fuzzysearch-1.0.3.tgz"
-  "version" "1.0.3"
+fuzzysearch@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/fuzzysearch/-/fuzzysearch-1.0.3.tgz"
+  integrity sha512-s+kNWQuI3mo9OALw0HJ6YGmMbLqEufCh2nX/zzV5CrICQ/y4AwPxM+6TIiF9ItFCHXFCyM/BfCCmN57NTIJuPg==
 
-"gensync@^1.0.0-beta.2":
-  "integrity" "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
-  "resolved" "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz"
-  "version" "1.0.0-beta.2"
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-"get-caller-file@^2.0.1", "get-caller-file@^2.0.5":
-  "integrity" "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-  "resolved" "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz"
-  "version" "2.0.5"
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-"get-intrinsic@^1.0.2", "get-intrinsic@^1.1.1", "get-intrinsic@^1.1.3", "get-intrinsic@^1.2.0", "get-intrinsic@^1.2.1", "get-intrinsic@^1.2.2":
-  "integrity" "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA=="
-  "resolved" "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz"
-  "version" "1.2.2"
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz"
+  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
   dependencies:
-    "function-bind" "^1.1.2"
-    "has-proto" "^1.0.1"
-    "has-symbols" "^1.0.3"
-    "hasown" "^2.0.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
 
-"get-stdin@^6.0.0":
-  "integrity" "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="
-  "resolved" "https://registry.npmmirror.com/get-stdin/-/get-stdin-6.0.0.tgz"
-  "version" "6.0.0"
+get-stdin@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmmirror.com/get-stdin/-/get-stdin-6.0.0.tgz"
+  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
 
-"get-stream@^3.0.0":
-  "integrity" "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="
-  "resolved" "https://registry.npmmirror.com/get-stream/-/get-stream-3.0.0.tgz"
-  "version" "3.0.0"
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/get-stream/-/get-stream-3.0.0.tgz"
+  integrity sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==
 
-"get-stream@^4.0.0":
-  "integrity" "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="
-  "resolved" "https://registry.npmmirror.com/get-stream/-/get-stream-4.1.0.tgz"
-  "version" "4.1.0"
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.npmmirror.com/get-stream/-/get-stream-4.1.0.tgz"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
   dependencies:
-    "pump" "^3.0.0"
+    pump "^3.0.0"
 
-"get-stream@^5.0.0":
-  "integrity" "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="
-  "resolved" "https://registry.npmmirror.com/get-stream/-/get-stream-5.2.0.tgz"
-  "version" "5.2.0"
+get-stream@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.npmmirror.com/get-stream/-/get-stream-5.2.0.tgz"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
   dependencies:
-    "pump" "^3.0.0"
+    pump "^3.0.0"
 
-"get-stream@^6.0.0":
-  "integrity" "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
-  "resolved" "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz"
-  "version" "6.0.1"
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-"get-symbol-description@^1.0.0":
-  "integrity" "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="
-  "resolved" "https://registry.npmmirror.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz"
-  "version" "1.0.0"
+get-symbol-description@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz"
+  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
   dependencies:
-    "call-bind" "^1.0.2"
-    "get-intrinsic" "^1.1.1"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
 
-"get-value@^2.0.3", "get-value@^2.0.6":
-  "integrity" "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA=="
-  "resolved" "https://registry.npmmirror.com/get-value/-/get-value-2.0.6.tgz"
-  "version" "2.0.6"
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.npmmirror.com/get-value/-/get-value-2.0.6.tgz"
+  integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
-"getpass@^0.1.1":
-  "integrity" "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="
-  "resolved" "https://registry.npmmirror.com/getpass/-/getpass-0.1.7.tgz"
-  "version" "0.1.7"
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.npmmirror.com/getpass/-/getpass-0.1.7.tgz"
+  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
   dependencies:
-    "assert-plus" "^1.0.0"
+    assert-plus "^1.0.0"
 
-"glob-parent@^3.1.0":
-  "integrity" "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA=="
-  "resolved" "https://registry.npmmirror.com/glob-parent/-/glob-parent-3.1.0.tgz"
-  "version" "3.1.0"
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/glob-parent/-/glob-parent-3.1.0.tgz"
+  integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==
   dependencies:
-    "is-glob" "^3.1.0"
-    "path-dirname" "^1.0.0"
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
 
-"glob-parent@^5.0.0", "glob-parent@~5.1.2":
-  "integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="
-  "resolved" "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz"
-  "version" "5.1.2"
+glob-parent@^5.0.0:
+  version "5.1.2"
+  resolved "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
-    "is-glob" "^4.0.1"
+    is-glob "^4.0.1"
 
-"glob-to-regexp@^0.3.0":
-  "integrity" "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig=="
-  "resolved" "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"
-  "version" "0.3.0"
-
-"glob@^7.0.3", "glob@^7.1.2", "glob@^7.1.3", "glob@^7.1.4":
-  "integrity" "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="
-  "resolved" "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz"
-  "version" "7.2.3"
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
-    "fs.realpath" "^1.0.0"
-    "inflight" "^1.0.4"
-    "inherits" "2"
-    "minimatch" "^3.1.1"
-    "once" "^1.3.0"
-    "path-is-absolute" "^1.0.0"
+    is-glob "^4.0.1"
 
-"global-object@^1.0.0":
-  "integrity" "sha512-mSPSkY6UsHv6hgW0V2dfWBWTS8TnPnLx3ECVNoWp6rBI2Bg66VYoqGoTFlH/l7XhAZ/l+StYlntXlt87BEeCcg=="
-  "resolved" "https://registry.npmmirror.com/global-object/-/global-object-1.0.0.tgz"
-  "version" "1.0.0"
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"
+  integrity sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==
 
-"global@^4.3.0", "global@^4.3.1", "global@^4.4.0", "global@~4.4.0", "global@4.4.0":
-  "integrity" "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w=="
-  "resolved" "https://registry.npmmirror.com/global/-/global-4.4.0.tgz"
-  "version" "4.4.0"
+glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+  version "7.2.3"
+  resolved "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
-    "min-document" "^2.19.0"
-    "process" "^0.11.10"
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
 
-"global@~4.3.0":
-  "integrity" "sha512-/4AybdwIDU4HkCUbJkZdWpe4P6vuw/CUtu+0I1YlLIPe7OlUO7KNJ+q/rO70CW2/NW6Jc6I62++Hzsf5Alu6rQ=="
-  "resolved" "https://registry.npmmirror.com/global/-/global-4.3.2.tgz"
-  "version" "4.3.2"
+global-object@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/global-object/-/global-object-1.0.0.tgz"
+  integrity sha512-mSPSkY6UsHv6hgW0V2dfWBWTS8TnPnLx3ECVNoWp6rBI2Bg66VYoqGoTFlH/l7XhAZ/l+StYlntXlt87BEeCcg==
+
+global@^4.3.0, global@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.npmmirror.com/global/-/global-4.3.2.tgz"
+  integrity sha512-/4AybdwIDU4HkCUbJkZdWpe4P6vuw/CUtu+0I1YlLIPe7OlUO7KNJ+q/rO70CW2/NW6Jc6I62++Hzsf5Alu6rQ==
   dependencies:
-    "min-document" "^2.19.0"
-    "process" "~0.5.1"
+    min-document "^2.19.0"
+    process "~0.5.1"
 
-"global@4.3.2":
-  "integrity" "sha512-/4AybdwIDU4HkCUbJkZdWpe4P6vuw/CUtu+0I1YlLIPe7OlUO7KNJ+q/rO70CW2/NW6Jc6I62++Hzsf5Alu6rQ=="
-  "resolved" "https://registry.npmmirror.com/global/-/global-4.3.2.tgz"
-  "version" "4.3.2"
+global@^4.3.1, global@^4.4.0, global@~4.4.0, global@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.npmmirror.com/global/-/global-4.4.0.tgz"
+  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
   dependencies:
-    "min-document" "^2.19.0"
-    "process" "~0.5.1"
+    min-document "^2.19.0"
+    process "^0.11.10"
 
-"globals@^11.1.0":
-  "integrity" "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-  "resolved" "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz"
-  "version" "11.12.0"
-
-"globals@^12.1.0":
-  "integrity" "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="
-  "resolved" "https://registry.npmmirror.com/globals/-/globals-12.4.0.tgz"
-  "version" "12.4.0"
+global@~4.3.0:
+  version "4.3.2"
+  resolved "https://registry.npmmirror.com/global/-/global-4.3.2.tgz"
+  integrity sha512-/4AybdwIDU4HkCUbJkZdWpe4P6vuw/CUtu+0I1YlLIPe7OlUO7KNJ+q/rO70CW2/NW6Jc6I62++Hzsf5Alu6rQ==
   dependencies:
-    "type-fest" "^0.8.1"
+    min-document "^2.19.0"
+    process "~0.5.1"
 
-"globalthis@^1.0.3":
-  "integrity" "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="
-  "resolved" "https://registry.npmmirror.com/globalthis/-/globalthis-1.0.3.tgz"
-  "version" "1.0.3"
+globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+globals@^12.1.0:
+  version "12.4.0"
+  resolved "https://registry.npmmirror.com/globals/-/globals-12.4.0.tgz"
+  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
   dependencies:
-    "define-properties" "^1.1.3"
+    type-fest "^0.8.1"
 
-"globby@^6.1.0":
-  "integrity" "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw=="
-  "resolved" "https://registry.npmmirror.com/globby/-/globby-6.1.0.tgz"
-  "version" "6.1.0"
+globalthis@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/globalthis/-/globalthis-1.0.3.tgz"
+  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
   dependencies:
-    "array-union" "^1.0.1"
-    "glob" "^7.0.3"
-    "object-assign" "^4.0.1"
-    "pify" "^2.0.0"
-    "pinkie-promise" "^2.0.0"
+    define-properties "^1.1.3"
 
-"globby@^7.1.1":
-  "integrity" "sha512-yANWAN2DUcBtuus5Cpd+SKROzXHs2iVXFZt/Ykrfz6SAXqacLX25NZpltE+39ceMexYF4TtEadjuSTw8+3wX4g=="
-  "resolved" "https://registry.npmmirror.com/globby/-/globby-7.1.1.tgz"
-  "version" "7.1.1"
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.npmmirror.com/globby/-/globby-6.1.0.tgz"
+  integrity sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==
   dependencies:
-    "array-union" "^1.0.1"
-    "dir-glob" "^2.0.0"
-    "glob" "^7.1.2"
-    "ignore" "^3.3.5"
-    "pify" "^3.0.0"
-    "slash" "^1.0.0"
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
 
-"globby@^9.2.0":
-  "integrity" "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg=="
-  "resolved" "https://registry.npmmirror.com/globby/-/globby-9.2.0.tgz"
-  "version" "9.2.0"
+globby@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.npmmirror.com/globby/-/globby-7.1.1.tgz"
+  integrity sha512-yANWAN2DUcBtuus5Cpd+SKROzXHs2iVXFZt/Ykrfz6SAXqacLX25NZpltE+39ceMexYF4TtEadjuSTw8+3wX4g==
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
+globby@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.npmmirror.com/globby/-/globby-9.2.0.tgz"
+  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
   dependencies:
     "@types/glob" "^7.1.1"
-    "array-union" "^1.0.2"
-    "dir-glob" "^2.2.2"
-    "fast-glob" "^2.2.6"
-    "glob" "^7.1.3"
-    "ignore" "^4.0.3"
-    "pify" "^4.0.1"
-    "slash" "^2.0.0"
+    array-union "^1.0.2"
+    dir-glob "^2.2.2"
+    fast-glob "^2.2.6"
+    glob "^7.1.3"
+    ignore "^4.0.3"
+    pify "^4.0.1"
+    slash "^2.0.0"
 
-"good-listener@^1.2.2":
-  "integrity" "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw=="
-  "resolved" "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz"
-  "version" "1.2.2"
+good-listener@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz"
+  integrity sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==
   dependencies:
-    "delegate" "^3.1.2"
+    delegate "^3.1.2"
 
-"gopd@^1.0.1":
-  "integrity" "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="
-  "resolved" "https://registry.npmmirror.com/gopd/-/gopd-1.0.1.tgz"
-  "version" "1.0.1"
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/gopd/-/gopd-1.0.1.tgz"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
   dependencies:
-    "get-intrinsic" "^1.1.3"
+    get-intrinsic "^1.1.3"
 
-"graceful-fs@^4.1.11", "graceful-fs@^4.1.15", "graceful-fs@^4.1.2", "graceful-fs@^4.1.6", "graceful-fs@^4.2.0":
-  "integrity" "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-  "resolved" "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz"
-  "version" "4.2.11"
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.11"
+  resolved "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
-"gzip-size@^5.0.0":
-  "integrity" "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA=="
-  "resolved" "https://registry.npmmirror.com/gzip-size/-/gzip-size-5.1.1.tgz"
-  "version" "5.1.1"
+gzip-size@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.npmmirror.com/gzip-size/-/gzip-size-5.1.1.tgz"
+  integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==
   dependencies:
-    "duplexer" "^0.1.1"
-    "pify" "^4.0.1"
+    duplexer "^0.1.1"
+    pify "^4.0.1"
 
-"hammerjs@^2.0.1":
-  "integrity" "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ=="
-  "resolved" "https://registry.npmmirror.com/hammerjs/-/hammerjs-2.0.8.tgz"
-  "version" "2.0.8"
+hammerjs@^2.0.1:
+  version "2.0.8"
+  resolved "https://registry.npmmirror.com/hammerjs/-/hammerjs-2.0.8.tgz"
+  integrity sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==
 
-"handle-thing@^2.0.0":
-  "integrity" "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
-  "resolved" "https://registry.npmmirror.com/handle-thing/-/handle-thing-2.0.1.tgz"
-  "version" "2.0.1"
+handle-thing@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/handle-thing/-/handle-thing-2.0.1.tgz"
+  integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-"har-schema@^2.0.0":
-  "integrity" "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="
-  "resolved" "https://registry.npmmirror.com/har-schema/-/har-schema-2.0.0.tgz"
-  "version" "2.0.0"
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/har-schema/-/har-schema-2.0.0.tgz"
+  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
 
-"har-validator@~5.1.3":
-  "integrity" "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="
-  "resolved" "https://registry.npmmirror.com/har-validator/-/har-validator-5.1.5.tgz"
-  "version" "5.1.5"
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.npmmirror.com/har-validator/-/har-validator-5.1.5.tgz"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
   dependencies:
-    "ajv" "^6.12.3"
-    "har-schema" "^2.0.0"
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
 
-"has-ansi@^2.0.0":
-  "integrity" "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg=="
-  "resolved" "https://registry.npmmirror.com/has-ansi/-/has-ansi-2.0.0.tgz"
-  "version" "2.0.0"
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/has-ansi/-/has-ansi-2.0.0.tgz"
+  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
   dependencies:
-    "ansi-regex" "^2.0.0"
+    ansi-regex "^2.0.0"
 
-"has-bigints@^1.0.1", "has-bigints@^1.0.2":
-  "integrity" "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
-  "resolved" "https://registry.npmmirror.com/has-bigints/-/has-bigints-1.0.2.tgz"
-  "version" "1.0.2"
+has-bigints@^1.0.1, has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/has-bigints/-/has-bigints-1.0.2.tgz"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
-"has-flag@^1.0.0":
-  "integrity" "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA=="
-  "resolved" "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz"
-  "version" "1.0.0"
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz"
+  integrity sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==
 
-"has-flag@^2.0.0":
-  "integrity" "sha512-P+1n3MnwjR/Epg9BBo1KT8qbye2g2Ou4sFumihwt6I4tsUX7jnLcX4BTOSKg/B1ZrIYMN9FcEnG4x5a7NB8Eng=="
-  "resolved" "https://registry.npmmirror.com/has-flag/-/has-flag-2.0.0.tgz"
-  "version" "2.0.0"
+has-flag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/has-flag/-/has-flag-2.0.0.tgz"
+  integrity sha512-P+1n3MnwjR/Epg9BBo1KT8qbye2g2Ou4sFumihwt6I4tsUX7jnLcX4BTOSKg/B1ZrIYMN9FcEnG4x5a7NB8Eng==
 
-"has-flag@^3.0.0":
-  "integrity" "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-  "resolved" "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz"
-  "version" "3.0.0"
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz"
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
-"has-flag@^4.0.0":
-  "integrity" "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-  "resolved" "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz"
-  "version" "4.0.0"
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-"has-property-descriptors@^1.0.0":
-  "integrity" "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg=="
-  "resolved" "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz"
-  "version" "1.0.1"
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
   dependencies:
-    "get-intrinsic" "^1.2.2"
+    get-intrinsic "^1.1.1"
 
-"has-proto@^1.0.1":
-  "integrity" "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
-  "resolved" "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz"
-  "version" "1.0.1"
+has-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz"
+  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
 
-"has-symbols@^1.0.1", "has-symbols@^1.0.2", "has-symbols@^1.0.3":
-  "integrity" "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-  "resolved" "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz"
-  "version" "1.0.3"
+has-symbols@^1.0.2, has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
-"has-tostringtag@^1.0.0":
-  "integrity" "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="
-  "resolved" "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz"
-  "version" "1.0.0"
+has-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
   dependencies:
-    "has-symbols" "^1.0.2"
+    has-symbols "^1.0.2"
 
-"has-value@^0.3.1":
-  "integrity" "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q=="
-  "resolved" "https://registry.npmmirror.com/has-value/-/has-value-0.3.1.tgz"
-  "version" "0.3.1"
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.npmmirror.com/has-value/-/has-value-0.3.1.tgz"
+  integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==
   dependencies:
-    "get-value" "^2.0.3"
-    "has-values" "^0.1.4"
-    "isobject" "^2.0.0"
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
 
-"has-value@^1.0.0":
-  "integrity" "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw=="
-  "resolved" "https://registry.npmmirror.com/has-value/-/has-value-1.0.0.tgz"
-  "version" "1.0.0"
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/has-value/-/has-value-1.0.0.tgz"
+  integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==
   dependencies:
-    "get-value" "^2.0.6"
-    "has-values" "^1.0.0"
-    "isobject" "^3.0.0"
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
 
-"has-values@^0.1.4":
-  "integrity" "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ=="
-  "resolved" "https://registry.npmmirror.com/has-values/-/has-values-0.1.4.tgz"
-  "version" "0.1.4"
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npmmirror.com/has-values/-/has-values-0.1.4.tgz"
+  integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==
 
-"has-values@^1.0.0":
-  "integrity" "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ=="
-  "resolved" "https://registry.npmmirror.com/has-values/-/has-values-1.0.0.tgz"
-  "version" "1.0.0"
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/has-values/-/has-values-1.0.0.tgz"
+  integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==
   dependencies:
-    "is-number" "^3.0.0"
-    "kind-of" "^4.0.0"
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
 
-"has@^1.0.0":
-  "integrity" "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ=="
-  "resolved" "https://registry.npmmirror.com/has/-/has-1.0.4.tgz"
-  "version" "1.0.4"
-
-"hash-base@^3.0.0":
-  "integrity" "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="
-  "resolved" "https://registry.npmmirror.com/hash-base/-/hash-base-3.1.0.tgz"
-  "version" "3.1.0"
+has@^1.0.0, has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/has/-/has-1.0.3.tgz"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
-    "inherits" "^2.0.4"
-    "readable-stream" "^3.6.0"
-    "safe-buffer" "^5.2.0"
+    function-bind "^1.1.1"
 
-"hash-sum@^1.0.2":
-  "integrity" "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA=="
-  "resolved" "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz"
-  "version" "1.0.2"
-
-"hash-sum@^2.0.0":
-  "integrity" "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="
-  "resolved" "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz"
-  "version" "2.0.0"
-
-"hash.js@^1.0.0", "hash.js@^1.0.3":
-  "integrity" "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="
-  "resolved" "https://registry.npmmirror.com/hash.js/-/hash.js-1.1.7.tgz"
-  "version" "1.1.7"
+hash-base@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/hash-base/-/hash-base-3.1.0.tgz"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
   dependencies:
-    "inherits" "^2.0.3"
-    "minimalistic-assert" "^1.0.1"
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
-"hasown@^2.0.0":
-  "integrity" "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA=="
-  "resolved" "https://registry.npmmirror.com/hasown/-/hasown-2.0.0.tgz"
-  "version" "2.0.0"
+hash-sum@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz"
+  integrity sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==
+
+hash-sum@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz"
+  integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.npmmirror.com/hash.js/-/hash.js-1.1.7.tgz"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
   dependencies:
-    "function-bind" "^1.1.2"
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
 
-"he@^1.1.1", "he@1.2.x":
-  "integrity" "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
-  "resolved" "https://registry.npmmirror.com/he/-/he-1.2.0.tgz"
-  "version" "1.2.0"
+he@^1.1.1, he@1.2.x:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/he/-/he-1.2.0.tgz"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-"hex-color-regex@^1.1.0":
-  "integrity" "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
-  "resolved" "https://registry.npmmirror.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz"
-  "version" "1.1.0"
+hex-color-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz"
+  integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-"highlight.js@^10.7.1":
-  "integrity" "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="
-  "resolved" "https://registry.npmmirror.com/highlight.js/-/highlight.js-10.7.3.tgz"
-  "version" "10.7.3"
+highlight.js@^10.7.1:
+  version "10.7.3"
+  resolved "https://registry.npmmirror.com/highlight.js/-/highlight.js-10.7.3.tgz"
+  integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
 
-"highlight.js@9.18.5":
-  "integrity" "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA=="
-  "resolved" "https://registry.npmmirror.com/highlight.js/-/highlight.js-9.18.5.tgz"
-  "version" "9.18.5"
+highlight.js@9.18.5:
+  version "9.18.5"
+  resolved "https://registry.npmmirror.com/highlight.js/-/highlight.js-9.18.5.tgz"
+  integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
 
-"hmac-drbg@^1.0.1":
-  "integrity" "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg=="
-  "resolved" "https://registry.npmmirror.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"
-  "version" "1.0.1"
+hmac-drbg@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"
+  integrity sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==
   dependencies:
-    "hash.js" "^1.0.3"
-    "minimalistic-assert" "^1.0.0"
-    "minimalistic-crypto-utils" "^1.0.1"
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
 
-"hoopy@^0.1.4":
-  "integrity" "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="
-  "resolved" "https://registry.npmmirror.com/hoopy/-/hoopy-0.1.4.tgz"
-  "version" "0.1.4"
+hoopy@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npmmirror.com/hoopy/-/hoopy-0.1.4.tgz"
+  integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==
 
-"hosted-git-info@^2.1.4":
-  "integrity" "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
-  "resolved" "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
-  "version" "2.8.9"
+hosted-git-info@^2.1.4:
+  version "2.8.9"
+  resolved "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
-"hpack.js@^2.1.6":
-  "integrity" "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ=="
-  "resolved" "https://registry.npmmirror.com/hpack.js/-/hpack.js-2.1.6.tgz"
-  "version" "2.1.6"
+hpack.js@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.npmmirror.com/hpack.js/-/hpack.js-2.1.6.tgz"
+  integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==
   dependencies:
-    "inherits" "^2.0.1"
-    "obuf" "^1.0.0"
-    "readable-stream" "^2.0.1"
-    "wbuf" "^1.1.0"
+    inherits "^2.0.1"
+    obuf "^1.0.0"
+    readable-stream "^2.0.1"
+    wbuf "^1.1.0"
 
-"hsl-regex@^1.0.0":
-  "integrity" "sha512-M5ezZw4LzXbBKMruP+BNANf0k+19hDQMgpzBIYnya//Al+fjNct9Wf3b1WedLqdEs2hKBvxq/jh+DsHJLj0F9A=="
-  "resolved" "https://registry.npmmirror.com/hsl-regex/-/hsl-regex-1.0.0.tgz"
-  "version" "1.0.0"
+hsl-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/hsl-regex/-/hsl-regex-1.0.0.tgz"
+  integrity sha512-M5ezZw4LzXbBKMruP+BNANf0k+19hDQMgpzBIYnya//Al+fjNct9Wf3b1WedLqdEs2hKBvxq/jh+DsHJLj0F9A==
 
-"hsla-regex@^1.0.0":
-  "integrity" "sha512-7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA=="
-  "resolved" "https://registry.npmmirror.com/hsla-regex/-/hsla-regex-1.0.0.tgz"
-  "version" "1.0.0"
+hsla-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/hsla-regex/-/hsla-regex-1.0.0.tgz"
+  integrity sha512-7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA==
 
-"htm@^3.1.1":
-  "integrity" "sha512-983Vyg8NwUE7JkZ6NmOqpCZ+sh1bKv2iYTlUkzlWmA5JD2acKoxd4KVxbMmxX/85mtfdnDmTFoNKcg5DGAvxNQ=="
-  "resolved" "https://registry.npmmirror.com/htm/-/htm-3.1.1.tgz"
-  "version" "3.1.1"
+htm@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.npmmirror.com/htm/-/htm-3.1.1.tgz"
+  integrity sha512-983Vyg8NwUE7JkZ6NmOqpCZ+sh1bKv2iYTlUkzlWmA5JD2acKoxd4KVxbMmxX/85mtfdnDmTFoNKcg5DGAvxNQ==
 
-"html-entities@^1.3.1":
-  "integrity" "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="
-  "resolved" "https://registry.npmmirror.com/html-entities/-/html-entities-1.4.0.tgz"
-  "version" "1.4.0"
+html-entities@^1.3.1:
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/html-entities/-/html-entities-1.4.0.tgz"
+  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
 
-"html-minifier@^3.2.3":
-  "integrity" "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA=="
-  "resolved" "https://registry.npmmirror.com/html-minifier/-/html-minifier-3.5.21.tgz"
-  "version" "3.5.21"
+html-minifier@^3.2.3:
+  version "3.5.21"
+  resolved "https://registry.npmmirror.com/html-minifier/-/html-minifier-3.5.21.tgz"
+  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
   dependencies:
-    "camel-case" "3.0.x"
-    "clean-css" "4.2.x"
-    "commander" "2.17.x"
-    "he" "1.2.x"
-    "param-case" "2.1.x"
-    "relateurl" "0.2.x"
-    "uglify-js" "3.4.x"
+    camel-case "3.0.x"
+    clean-css "4.2.x"
+    commander "2.17.x"
+    he "1.2.x"
+    param-case "2.1.x"
+    relateurl "0.2.x"
+    uglify-js "3.4.x"
 
-"html-tags@^2.0.0":
-  "integrity" "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g=="
-  "resolved" "https://registry.npmmirror.com/html-tags/-/html-tags-2.0.0.tgz"
-  "version" "2.0.0"
+html-tags@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/html-tags/-/html-tags-2.0.0.tgz"
+  integrity sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==
 
-"html-tags@^3.3.1":
-  "integrity" "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ=="
-  "resolved" "https://registry.npmmirror.com/html-tags/-/html-tags-3.3.1.tgz"
-  "version" "3.3.1"
+html-tags@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.npmmirror.com/html-tags/-/html-tags-3.3.1.tgz"
+  integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
 
-"html-webpack-plugin@^3.0.0 || ^4.0.0", "html-webpack-plugin@^3.2.0", "html-webpack-plugin@>=2.26.0":
-  "integrity" "sha512-Br4ifmjQojUP4EmHnRBoUIYcZ9J7M4bTMcm7u6xoIAIuq2Nte4TzXX0533owvkQKQD1WeMTTTyD4Ni4QKxS0Bg=="
-  "resolved" "https://registry.npmmirror.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz"
-  "version" "3.2.0"
+"html-webpack-plugin@^3.0.0 || ^4.0.0", html-webpack-plugin@^3.2.0, html-webpack-plugin@>=2.26.0:
+  version "3.2.0"
+  resolved "https://registry.npmmirror.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz"
+  integrity sha512-Br4ifmjQojUP4EmHnRBoUIYcZ9J7M4bTMcm7u6xoIAIuq2Nte4TzXX0533owvkQKQD1WeMTTTyD4Ni4QKxS0Bg==
   dependencies:
-    "html-minifier" "^3.2.3"
-    "loader-utils" "^0.2.16"
-    "lodash" "^4.17.3"
-    "pretty-error" "^2.0.2"
-    "tapable" "^1.0.0"
-    "toposort" "^1.0.0"
-    "util.promisify" "1.0.0"
+    html-minifier "^3.2.3"
+    loader-utils "^0.2.16"
+    lodash "^4.17.3"
+    pretty-error "^2.0.2"
+    tapable "^1.0.0"
+    toposort "^1.0.0"
+    util.promisify "1.0.0"
 
-"html2canvas@^1.0.0-rc.5", "html2canvas@^1.4.1":
-  "integrity" "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA=="
-  "resolved" "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz"
-  "version" "1.4.1"
+html2canvas@^1.0.0-rc.5, html2canvas@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz"
+  integrity sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==
   dependencies:
-    "css-line-break" "^2.1.0"
-    "text-segmentation" "^1.0.3"
+    css-line-break "^2.1.0"
+    text-segmentation "^1.0.3"
 
-"htmlparser2@^3.8.3":
-  "integrity" "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="
-  "resolved" "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-3.10.1.tgz"
-  "version" "3.10.1"
+htmlparser2@^3.8.3:
+  version "3.10.1"
+  resolved "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-3.10.1.tgz"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
   dependencies:
-    "domelementtype" "^1.3.1"
-    "domhandler" "^2.3.0"
-    "domutils" "^1.5.1"
-    "entities" "^1.1.1"
-    "inherits" "^2.0.1"
-    "readable-stream" "^3.1.1"
+    domelementtype "^1.3.1"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^3.1.1"
 
-"htmlparser2@^6.1.0":
-  "integrity" "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="
-  "resolved" "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-6.1.0.tgz"
-  "version" "6.1.0"
+htmlparser2@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-6.1.0.tgz"
+  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
   dependencies:
-    "domelementtype" "^2.0.1"
-    "domhandler" "^4.0.0"
-    "domutils" "^2.5.2"
-    "entities" "^2.0.0"
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    domutils "^2.5.2"
+    entities "^2.0.0"
 
-"http-deceiver@^1.2.7":
-  "integrity" "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
-  "resolved" "https://registry.npmmirror.com/http-deceiver/-/http-deceiver-1.2.7.tgz"
-  "version" "1.2.7"
+http-deceiver@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.npmmirror.com/http-deceiver/-/http-deceiver-1.2.7.tgz"
+  integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==
 
-"http-errors@~1.6.2":
-  "integrity" "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A=="
-  "resolved" "https://registry.npmmirror.com/http-errors/-/http-errors-1.6.3.tgz"
-  "version" "1.6.3"
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.npmmirror.com/http-errors/-/http-errors-1.6.3.tgz"
+  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
   dependencies:
-    "depd" "~1.1.2"
-    "inherits" "2.0.3"
-    "setprototypeof" "1.1.0"
-    "statuses" ">= 1.4.0 < 2"
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
 
-"http-errors@2.0.0":
-  "integrity" "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="
-  "resolved" "https://registry.npmmirror.com/http-errors/-/http-errors-2.0.0.tgz"
-  "version" "2.0.0"
+http-errors@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/http-errors/-/http-errors-2.0.0.tgz"
+  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
   dependencies:
-    "depd" "2.0.0"
-    "inherits" "2.0.4"
-    "setprototypeof" "1.2.0"
-    "statuses" "2.0.1"
-    "toidentifier" "1.0.1"
+    depd "2.0.0"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses "2.0.1"
+    toidentifier "1.0.1"
 
-"http-parser-js@>=0.5.1":
-  "integrity" "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
-  "resolved" "https://registry.npmmirror.com/http-parser-js/-/http-parser-js-0.5.8.tgz"
-  "version" "0.5.8"
+http-parser-js@>=0.5.1:
+  version "0.5.8"
+  resolved "https://registry.npmmirror.com/http-parser-js/-/http-parser-js-0.5.8.tgz"
+  integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
 
-"http-proxy-middleware@^1.0.0":
-  "integrity" "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg=="
-  "resolved" "https://registry.npmmirror.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"
-  "version" "1.3.1"
+http-proxy-middleware@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"
+  integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==
   dependencies:
     "@types/http-proxy" "^1.17.5"
-    "http-proxy" "^1.18.1"
-    "is-glob" "^4.0.1"
-    "is-plain-obj" "^3.0.0"
-    "micromatch" "^4.0.2"
+    http-proxy "^1.18.1"
+    is-glob "^4.0.1"
+    is-plain-obj "^3.0.0"
+    micromatch "^4.0.2"
 
-"http-proxy-middleware@0.19.1":
-  "integrity" "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="
-  "resolved" "https://registry.npmmirror.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"
-  "version" "0.19.1"
+http-proxy-middleware@0.19.1:
+  version "0.19.1"
+  resolved "https://registry.npmmirror.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"
+  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
   dependencies:
-    "http-proxy" "^1.17.0"
-    "is-glob" "^4.0.0"
-    "lodash" "^4.17.11"
-    "micromatch" "^3.1.10"
+    http-proxy "^1.17.0"
+    is-glob "^4.0.0"
+    lodash "^4.17.11"
+    micromatch "^3.1.10"
 
-"http-proxy@^1.17.0", "http-proxy@^1.18.1":
-  "integrity" "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="
-  "resolved" "https://registry.npmmirror.com/http-proxy/-/http-proxy-1.18.1.tgz"
-  "version" "1.18.1"
+http-proxy@^1.17.0, http-proxy@^1.18.1:
+  version "1.18.1"
+  resolved "https://registry.npmmirror.com/http-proxy/-/http-proxy-1.18.1.tgz"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
   dependencies:
-    "eventemitter3" "^4.0.0"
-    "follow-redirects" "^1.0.0"
-    "requires-port" "^1.0.0"
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
 
-"http-signature@~1.2.0":
-  "integrity" "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="
-  "resolved" "https://registry.npmmirror.com/http-signature/-/http-signature-1.2.0.tgz"
-  "version" "1.2.0"
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/http-signature/-/http-signature-1.2.0.tgz"
+  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
   dependencies:
-    "assert-plus" "^1.0.0"
-    "jsprim" "^1.2.2"
-    "sshpk" "^1.7.0"
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
 
-"https-browserify@^1.0.0":
-  "integrity" "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="
-  "resolved" "https://registry.npmmirror.com/https-browserify/-/https-browserify-1.0.0.tgz"
-  "version" "1.0.0"
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/https-browserify/-/https-browserify-1.0.0.tgz"
+  integrity sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==
 
-"human-signals@^1.1.1":
-  "integrity" "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="
-  "resolved" "https://registry.npmmirror.com/human-signals/-/human-signals-1.1.1.tgz"
-  "version" "1.1.1"
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/human-signals/-/human-signals-1.1.1.tgz"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-"human-signals@^2.1.0":
-  "integrity" "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
-  "resolved" "https://registry.npmmirror.com/human-signals/-/human-signals-2.1.0.tgz"
-  "version" "2.1.0"
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/human-signals/-/human-signals-2.1.0.tgz"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-"iconv-lite@^0.4.24", "iconv-lite@0.4.24":
-  "integrity" "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="
-  "resolved" "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz"
-  "version" "0.4.24"
+iconv-lite@^0.4.24, iconv-lite@0.4.24:
+  version "0.4.24"
+  resolved "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
-    "safer-buffer" ">= 2.1.2 < 3"
+    safer-buffer ">= 2.1.2 < 3"
 
-"icss-utils@^4.0.0", "icss-utils@^4.1.1":
-  "integrity" "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="
-  "resolved" "https://registry.npmmirror.com/icss-utils/-/icss-utils-4.1.1.tgz"
-  "version" "4.1.1"
+icss-utils@^4.0.0, icss-utils@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmmirror.com/icss-utils/-/icss-utils-4.1.1.tgz"
+  integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==
   dependencies:
-    "postcss" "^7.0.14"
+    postcss "^7.0.14"
 
-"ids@^1.0.0":
-  "integrity" "sha512-XQ0yom/4KWTL29sLG+tyuycy7UmeaM/79GRtSJq6IG9cJGIPeBz5kwDCguie3TwxaMNIc3WtPi0cTa1XYHicpw=="
-  "resolved" "https://registry.npmmirror.com/ids/-/ids-1.0.5.tgz"
-  "version" "1.0.5"
+ids@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/ids/-/ids-1.0.5.tgz"
+  integrity sha512-XQ0yom/4KWTL29sLG+tyuycy7UmeaM/79GRtSJq6IG9cJGIPeBz5kwDCguie3TwxaMNIc3WtPi0cTa1XYHicpw==
 
-"ieee754@^1.1.4":
-  "integrity" "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-  "resolved" "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz"
-  "version" "1.2.1"
+ieee754@^1.1.4:
+  version "1.2.1"
+  resolved "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-"iferr@^0.1.5":
-  "integrity" "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA=="
-  "resolved" "https://registry.npmmirror.com/iferr/-/iferr-0.1.5.tgz"
-  "version" "0.1.5"
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.npmmirror.com/iferr/-/iferr-0.1.5.tgz"
+  integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==
 
-"ignore@^3.3.5":
-  "integrity" "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
-  "resolved" "https://registry.npmmirror.com/ignore/-/ignore-3.3.10.tgz"
-  "version" "3.3.10"
+ignore@^3.3.5:
+  version "3.3.10"
+  resolved "https://registry.npmmirror.com/ignore/-/ignore-3.3.10.tgz"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
-"ignore@^4.0.3", "ignore@^4.0.6":
-  "integrity" "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
-  "resolved" "https://registry.npmmirror.com/ignore/-/ignore-4.0.6.tgz"
-  "version" "4.0.6"
+ignore@^4.0.3, ignore@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.npmmirror.com/ignore/-/ignore-4.0.6.tgz"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-"image-size@^0.5.1":
-  "integrity" "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ=="
-  "resolved" "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz"
-  "version" "0.5.5"
+image-size@^0.5.1:
+  version "0.5.5"
+  resolved "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz"
+  integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==
 
-"import-cwd@^2.0.0":
-  "integrity" "sha512-Ew5AZzJQFqrOV5BTW3EIoHAnoie1LojZLXKcCQ/yTRyVZosBhK1x1ViYjHGf5pAFOq8ZyChZp6m/fSN7pJyZtg=="
-  "resolved" "https://registry.npmmirror.com/import-cwd/-/import-cwd-2.1.0.tgz"
-  "version" "2.1.0"
+import-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/import-cwd/-/import-cwd-2.1.0.tgz"
+  integrity sha512-Ew5AZzJQFqrOV5BTW3EIoHAnoie1LojZLXKcCQ/yTRyVZosBhK1x1ViYjHGf5pAFOq8ZyChZp6m/fSN7pJyZtg==
   dependencies:
-    "import-from" "^2.1.0"
+    import-from "^2.1.0"
 
-"import-fresh@^2.0.0":
-  "integrity" "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg=="
-  "resolved" "https://registry.npmmirror.com/import-fresh/-/import-fresh-2.0.0.tgz"
-  "version" "2.0.0"
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/import-fresh/-/import-fresh-2.0.0.tgz"
+  integrity sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==
   dependencies:
-    "caller-path" "^2.0.0"
-    "resolve-from" "^3.0.0"
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
 
-"import-fresh@^3.0.0":
-  "integrity" "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="
-  "resolved" "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz"
-  "version" "3.3.0"
+import-fresh@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
-    "parent-module" "^1.0.0"
-    "resolve-from" "^4.0.0"
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
 
-"import-from@^2.1.0":
-  "integrity" "sha512-0vdnLL2wSGnhlRmzHJAg5JHjt1l2vYhzJ7tNLGbeVg0fse56tpGaH0uzH+r9Slej+BSXXEHvBKDEnVSLLE9/+w=="
-  "resolved" "https://registry.npmmirror.com/import-from/-/import-from-2.1.0.tgz"
-  "version" "2.1.0"
+import-from@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/import-from/-/import-from-2.1.0.tgz"
+  integrity sha512-0vdnLL2wSGnhlRmzHJAg5JHjt1l2vYhzJ7tNLGbeVg0fse56tpGaH0uzH+r9Slej+BSXXEHvBKDEnVSLLE9/+w==
   dependencies:
-    "resolve-from" "^3.0.0"
+    resolve-from "^3.0.0"
 
-"import-local@^2.0.0":
-  "integrity" "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="
-  "resolved" "https://registry.npmmirror.com/import-local/-/import-local-2.0.0.tgz"
-  "version" "2.0.0"
+import-local@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/import-local/-/import-local-2.0.0.tgz"
+  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
   dependencies:
-    "pkg-dir" "^3.0.0"
-    "resolve-cwd" "^2.0.0"
+    pkg-dir "^3.0.0"
+    resolve-cwd "^2.0.0"
 
-"imurmurhash@^0.1.4":
-  "integrity" "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
-  "resolved" "https://registry.npmmirror.com/imurmurhash/-/imurmurhash-0.1.4.tgz"
-  "version" "0.1.4"
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npmmirror.com/imurmurhash/-/imurmurhash-0.1.4.tgz"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
-"indent-string@^4.0.0":
-  "integrity" "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
-  "resolved" "https://registry.npmmirror.com/indent-string/-/indent-string-4.0.0.tgz"
-  "version" "4.0.0"
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/indent-string/-/indent-string-4.0.0.tgz"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-"indexes-of@^1.0.1":
-  "integrity" "sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA=="
-  "resolved" "https://registry.npmmirror.com/indexes-of/-/indexes-of-1.0.1.tgz"
-  "version" "1.0.1"
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/indexes-of/-/indexes-of-1.0.1.tgz"
+  integrity sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==
 
-"indexof@0.0.1":
-  "integrity" "sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg=="
-  "resolved" "https://registry.npmmirror.com/indexof/-/indexof-0.0.1.tgz"
-  "version" "0.0.1"
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npmmirror.com/indexof/-/indexof-0.0.1.tgz"
+  integrity sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==
 
-"individual@^2.0.0":
-  "integrity" "sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g=="
-  "resolved" "https://registry.npmmirror.com/individual/-/individual-2.0.0.tgz"
-  "version" "2.0.0"
+individual@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/individual/-/individual-2.0.0.tgz"
+  integrity sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==
 
-"infer-owner@^1.0.3", "infer-owner@^1.0.4":
-  "integrity" "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
-  "resolved" "https://registry.npmmirror.com/infer-owner/-/infer-owner-1.0.4.tgz"
-  "version" "1.0.4"
+infer-owner@^1.0.3, infer-owner@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/infer-owner/-/infer-owner-1.0.4.tgz"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
 
-"inflight@^1.0.4":
-  "integrity" "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="
-  "resolved" "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz"
-  "version" "1.0.6"
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz"
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
-    "once" "^1.3.0"
-    "wrappy" "1"
+    once "^1.3.0"
+    wrappy "1"
 
-"inherits-browser@^0.1.0":
-  "integrity" "sha512-CJHHvW3jQ6q7lzsXPpapLdMx5hDpSF3FSh45pwsj6bKxJJ8Nl8v43i5yXnr3BdfOimGHKyniewQtnAIp3vyJJw=="
-  "resolved" "https://registry.npmmirror.com/inherits-browser/-/inherits-browser-0.1.0.tgz"
-  "version" "0.1.0"
+inherits-browser@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.npmmirror.com/inherits-browser/-/inherits-browser-0.1.0.tgz"
+  integrity sha512-CJHHvW3jQ6q7lzsXPpapLdMx5hDpSF3FSh45pwsj6bKxJJ8Nl8v43i5yXnr3BdfOimGHKyniewQtnAIp3vyJJw==
 
-"inherits@^2.0.1", "inherits@^2.0.3", "inherits@^2.0.4", "inherits@~2.0.1", "inherits@~2.0.3", "inherits@2", "inherits@2.0.4":
-  "integrity" "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-  "resolved" "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz"
-  "version" "2.0.4"
+inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@2, inherits@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-"inherits@2.0.3":
-  "integrity" "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-  "resolved" "https://registry.npmmirror.com/inherits/-/inherits-2.0.3.tgz"
-  "version" "2.0.3"
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/inherits/-/inherits-2.0.1.tgz"
+  integrity sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==
 
-"ini@^1.3.4":
-  "integrity" "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-  "resolved" "https://registry.npmmirror.com/ini/-/ini-1.3.8.tgz"
-  "version" "1.3.8"
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npmmirror.com/inherits/-/inherits-2.0.3.tgz"
+  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
-"inquirer@^7.0.0", "inquirer@^7.1.0":
-  "integrity" "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="
-  "resolved" "https://registry.npmmirror.com/inquirer/-/inquirer-7.3.3.tgz"
-  "version" "7.3.3"
+ini@^1.3.4:
+  version "1.3.8"
+  resolved "https://registry.npmmirror.com/ini/-/ini-1.3.8.tgz"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
+inquirer@^7.0.0, inquirer@^7.1.0:
+  version "7.3.3"
+  resolved "https://registry.npmmirror.com/inquirer/-/inquirer-7.3.3.tgz"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
   dependencies:
-    "ansi-escapes" "^4.2.1"
-    "chalk" "^4.1.0"
-    "cli-cursor" "^3.1.0"
-    "cli-width" "^3.0.0"
-    "external-editor" "^3.0.3"
-    "figures" "^3.0.0"
-    "lodash" "^4.17.19"
-    "mute-stream" "0.0.8"
-    "run-async" "^2.4.0"
-    "rxjs" "^6.6.0"
-    "string-width" "^4.1.0"
-    "strip-ansi" "^6.0.0"
-    "through" "^2.3.6"
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.19"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.6.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
 
-"internal-ip@^4.3.0":
-  "integrity" "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="
-  "resolved" "https://registry.npmmirror.com/internal-ip/-/internal-ip-4.3.0.tgz"
-  "version" "4.3.0"
+internal-ip@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.npmmirror.com/internal-ip/-/internal-ip-4.3.0.tgz"
+  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
   dependencies:
-    "default-gateway" "^4.2.0"
-    "ipaddr.js" "^1.9.0"
+    default-gateway "^4.2.0"
+    ipaddr.js "^1.9.0"
 
-"internal-slot@^1.0.5":
-  "integrity" "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg=="
-  "resolved" "https://registry.npmmirror.com/internal-slot/-/internal-slot-1.0.6.tgz"
-  "version" "1.0.6"
+internal-slot@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/internal-slot/-/internal-slot-1.0.5.tgz"
+  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
   dependencies:
-    "get-intrinsic" "^1.2.2"
-    "hasown" "^2.0.0"
-    "side-channel" "^1.0.4"
+    get-intrinsic "^1.2.0"
+    has "^1.0.3"
+    side-channel "^1.0.4"
 
-"ip-regex@^2.1.0":
-  "integrity" "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw=="
-  "resolved" "https://registry.npmmirror.com/ip-regex/-/ip-regex-2.1.0.tgz"
-  "version" "2.1.0"
+ip-regex@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/ip-regex/-/ip-regex-2.1.0.tgz"
+  integrity sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==
 
-"ip@^1.1.0", "ip@^1.1.5":
-  "integrity" "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
-  "resolved" "https://registry.npmmirror.com/ip/-/ip-1.1.8.tgz"
-  "version" "1.1.8"
+ip@^1.1.0, ip@^1.1.5:
+  version "1.1.8"
+  resolved "https://registry.npmmirror.com/ip/-/ip-1.1.8.tgz"
+  integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
 
-"ipaddr.js@^1.9.0", "ipaddr.js@1.9.1":
-  "integrity" "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
-  "resolved" "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
-  "version" "1.9.1"
+ipaddr.js@^1.9.0, ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
-"is-absolute-url@^2.0.0":
-  "integrity" "sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg=="
-  "resolved" "https://registry.npmmirror.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz"
-  "version" "2.1.0"
+is-absolute-url@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz"
+  integrity sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==
 
-"is-absolute-url@^3.0.3":
-  "integrity" "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="
-  "resolved" "https://registry.npmmirror.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz"
-  "version" "3.0.3"
+is-absolute-url@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.npmmirror.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz"
+  integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
 
-"is-accessor-descriptor@^1.0.1":
-  "integrity" "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA=="
-  "resolved" "https://registry.npmmirror.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz"
-  "version" "1.0.1"
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.npmmirror.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"
+  integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==
   dependencies:
-    "hasown" "^2.0.0"
+    kind-of "^3.0.2"
 
-"is-arguments@^1.0.4":
-  "integrity" "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="
-  "resolved" "https://registry.npmmirror.com/is-arguments/-/is-arguments-1.1.1.tgz"
-  "version" "1.1.1"
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
-    "call-bind" "^1.0.2"
-    "has-tostringtag" "^1.0.0"
+    kind-of "^6.0.0"
 
-"is-array-buffer@^3.0.1", "is-array-buffer@^3.0.2":
-  "integrity" "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="
-  "resolved" "https://registry.npmmirror.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz"
-  "version" "3.0.2"
+is-arguments@^1.0.4:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/is-arguments/-/is-arguments-1.1.1.tgz"
+  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
   dependencies:
-    "call-bind" "^1.0.2"
-    "get-intrinsic" "^1.2.0"
-    "is-typed-array" "^1.1.10"
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
 
-"is-arrayish@^0.2.1":
-  "integrity" "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-  "resolved" "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz"
-  "version" "0.2.1"
-
-"is-arrayish@^0.3.1":
-  "integrity" "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-  "resolved" "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.3.2.tgz"
-  "version" "0.3.2"
-
-"is-bigint@^1.0.1":
-  "integrity" "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="
-  "resolved" "https://registry.npmmirror.com/is-bigint/-/is-bigint-1.0.4.tgz"
-  "version" "1.0.4"
+is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmmirror.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz"
+  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
   dependencies:
-    "has-bigints" "^1.0.1"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    is-typed-array "^1.1.10"
 
-"is-binary-path@^1.0.0":
-  "integrity" "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q=="
-  "resolved" "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-1.0.1.tgz"
-  "version" "1.0.1"
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz"
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
+
+is-arrayish@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.3.2.tgz"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
+
+is-bigint@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/is-bigint/-/is-bigint-1.0.4.tgz"
+  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
   dependencies:
-    "binary-extensions" "^1.0.0"
+    has-bigints "^1.0.1"
 
-"is-binary-path@~2.1.0":
-  "integrity" "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="
-  "resolved" "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz"
-  "version" "2.1.0"
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-1.0.1.tgz"
+  integrity sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==
   dependencies:
-    "binary-extensions" "^2.0.0"
+    binary-extensions "^1.0.0"
 
-"is-boolean-object@^1.1.0":
-  "integrity" "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="
-  "resolved" "https://registry.npmmirror.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz"
-  "version" "1.1.2"
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
   dependencies:
-    "call-bind" "^1.0.2"
-    "has-tostringtag" "^1.0.0"
+    binary-extensions "^2.0.0"
 
-"is-buffer@^1.1.5":
-  "integrity" "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-  "resolved" "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz"
-  "version" "1.1.6"
-
-"is-callable@^1.1.3", "is-callable@^1.1.4", "is-callable@^1.2.7":
-  "integrity" "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
-  "resolved" "https://registry.npmmirror.com/is-callable/-/is-callable-1.2.7.tgz"
-  "version" "1.2.7"
-
-"is-ci@^1.0.10":
-  "integrity" "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg=="
-  "resolved" "https://registry.npmmirror.com/is-ci/-/is-ci-1.2.1.tgz"
-  "version" "1.2.1"
+is-boolean-object@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz"
+  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
   dependencies:
-    "ci-info" "^1.5.0"
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
 
-"is-color-stop@^1.0.0":
-  "integrity" "sha512-H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA=="
-  "resolved" "https://registry.npmmirror.com/is-color-stop/-/is-color-stop-1.1.0.tgz"
-  "version" "1.1.0"
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.npmmirror.com/is-callable/-/is-callable-1.2.7.tgz"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
+
+is-ci@^1.0.10:
+  version "1.2.1"
+  resolved "https://registry.npmmirror.com/is-ci/-/is-ci-1.2.1.tgz"
+  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
   dependencies:
-    "css-color-names" "^0.0.4"
-    "hex-color-regex" "^1.1.0"
-    "hsl-regex" "^1.0.0"
-    "hsla-regex" "^1.0.0"
-    "rgb-regex" "^1.0.1"
-    "rgba-regex" "^1.0.0"
+    ci-info "^1.5.0"
 
-"is-core-module@^2.13.0", "is-core-module@^2.13.1":
-  "integrity" "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw=="
-  "resolved" "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.13.1.tgz"
-  "version" "2.13.1"
+is-color-stop@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/is-color-stop/-/is-color-stop-1.1.0.tgz"
+  integrity sha512-H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA==
   dependencies:
-    "hasown" "^2.0.0"
+    css-color-names "^0.0.4"
+    hex-color-regex "^1.1.0"
+    hsl-regex "^1.0.0"
+    hsla-regex "^1.0.0"
+    rgb-regex "^1.0.1"
+    rgba-regex "^1.0.0"
 
-"is-data-descriptor@^1.0.1":
-  "integrity" "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw=="
-  "resolved" "https://registry.npmmirror.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz"
-  "version" "1.0.1"
+is-core-module@^2.11.0:
+  version "2.12.1"
+  resolved "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.12.1.tgz"
+  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
   dependencies:
-    "hasown" "^2.0.0"
+    has "^1.0.3"
 
-"is-date-object@^1.0.1":
-  "integrity" "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="
-  "resolved" "https://registry.npmmirror.com/is-date-object/-/is-date-object-1.0.5.tgz"
-  "version" "1.0.5"
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npmmirror.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"
+  integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==
   dependencies:
-    "has-tostringtag" "^1.0.0"
+    kind-of "^3.0.2"
 
-"is-descriptor@^0.1.0":
-  "integrity" "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg=="
-  "resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz"
-  "version" "0.1.7"
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
-    "is-accessor-descriptor" "^1.0.1"
-    "is-data-descriptor" "^1.0.1"
+    kind-of "^6.0.0"
 
-"is-descriptor@^1.0.0":
-  "integrity" "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw=="
-  "resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.3.tgz"
-  "version" "1.0.3"
+is-date-object@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/is-date-object/-/is-date-object-1.0.5.tgz"
+  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
   dependencies:
-    "is-accessor-descriptor" "^1.0.1"
-    "is-data-descriptor" "^1.0.1"
+    has-tostringtag "^1.0.0"
 
-"is-descriptor@^1.0.2":
-  "integrity" "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw=="
-  "resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.3.tgz"
-  "version" "1.0.3"
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.6.tgz"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
-    "is-accessor-descriptor" "^1.0.1"
-    "is-data-descriptor" "^1.0.1"
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
 
-"is-directory@^0.3.1":
-  "integrity" "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw=="
-  "resolved" "https://registry.npmmirror.com/is-directory/-/is-directory-0.3.1.tgz"
-  "version" "0.3.1"
-
-"is-docker@^2.0.0":
-  "integrity" "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
-  "resolved" "https://registry.npmmirror.com/is-docker/-/is-docker-2.2.1.tgz"
-  "version" "2.2.1"
-
-"is-extendable@^0.1.0", "is-extendable@^0.1.1":
-  "integrity" "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="
-  "resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
-  "version" "0.1.1"
-
-"is-extendable@^1.0.1":
-  "integrity" "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="
-  "resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz"
-  "version" "1.0.1"
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
-    "is-plain-object" "^2.0.4"
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
 
-"is-extglob@^2.1.0", "is-extglob@^2.1.1":
-  "integrity" "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
-  "resolved" "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz"
-  "version" "2.1.1"
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.npmmirror.com/is-directory/-/is-directory-0.3.1.tgz"
+  integrity sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==
 
-"is-fullwidth-code-point@^2.0.0":
-  "integrity" "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
-  "resolved" "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"
-  "version" "2.0.0"
+is-docker@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.npmmirror.com/is-docker/-/is-docker-2.2.1.tgz"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
-"is-fullwidth-code-point@^3.0.0":
-  "integrity" "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-  "resolved" "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
-  "version" "3.0.0"
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
+  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
 
-"is-fullwidth-code-point@^4.0.0":
-  "integrity" "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ=="
-  "resolved" "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz"
-  "version" "4.0.0"
+is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
+  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
 
-"is-function@^1.0.1":
-  "integrity" "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="
-  "resolved" "https://registry.npmmirror.com/is-function/-/is-function-1.0.2.tgz"
-  "version" "1.0.2"
-
-"is-glob@^3.1.0":
-  "integrity" "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw=="
-  "resolved" "https://registry.npmmirror.com/is-glob/-/is-glob-3.1.0.tgz"
-  "version" "3.1.0"
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
-    "is-extglob" "^2.1.0"
+    is-plain-object "^2.0.4"
 
-"is-glob@^4.0.0", "is-glob@^4.0.1", "is-glob@^4.0.3", "is-glob@~4.0.1":
-  "integrity" "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="
-  "resolved" "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz"
-  "version" "4.0.3"
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz"
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-fullwidth-code-point@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz"
+  integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==
+
+is-function@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/is-function/-/is-function-1.0.2.tgz"
+  integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/is-glob/-/is-glob-3.1.0.tgz"
+  integrity sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==
   dependencies:
-    "is-extglob" "^2.1.1"
+    is-extglob "^2.1.0"
 
-"is-negative-zero@^2.0.2":
-  "integrity" "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
-  "resolved" "https://registry.npmmirror.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz"
-  "version" "2.0.2"
-
-"is-number-object@^1.0.4":
-  "integrity" "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="
-  "resolved" "https://registry.npmmirror.com/is-number-object/-/is-number-object-1.0.7.tgz"
-  "version" "1.0.7"
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
-    "has-tostringtag" "^1.0.0"
+    is-extglob "^2.1.1"
 
-"is-number@^3.0.0":
-  "integrity" "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg=="
-  "resolved" "https://registry.npmmirror.com/is-number/-/is-number-3.0.0.tgz"
-  "version" "3.0.0"
+is-negative-zero@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz"
+  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+
+is-number-object@^1.0.4:
+  version "1.0.7"
+  resolved "https://registry.npmmirror.com/is-number-object/-/is-number-object-1.0.7.tgz"
+  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
   dependencies:
-    "kind-of" "^3.0.2"
+    has-tostringtag "^1.0.0"
 
-"is-number@^7.0.0":
-  "integrity" "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-  "resolved" "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz"
-  "version" "7.0.0"
-
-"is-obj@^2.0.0":
-  "integrity" "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
-  "resolved" "https://registry.npmmirror.com/is-obj/-/is-obj-2.0.0.tgz"
-  "version" "2.0.0"
-
-"is-path-cwd@^2.0.0":
-  "integrity" "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="
-  "resolved" "https://registry.npmmirror.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"
-  "version" "2.2.0"
-
-"is-path-in-cwd@^2.0.0":
-  "integrity" "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="
-  "resolved" "https://registry.npmmirror.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"
-  "version" "2.1.0"
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/is-number/-/is-number-3.0.0.tgz"
+  integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==
   dependencies:
-    "is-path-inside" "^2.1.0"
+    kind-of "^3.0.2"
 
-"is-path-inside@^2.1.0":
-  "integrity" "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="
-  "resolved" "https://registry.npmmirror.com/is-path-inside/-/is-path-inside-2.1.0.tgz"
-  "version" "2.1.0"
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/is-obj/-/is-obj-2.0.0.tgz"
+  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
+
+is-path-cwd@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.npmmirror.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"
+  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
+
+is-path-in-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"
+  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
   dependencies:
-    "path-is-inside" "^1.0.2"
+    is-path-inside "^2.1.0"
 
-"is-plain-obj@^1.0.0":
-  "integrity" "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="
-  "resolved" "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"
-  "version" "1.1.0"
-
-"is-plain-obj@^1.1":
-  "integrity" "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="
-  "resolved" "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"
-  "version" "1.1.0"
-
-"is-plain-obj@^3.0.0":
-  "integrity" "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="
-  "resolved" "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz"
-  "version" "3.0.0"
-
-"is-plain-object@^2.0.3", "is-plain-object@^2.0.4":
-  "integrity" "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="
-  "resolved" "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-2.0.4.tgz"
-  "version" "2.0.4"
+is-path-inside@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/is-path-inside/-/is-path-inside-2.1.0.tgz"
+  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
   dependencies:
-    "isobject" "^3.0.1"
+    path-is-inside "^1.0.2"
 
-"is-promise@^2.1.0":
-  "integrity" "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
-  "resolved" "https://registry.npmmirror.com/is-promise/-/is-promise-2.2.2.tgz"
-  "version" "2.2.2"
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"
+  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
 
-"is-regex@^1.0.4", "is-regex@^1.1.4":
-  "integrity" "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="
-  "resolved" "https://registry.npmmirror.com/is-regex/-/is-regex-1.1.4.tgz"
-  "version" "1.1.4"
+is-plain-obj@^1.1:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"
+  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
+
+is-plain-obj@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz"
+  integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
+
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-2.0.4.tgz"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
-    "call-bind" "^1.0.2"
-    "has-tostringtag" "^1.0.0"
+    isobject "^3.0.1"
 
-"is-resolvable@^1.0.0":
-  "integrity" "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
-  "resolved" "https://registry.npmmirror.com/is-resolvable/-/is-resolvable-1.1.0.tgz"
-  "version" "1.1.0"
+is-promise@^2.1.0:
+  version "2.2.2"
+  resolved "https://registry.npmmirror.com/is-promise/-/is-promise-2.2.2.tgz"
+  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
-"is-shared-array-buffer@^1.0.2":
-  "integrity" "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="
-  "resolved" "https://registry.npmmirror.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"
-  "version" "1.0.2"
+is-regex@^1.0.4, is-regex@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmmirror.com/is-regex/-/is-regex-1.1.4.tgz"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
   dependencies:
-    "call-bind" "^1.0.2"
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
 
-"is-stream@^1.1.0":
-  "integrity" "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="
-  "resolved" "https://registry.npmmirror.com/is-stream/-/is-stream-1.1.0.tgz"
-  "version" "1.1.0"
+is-resolvable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/is-resolvable/-/is-resolvable-1.1.0.tgz"
+  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
-"is-stream@^2.0.0":
-  "integrity" "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
-  "resolved" "https://registry.npmmirror.com/is-stream/-/is-stream-2.0.1.tgz"
-  "version" "2.0.1"
-
-"is-string@^1.0.5", "is-string@^1.0.7":
-  "integrity" "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="
-  "resolved" "https://registry.npmmirror.com/is-string/-/is-string-1.0.7.tgz"
-  "version" "1.0.7"
+is-shared-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
   dependencies:
-    "has-tostringtag" "^1.0.0"
+    call-bind "^1.0.2"
 
-"is-symbol@^1.0.2", "is-symbol@^1.0.3":
-  "integrity" "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="
-  "resolved" "https://registry.npmmirror.com/is-symbol/-/is-symbol-1.0.4.tgz"
-  "version" "1.0.4"
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/is-stream/-/is-stream-1.1.0.tgz"
+  integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
+
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/is-stream/-/is-stream-2.0.1.tgz"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
+is-string@^1.0.5, is-string@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.npmmirror.com/is-string/-/is-string-1.0.7.tgz"
+  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
   dependencies:
-    "has-symbols" "^1.0.2"
+    has-tostringtag "^1.0.0"
 
-"is-typed-array@^1.1.10", "is-typed-array@^1.1.12", "is-typed-array@^1.1.9":
-  "integrity" "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg=="
-  "resolved" "https://registry.npmmirror.com/is-typed-array/-/is-typed-array-1.1.12.tgz"
-  "version" "1.1.12"
+is-symbol@^1.0.2, is-symbol@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/is-symbol/-/is-symbol-1.0.4.tgz"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
-    "which-typed-array" "^1.1.11"
+    has-symbols "^1.0.2"
 
-"is-typedarray@~1.0.0":
-  "integrity" "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
-  "resolved" "https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz"
-  "version" "1.0.0"
-
-"is-weakref@^1.0.2":
-  "integrity" "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="
-  "resolved" "https://registry.npmmirror.com/is-weakref/-/is-weakref-1.0.2.tgz"
-  "version" "1.0.2"
+is-typed-array@^1.1.10, is-typed-array@^1.1.9:
+  version "1.1.12"
+  resolved "https://registry.npmmirror.com/is-typed-array/-/is-typed-array-1.1.12.tgz"
+  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
   dependencies:
-    "call-bind" "^1.0.2"
+    which-typed-array "^1.1.11"
 
-"is-windows@^1.0.2":
-  "integrity" "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
-  "resolved" "https://registry.npmmirror.com/is-windows/-/is-windows-1.0.2.tgz"
-  "version" "1.0.2"
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz"
+  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
-"is-wsl@^1.1.0":
-  "integrity" "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw=="
-  "resolved" "https://registry.npmmirror.com/is-wsl/-/is-wsl-1.1.0.tgz"
-  "version" "1.1.0"
-
-"is-wsl@^2.1.1":
-  "integrity" "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="
-  "resolved" "https://registry.npmmirror.com/is-wsl/-/is-wsl-2.2.0.tgz"
-  "version" "2.2.0"
+is-weakref@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/is-weakref/-/is-weakref-1.0.2.tgz"
+  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
   dependencies:
-    "is-docker" "^2.0.0"
+    call-bind "^1.0.2"
 
-"isarray@^1.0.0", "isarray@~1.0.0", "isarray@1.0.0":
-  "integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-  "resolved" "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
-  "version" "1.0.0"
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/is-windows/-/is-windows-1.0.2.tgz"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
-"isarray@^2.0.5":
-  "integrity" "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-  "resolved" "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz"
-  "version" "2.0.5"
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/is-wsl/-/is-wsl-1.1.0.tgz"
+  integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==
 
-"isexe@^2.0.0":
-  "integrity" "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-  "resolved" "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz"
-  "version" "2.0.0"
-
-"isobject@^2.0.0":
-  "integrity" "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA=="
-  "resolved" "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz"
-  "version" "2.1.0"
+is-wsl@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.npmmirror.com/is-wsl/-/is-wsl-2.2.0.tgz"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
   dependencies:
-    "isarray" "1.0.0"
+    is-docker "^2.0.0"
 
-"isobject@^2.1.0":
-  "integrity" "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA=="
-  "resolved" "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz"
-  "version" "2.1.0"
+isarray@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
+
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
+
+isarray@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz"
+  integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
   dependencies:
-    "isarray" "1.0.0"
+    isarray "1.0.0"
 
-"isobject@^3.0.0", "isobject@^3.0.1":
-  "integrity" "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
-  "resolved" "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz"
-  "version" "3.0.1"
+isobject@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz"
+  integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
+  dependencies:
+    isarray "1.0.0"
 
-"isstream@~0.1.2":
-  "integrity" "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
-  "resolved" "https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz"
-  "version" "0.1.2"
+isobject@^3.0.0, 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==
 
-"javascript-stringify@^2.0.1":
-  "integrity" "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg=="
-  "resolved" "https://registry.npmmirror.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz"
-  "version" "2.1.0"
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz"
+  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
 
-"jest-worker@^26.5.0":
-  "integrity" "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="
-  "resolved" "https://registry.npmmirror.com/jest-worker/-/jest-worker-26.6.2.tgz"
-  "version" "26.6.2"
+javascript-stringify@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz"
+  integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==
+
+jest-worker@^26.5.0:
+  version "26.6.2"
+  resolved "https://registry.npmmirror.com/jest-worker/-/jest-worker-26.6.2.tgz"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
   dependencies:
     "@types/node" "*"
-    "merge-stream" "^2.0.0"
-    "supports-color" "^7.0.0"
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
 
-"jquery@^3.6.0", "jquery@>= 1.7.x":
-  "integrity" "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
-  "resolved" "https://registry.npmmirror.com/jquery/-/jquery-3.7.1.tgz"
-  "version" "3.7.1"
+jquery@^3.6.0, "jquery@>= 1.7.x":
+  version "3.7.1"
+  resolved "https://registry.npmmirror.com/jquery/-/jquery-3.7.1.tgz"
+  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
 
-"js-base64@^2.1.9":
-  "integrity" "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="
-  "resolved" "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz"
-  "version" "2.6.4"
+js-base64@^2.1.9:
+  version "2.6.4"
+  resolved "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz"
+  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
 
-"js-beautify@1.13.0":
-  "integrity" "sha512-/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA=="
-  "resolved" "https://registry.npmmirror.com/js-beautify/-/js-beautify-1.13.0.tgz"
-  "version" "1.13.0"
+js-beautify@1.13.0:
+  version "1.13.0"
+  resolved "https://registry.npmmirror.com/js-beautify/-/js-beautify-1.13.0.tgz"
+  integrity sha512-/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA==
   dependencies:
-    "config-chain" "^1.1.12"
-    "editorconfig" "^0.15.3"
-    "glob" "^7.1.3"
-    "mkdirp" "^1.0.4"
-    "nopt" "^5.0.0"
+    config-chain "^1.1.12"
+    editorconfig "^0.15.3"
+    glob "^7.1.3"
+    mkdirp "^1.0.4"
+    nopt "^5.0.0"
 
-"js-message@1.0.7":
-  "integrity" "sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA=="
-  "resolved" "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz"
-  "version" "1.0.7"
+js-message@1.0.7:
+  version "1.0.7"
+  resolved "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz"
+  integrity sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA==
 
-"js-tokens@^4.0.0":
-  "integrity" "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-  "resolved" "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz"
-  "version" "4.0.0"
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-"js-yaml@^3.13.1":
-  "integrity" "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="
-  "resolved" "https://registry.npmmirror.com/js-yaml/-/js-yaml-3.14.1.tgz"
-  "version" "3.14.1"
+js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.npmmirror.com/js-yaml/-/js-yaml-3.14.1.tgz"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
-    "argparse" "^1.0.7"
-    "esprima" "^4.0.0"
+    argparse "^1.0.7"
+    esprima "^4.0.0"
 
-"jsbarcode@^3.11.5":
-  "integrity" "sha512-zv3KsH51zD00I/LrFzFSM6dst7rDn0vIMzaiZFL7qusTjPZiPtxg3zxetp0RR7obmjTw4f6NyGgbdkBCgZUIrA=="
-  "resolved" "https://registry.npmmirror.com/jsbarcode/-/jsbarcode-3.11.5.tgz"
-  "version" "3.11.5"
+jsbarcode@^3.11.5:
+  version "3.11.5"
+  resolved "https://registry.npmmirror.com/jsbarcode/-/jsbarcode-3.11.5.tgz"
+  integrity sha512-zv3KsH51zD00I/LrFzFSM6dst7rDn0vIMzaiZFL7qusTjPZiPtxg3zxetp0RR7obmjTw4f6NyGgbdkBCgZUIrA==
 
-"jsbn@~0.1.0":
-  "integrity" "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
-  "resolved" "https://registry.npmmirror.com/jsbn/-/jsbn-0.1.1.tgz"
-  "version" "0.1.1"
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.npmmirror.com/jsbn/-/jsbn-0.1.1.tgz"
+  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
 
-"jsencrypt@3.3.1":
-  "integrity" "sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw=="
-  "resolved" "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz"
-  "version" "3.3.1"
+jsencrypt@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz"
+  integrity sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==
 
-"jsesc@^2.5.1":
-  "integrity" "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-  "resolved" "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz"
-  "version" "2.5.2"
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-"jsesc@~0.5.0":
-  "integrity" "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="
-  "resolved" "https://registry.npmmirror.com/jsesc/-/jsesc-0.5.0.tgz"
-  "version" "0.5.0"
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.npmmirror.com/jsesc/-/jsesc-0.5.0.tgz"
+  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
-"json-parse-better-errors@^1.0.1", "json-parse-better-errors@^1.0.2":
-  "integrity" "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-  "resolved" "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"
-  "version" "1.0.2"
+json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-"json-parse-even-better-errors@^2.3.0":
-  "integrity" "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-  "resolved" "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
-  "version" "2.3.1"
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
-"json-schema-traverse@^0.4.1":
-  "integrity" "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-  "resolved" "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
-  "version" "0.4.1"
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-"json-schema@0.4.0":
-  "integrity" "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
-  "resolved" "https://registry.npmmirror.com/json-schema/-/json-schema-0.4.0.tgz"
-  "version" "0.4.0"
+json-schema@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.npmmirror.com/json-schema/-/json-schema-0.4.0.tgz"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
 
-"json-source-map@^0.6.1":
-  "integrity" "sha512-1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg=="
-  "resolved" "https://registry.npmmirror.com/json-source-map/-/json-source-map-0.6.1.tgz"
-  "version" "0.6.1"
+json-source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.npmmirror.com/json-source-map/-/json-source-map-0.6.1.tgz"
+  integrity sha512-1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg==
 
-"json-stable-stringify-without-jsonify@^1.0.1":
-  "integrity" "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
-  "resolved" "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
-  "version" "1.0.1"
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-"json-stringify-safe@~5.0.1":
-  "integrity" "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
-  "resolved" "https://registry.npmmirror.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-  "version" "5.0.1"
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmmirror.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-"json5@^0.5.0":
-  "integrity" "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw=="
-  "resolved" "https://registry.npmmirror.com/json5/-/json5-0.5.1.tgz"
-  "version" "0.5.1"
+json5@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.npmmirror.com/json5/-/json5-0.5.1.tgz"
+  integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==
 
-"json5@^1.0.1":
-  "integrity" "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="
-  "resolved" "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz"
-  "version" "1.0.2"
+json5@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
-    "minimist" "^1.2.0"
+    minimist "^1.2.0"
 
-"json5@^1.0.2":
-  "integrity" "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="
-  "resolved" "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz"
-  "version" "1.0.2"
+json5@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
-    "minimist" "^1.2.0"
+    minimist "^1.2.0"
 
-"json5@^2.1.2", "json5@^2.2.3":
-  "integrity" "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
-  "resolved" "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz"
-  "version" "2.2.3"
+json5@^2.1.2, json5@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-"jsonfile@^4.0.0":
-  "integrity" "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="
-  "resolved" "https://registry.npmmirror.com/jsonfile/-/jsonfile-4.0.0.tgz"
-  "version" "4.0.0"
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/jsonfile/-/jsonfile-4.0.0.tgz"
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
   optionalDependencies:
-    "graceful-fs" "^4.1.6"
+    graceful-fs "^4.1.6"
 
-"jspdf@^2.5.1":
-  "integrity" "sha512-hXObxz7ZqoyhxET78+XR34Xu2qFGrJJ2I2bE5w4SM8eFaFEkW2xcGRVUss360fYelwRSid/jT078kbNvmoW0QA=="
-  "resolved" "https://registry.npmmirror.com/jspdf/-/jspdf-2.5.1.tgz"
-  "version" "2.5.1"
+jspdf@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.npmmirror.com/jspdf/-/jspdf-2.5.1.tgz"
+  integrity sha512-hXObxz7ZqoyhxET78+XR34Xu2qFGrJJ2I2bE5w4SM8eFaFEkW2xcGRVUss360fYelwRSid/jT078kbNvmoW0QA==
   dependencies:
     "@babel/runtime" "^7.14.0"
-    "atob" "^2.1.2"
-    "btoa" "^1.2.1"
-    "fflate" "^0.4.8"
+    atob "^2.1.2"
+    btoa "^1.2.1"
+    fflate "^0.4.8"
   optionalDependencies:
-    "canvg" "^3.0.6"
-    "core-js" "^3.6.0"
-    "dompurify" "^2.2.0"
-    "html2canvas" "^1.0.0-rc.5"
+    canvg "^3.0.6"
+    core-js "^3.6.0"
+    dompurify "^2.2.0"
+    html2canvas "^1.0.0-rc.5"
 
-"jsprim@^1.2.2":
-  "integrity" "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="
-  "resolved" "https://registry.npmmirror.com/jsprim/-/jsprim-1.4.2.tgz"
-  "version" "1.4.2"
+jsprim@^1.2.2:
+  version "1.4.2"
+  resolved "https://registry.npmmirror.com/jsprim/-/jsprim-1.4.2.tgz"
+  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
   dependencies:
-    "assert-plus" "1.0.0"
-    "extsprintf" "1.3.0"
-    "json-schema" "0.4.0"
-    "verror" "1.10.0"
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.4.0"
+    verror "1.10.0"
 
-"keycode@^2.2.0", "keycode@2.2.0":
-  "integrity" "sha512-ps3I9jAdNtRpJrbBvQjpzyFbss/skHqzS+eu4RxKLaEAtFqkjZaB6TZMSivPbLxf4K7VI4SjR0P5mRCX5+Q25A=="
-  "resolved" "https://registry.npmmirror.com/keycode/-/keycode-2.2.0.tgz"
-  "version" "2.2.0"
+keycode@^2.2.0, keycode@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.npmmirror.com/keycode/-/keycode-2.2.0.tgz"
+  integrity sha512-ps3I9jAdNtRpJrbBvQjpzyFbss/skHqzS+eu4RxKLaEAtFqkjZaB6TZMSivPbLxf4K7VI4SjR0P5mRCX5+Q25A==
 
-"killable@^1.0.1":
-  "integrity" "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="
-  "resolved" "https://registry.npmmirror.com/killable/-/killable-1.0.1.tgz"
-  "version" "1.0.1"
+killable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/killable/-/killable-1.0.1.tgz"
+  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
 
-"kind-of@^3.0.2":
-  "integrity" "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
-  "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
-  "version" "3.2.2"
+kind-of@^3.0.2, kind-of@^3.0.3:
+  version "3.2.2"
+  resolved "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
+  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
   dependencies:
-    "is-buffer" "^1.1.5"
+    is-buffer "^1.1.5"
 
-"kind-of@^3.0.3":
-  "integrity" "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
-  "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
-  "version" "3.2.2"
+kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
+  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
   dependencies:
-    "is-buffer" "^1.1.5"
+    is-buffer "^1.1.5"
 
-"kind-of@^3.2.0":
-  "integrity" "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
-  "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
-  "version" "3.2.2"
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/kind-of/-/kind-of-4.0.0.tgz"
+  integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==
   dependencies:
-    "is-buffer" "^1.1.5"
+    is-buffer "^1.1.5"
 
-"kind-of@^4.0.0":
-  "integrity" "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw=="
-  "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-4.0.0.tgz"
-  "version" "4.0.0"
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.npmmirror.com/kind-of/-/kind-of-5.1.0.tgz"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^5.0.2:
+  version "5.1.0"
+  resolved "https://registry.npmmirror.com/kind-of/-/kind-of-5.1.0.tgz"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+klona@^2.0.4:
+  version "2.0.6"
+  resolved "https://registry.npmmirror.com/klona/-/klona-2.0.6.tgz"
+  integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
+
+launch-editor-middleware@^2.2.1:
+  version "2.6.0"
+  resolved "https://registry.npmmirror.com/launch-editor-middleware/-/launch-editor-middleware-2.6.0.tgz"
+  integrity sha512-K2yxgljj5TdCeRN1lBtO3/J26+AIDDDw+04y6VAiZbWcTdBwsYN6RrZBnW5DN/QiSIdKNjKdATLUUluWWFYTIA==
   dependencies:
-    "is-buffer" "^1.1.5"
+    launch-editor "^2.6.0"
 
-"kind-of@^5.0.2":
-  "integrity" "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-  "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-5.1.0.tgz"
-  "version" "5.1.0"
-
-"kind-of@^6.0.2":
-  "integrity" "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-  "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz"
-  "version" "6.0.3"
-
-"klona@^2.0.4":
-  "integrity" "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA=="
-  "resolved" "https://registry.npmmirror.com/klona/-/klona-2.0.6.tgz"
-  "version" "2.0.6"
-
-"launch-editor-middleware@^2.2.1":
-  "integrity" "sha512-Fg/xYhf7ARmRp40n18wIfJyuAMEjXo67Yull7uF7d0OJ3qA4EYJISt1XfPPn69IIJ5jKgQwzcg6DqHYo95LL/g=="
-  "resolved" "https://registry.npmmirror.com/launch-editor-middleware/-/launch-editor-middleware-2.6.1.tgz"
-  "version" "2.6.1"
+launch-editor@^2.2.1, launch-editor@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.npmmirror.com/launch-editor/-/launch-editor-2.6.0.tgz"
+  integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==
   dependencies:
-    "launch-editor" "^2.6.1"
+    picocolors "^1.0.0"
+    shell-quote "^1.7.3"
 
-"launch-editor@^2.2.1", "launch-editor@^2.6.1":
-  "integrity" "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw=="
-  "resolved" "https://registry.npmmirror.com/launch-editor/-/launch-editor-2.6.1.tgz"
-  "version" "2.6.1"
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmmirror.com/levn/-/levn-0.3.0.tgz"
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
   dependencies:
-    "picocolors" "^1.0.0"
-    "shell-quote" "^1.8.1"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
 
-"levn@^0.3.0", "levn@~0.3.0":
-  "integrity" "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="
-  "resolved" "https://registry.npmmirror.com/levn/-/levn-0.3.0.tgz"
-  "version" "0.3.0"
+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==
+
+lines-and-columns@^1.1.6:
+  version "1.2.4"
+  resolved "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
+  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
+
+lint-staged@12.5.0:
+  version "12.5.0"
+  resolved "https://registry.npmmirror.com/lint-staged/-/lint-staged-12.5.0.tgz"
+  integrity sha512-BKLUjWDsKquV/JuIcoQW4MSAI3ggwEImF1+sB4zaKvyVx1wBk3FsG7UK9bpnmBTN1pm7EH2BBcMwINJzCRv12g==
   dependencies:
-    "prelude-ls" "~1.1.2"
-    "type-check" "~0.3.2"
+    cli-truncate "^3.1.0"
+    colorette "^2.0.16"
+    commander "^9.3.0"
+    debug "^4.3.4"
+    execa "^5.1.1"
+    lilconfig "2.0.5"
+    listr2 "^4.0.5"
+    micromatch "^4.0.5"
+    normalize-path "^3.0.0"
+    object-inspect "^1.12.2"
+    pidtree "^0.5.0"
+    string-argv "^0.3.1"
+    supports-color "^9.2.2"
+    yaml "^1.10.2"
 
-"lilconfig@2.0.5":
-  "integrity" "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg=="
-  "resolved" "https://registry.npmmirror.com/lilconfig/-/lilconfig-2.0.5.tgz"
-  "version" "2.0.5"
-
-"lines-and-columns@^1.1.6":
-  "integrity" "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-  "resolved" "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
-  "version" "1.2.4"
-
-"lint-staged@12.5.0":
-  "integrity" "sha512-BKLUjWDsKquV/JuIcoQW4MSAI3ggwEImF1+sB4zaKvyVx1wBk3FsG7UK9bpnmBTN1pm7EH2BBcMwINJzCRv12g=="
-  "resolved" "https://registry.npmmirror.com/lint-staged/-/lint-staged-12.5.0.tgz"
-  "version" "12.5.0"
+listr2@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.npmmirror.com/listr2/-/listr2-4.0.5.tgz"
+  integrity sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==
   dependencies:
-    "cli-truncate" "^3.1.0"
-    "colorette" "^2.0.16"
-    "commander" "^9.3.0"
-    "debug" "^4.3.4"
-    "execa" "^5.1.1"
-    "lilconfig" "2.0.5"
-    "listr2" "^4.0.5"
-    "micromatch" "^4.0.5"
-    "normalize-path" "^3.0.0"
-    "object-inspect" "^1.12.2"
-    "pidtree" "^0.5.0"
-    "string-argv" "^0.3.1"
-    "supports-color" "^9.2.2"
-    "yaml" "^1.10.2"
+    cli-truncate "^2.1.0"
+    colorette "^2.0.16"
+    log-update "^4.0.0"
+    p-map "^4.0.0"
+    rfdc "^1.3.0"
+    rxjs "^7.5.5"
+    through "^2.3.8"
+    wrap-ansi "^7.0.0"
 
-"listr2@^4.0.5":
-  "integrity" "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA=="
-  "resolved" "https://registry.npmmirror.com/listr2/-/listr2-4.0.5.tgz"
-  "version" "4.0.5"
+loader-fs-cache@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"
+  integrity sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==
   dependencies:
-    "cli-truncate" "^2.1.0"
-    "colorette" "^2.0.16"
-    "log-update" "^4.0.0"
-    "p-map" "^4.0.0"
-    "rfdc" "^1.3.0"
-    "rxjs" "^7.5.5"
-    "through" "^2.3.8"
-    "wrap-ansi" "^7.0.0"
+    find-cache-dir "^0.1.1"
+    mkdirp "^0.5.1"
 
-"loader-fs-cache@^1.0.0":
-  "integrity" "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA=="
-  "resolved" "https://registry.npmmirror.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"
-  "version" "1.0.3"
+loader-runner@^2.3.1, loader-runner@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.npmmirror.com/loader-runner/-/loader-runner-2.4.0.tgz"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
+
+loader-utils@^0.2.16:
+  version "0.2.17"
+  resolved "https://registry.npmmirror.com/loader-utils/-/loader-utils-0.2.17.tgz"
+  integrity sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==
   dependencies:
-    "find-cache-dir" "^0.1.1"
-    "mkdirp" "^0.5.1"
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.0.1"
 
-"loader-runner@^2.3.1", "loader-runner@^2.4.0":
-  "integrity" "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="
-  "resolved" "https://registry.npmmirror.com/loader-runner/-/loader-runner-2.4.0.tgz"
-  "version" "2.4.0"
-
-"loader-utils@^0.2.16":
-  "integrity" "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug=="
-  "resolved" "https://registry.npmmirror.com/loader-utils/-/loader-utils-0.2.17.tgz"
-  "version" "0.2.17"
+loader-utils@^1.0.2:
+  version "1.4.2"
+  resolved "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
-    "big.js" "^3.1.3"
-    "emojis-list" "^2.0.0"
-    "json5" "^0.5.0"
-    "object-assign" "^4.0.1"
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
 
-"loader-utils@^1.0.2":
-  "integrity" "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg=="
-  "resolved" "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz"
-  "version" "1.4.2"
+loader-utils@^1.1.0:
+  version "1.4.2"
+  resolved "https://registry.npmmirror.com/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"
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
 
-"loader-utils@^1.1.0":
-  "integrity" "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg=="
-  "resolved" "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz"
-  "version" "1.4.2"
+loader-utils@^1.2.3:
+  version "1.4.2"
+  resolved "https://registry.npmmirror.com/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"
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
 
-"loader-utils@^1.2.3":
-  "integrity" "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg=="
-  "resolved" "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz"
-  "version" "1.4.2"
+loader-utils@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
   dependencies:
-    "big.js" "^5.2.2"
-    "emojis-list" "^3.0.0"
-    "json5" "^1.0.1"
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
 
-"loader-utils@^2.0.0":
-  "integrity" "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="
-  "resolved" "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz"
-  "version" "2.0.4"
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/locate-path/-/locate-path-3.0.0.tgz"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
-    "big.js" "^5.2.2"
-    "emojis-list" "^3.0.0"
-    "json5" "^2.1.2"
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
 
-"locate-path@^3.0.0":
-  "integrity" "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="
-  "resolved" "https://registry.npmmirror.com/locate-path/-/locate-path-3.0.0.tgz"
-  "version" "3.0.0"
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
   dependencies:
-    "p-locate" "^3.0.0"
-    "path-exists" "^3.0.0"
+    p-locate "^4.1.0"
 
-"locate-path@^5.0.0":
-  "integrity" "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="
-  "resolved" "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz"
-  "version" "5.0.0"
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
+  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
+
+lodash.defaultsdeep@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.npmmirror.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz"
+  integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==
+
+lodash.kebabcase@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmmirror.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"
+  integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==
+
+lodash.mapvalues@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.npmmirror.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"
+  integrity sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ==
+
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.npmmirror.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"
+  integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
+
+lodash.padend@4.6.1:
+  version "4.6.1"
+  resolved "https://registry.npmmirror.com/lodash.padend/-/lodash.padend-4.6.1.tgz"
+  integrity sha512-sOQs2aqGpbl27tmCS1QNZA09Uqp01ZzWfDUoD+xzTii0E7dSQfRKcRetFwa+uXaxaqL+TKm7CgD2JdKP7aZBSw==
+
+lodash.transform@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.npmmirror.com/lodash.transform/-/lodash.transform-4.6.0.tgz"
+  integrity sha512-LO37ZnhmBVx0GvOU/caQuipEh4GN82TcWv3yHlebGDgOxbxiwwzW5Pcx2AcvpIv2WmvmSMoC492yQFNhy/l/UQ==
+
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmmirror.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
+  integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
+
+lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3:
+  version "4.17.21"
+  resolved "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+lodash@4.17.11:
+  version "4.17.11"
+  resolved "https://registry.npmmirror.com/lodash/-/lodash-4.17.11.tgz"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+
+log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.npmmirror.com/log-symbols/-/log-symbols-2.2.0.tgz"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
   dependencies:
-    "p-locate" "^4.1.0"
+    chalk "^2.0.1"
 
-"lodash.debounce@^4.0.8":
-  "integrity" "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
-  "resolved" "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
-  "version" "4.0.8"
-
-"lodash.defaultsdeep@^4.6.1":
-  "integrity" "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="
-  "resolved" "https://registry.npmmirror.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz"
-  "version" "4.6.1"
-
-"lodash.kebabcase@^4.1.1":
-  "integrity" "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g=="
-  "resolved" "https://registry.npmmirror.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"
-  "version" "4.1.1"
-
-"lodash.mapvalues@^4.6.0":
-  "integrity" "sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ=="
-  "resolved" "https://registry.npmmirror.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"
-  "version" "4.6.0"
-
-"lodash.memoize@^4.1.2":
-  "integrity" "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
-  "resolved" "https://registry.npmmirror.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"
-  "version" "4.1.2"
-
-"lodash.padend@4.6.1":
-  "integrity" "sha512-sOQs2aqGpbl27tmCS1QNZA09Uqp01ZzWfDUoD+xzTii0E7dSQfRKcRetFwa+uXaxaqL+TKm7CgD2JdKP7aZBSw=="
-  "resolved" "https://registry.npmmirror.com/lodash.padend/-/lodash.padend-4.6.1.tgz"
-  "version" "4.6.1"
-
-"lodash.transform@^4.6.0":
-  "integrity" "sha512-LO37ZnhmBVx0GvOU/caQuipEh4GN82TcWv3yHlebGDgOxbxiwwzW5Pcx2AcvpIv2WmvmSMoC492yQFNhy/l/UQ=="
-  "resolved" "https://registry.npmmirror.com/lodash.transform/-/lodash.transform-4.6.0.tgz"
-  "version" "4.6.0"
-
-"lodash.uniq@^4.5.0":
-  "integrity" "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
-  "resolved" "https://registry.npmmirror.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
-  "version" "4.5.0"
-
-"lodash@^4.0.0", "lodash@^4.17.11", "lodash@^4.17.14", "lodash@^4.17.15", "lodash@^4.17.19", "lodash@^4.17.20", "lodash@^4.17.21", "lodash@^4.17.3":
-  "integrity" "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-  "resolved" "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz"
-  "version" "4.17.21"
-
-"lodash@4.17.11":
-  "integrity" "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-  "resolved" "https://registry.npmmirror.com/lodash/-/lodash-4.17.11.tgz"
-  "version" "4.17.11"
-
-"log-symbols@^2.2.0":
-  "integrity" "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="
-  "resolved" "https://registry.npmmirror.com/log-symbols/-/log-symbols-2.2.0.tgz"
-  "version" "2.2.0"
+log-update@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/log-update/-/log-update-4.0.0.tgz"
+  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
   dependencies:
-    "chalk" "^2.0.1"
+    ansi-escapes "^4.3.0"
+    cli-cursor "^3.1.0"
+    slice-ansi "^4.0.0"
+    wrap-ansi "^6.2.0"
 
-"log-update@^4.0.0":
-  "integrity" "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg=="
-  "resolved" "https://registry.npmmirror.com/log-update/-/log-update-4.0.0.tgz"
-  "version" "4.0.0"
+loglevel@^1.6.8:
+  version "1.8.1"
+  resolved "https://registry.npmmirror.com/loglevel/-/loglevel-1.8.1.tgz"
+  integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==
+
+lower-case@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.npmmirror.com/lower-case/-/lower-case-1.1.4.tgz"
+  integrity sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==
+
+lru-cache@^4.0.1:
+  version "4.1.5"
+  resolved "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
-    "ansi-escapes" "^4.3.0"
-    "cli-cursor" "^3.1.0"
-    "slice-ansi" "^4.0.0"
-    "wrap-ansi" "^6.2.0"
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
 
-"loglevel@^1.6.8":
-  "integrity" "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg=="
-  "resolved" "https://registry.npmmirror.com/loglevel/-/loglevel-1.8.1.tgz"
-  "version" "1.8.1"
-
-"lower-case@^1.1.1":
-  "integrity" "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA=="
-  "resolved" "https://registry.npmmirror.com/lower-case/-/lower-case-1.1.4.tgz"
-  "version" "1.1.4"
-
-"lru-cache@^4.0.1", "lru-cache@^4.1.2", "lru-cache@^4.1.5":
-  "integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
-  "resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
-  "version" "4.1.5"
+lru-cache@^4.1.2:
+  version "4.1.5"
+  resolved "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
-    "pseudomap" "^1.0.2"
-    "yallist" "^2.1.2"
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
 
-"lru-cache@^5.1.1":
-  "integrity" "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="
-  "resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz"
-  "version" "5.1.1"
+lru-cache@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
-    "yallist" "^3.0.2"
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
 
-"lru-cache@^6.0.0":
-  "integrity" "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="
-  "resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz"
-  "version" "6.0.0"
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
   dependencies:
-    "yallist" "^4.0.0"
+    yallist "^3.0.2"
 
-"m3u8-parser@^6.0.0":
-  "integrity" "sha512-qlC00JTxYOxawcqg+RB8jbyNwL3foY/nCY61kyWP+RCuJE9APLeqB/nSlTjb4Mg0yRmyERgjswpdQxMvkeoDrg=="
-  "resolved" "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-6.2.0.tgz"
-  "version" "6.2.0"
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+m3u8-parser@^6.0.0:
+  version "6.2.0"
+  resolved "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-6.2.0.tgz"
+  integrity sha512-qlC00JTxYOxawcqg+RB8jbyNwL3foY/nCY61kyWP+RCuJE9APLeqB/nSlTjb4Mg0yRmyERgjswpdQxMvkeoDrg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@videojs/vhs-utils" "^3.0.5"
-    "global" "^4.4.0"
+    global "^4.4.0"
 
-"m3u8-parser@^7.1.0":
-  "integrity" "sha512-7N+pk79EH4oLKPEYdgRXgAsKDyA/VCo0qCHlUwacttQA0WqsjZQYmNfywMvjlY9MpEBVZEt0jKFd73Kv15EBYQ=="
-  "resolved" "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-7.1.0.tgz"
-  "version" "7.1.0"
+m3u8-parser@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-7.1.0.tgz"
+  integrity sha512-7N+pk79EH4oLKPEYdgRXgAsKDyA/VCo0qCHlUwacttQA0WqsjZQYmNfywMvjlY9MpEBVZEt0jKFd73Kv15EBYQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@videojs/vhs-utils" "^3.0.5"
-    "global" "^4.4.0"
+    global "^4.4.0"
 
-"m3u8-parser@2.1.0":
-  "integrity" "sha512-WbEpQ2FUaNGbJ0YanSeyj9D9ruu4FUvz+ZvebIzI2bSME+PUwcPXO1kKXZkjcPUAFruDikoOI5fWQNIA6JCCOQ=="
-  "resolved" "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-2.1.0.tgz"
-  "version" "2.1.0"
+m3u8-parser@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-2.1.0.tgz"
+  integrity sha512-WbEpQ2FUaNGbJ0YanSeyj9D9ruu4FUvz+ZvebIzI2bSME+PUwcPXO1kKXZkjcPUAFruDikoOI5fWQNIA6JCCOQ==
 
-"m3u8-parser@4.8.0":
-  "integrity" "sha512-UqA2a/Pw3liR6Df3gwxrqghCP17OpPlQj6RBPLYygf/ZSQ4MoSgvdvhvt35qV+3NaaA0FSZx93Ix+2brT1U7cA=="
-  "resolved" "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-4.8.0.tgz"
-  "version" "4.8.0"
+m3u8-parser@4.8.0:
+  version "4.8.0"
+  resolved "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-4.8.0.tgz"
+  integrity sha512-UqA2a/Pw3liR6Df3gwxrqghCP17OpPlQj6RBPLYygf/ZSQ4MoSgvdvhvt35qV+3NaaA0FSZx93Ix+2brT1U7cA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@videojs/vhs-utils" "^3.0.5"
-    "global" "^4.4.0"
+    global "^4.4.0"
 
-"magic-string@^0.30.5":
-  "integrity" "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA=="
-  "resolved" "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.5.tgz"
-  "version" "0.30.5"
+magic-string@^0.30.0:
+  version "0.30.1"
+  resolved "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.1.tgz"
+  integrity sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
-"make-dir@^2.0.0":
-  "integrity" "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="
-  "resolved" "https://registry.npmmirror.com/make-dir/-/make-dir-2.1.0.tgz"
-  "version" "2.1.0"
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/make-dir/-/make-dir-2.1.0.tgz"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
   dependencies:
-    "pify" "^4.0.1"
-    "semver" "^5.6.0"
+    pify "^4.0.1"
+    semver "^5.6.0"
 
-"make-dir@^3.0.2", "make-dir@^3.1.0":
-  "integrity" "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="
-  "resolved" "https://registry.npmmirror.com/make-dir/-/make-dir-3.1.0.tgz"
-  "version" "3.1.0"
+make-dir@^3.0.2, make-dir@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/make-dir/-/make-dir-3.1.0.tgz"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
   dependencies:
-    "semver" "^6.0.0"
+    semver "^6.0.0"
 
-"map-cache@^0.2.2":
-  "integrity" "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg=="
-  "resolved" "https://registry.npmmirror.com/map-cache/-/map-cache-0.2.2.tgz"
-  "version" "0.2.2"
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.npmmirror.com/map-cache/-/map-cache-0.2.2.tgz"
+  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
 
-"map-visit@^1.0.0":
-  "integrity" "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w=="
-  "resolved" "https://registry.npmmirror.com/map-visit/-/map-visit-1.0.0.tgz"
-  "version" "1.0.0"
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/map-visit/-/map-visit-1.0.0.tgz"
+  integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==
   dependencies:
-    "object-visit" "^1.0.0"
+    object-visit "^1.0.0"
 
-"matches-selector@^1.2.0":
-  "integrity" "sha512-c4vLwYWyl+Ji+U43eU/G5FwxWd4ZH0ePUsFs5y0uwD9HUEFBXUQ1zUUan+78IpRD+y4pUfG0nAzNM292K7ItvA=="
-  "resolved" "https://registry.npmmirror.com/matches-selector/-/matches-selector-1.2.0.tgz"
-  "version" "1.2.0"
+matches-selector@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/matches-selector/-/matches-selector-1.2.0.tgz"
+  integrity sha512-c4vLwYWyl+Ji+U43eU/G5FwxWd4ZH0ePUsFs5y0uwD9HUEFBXUQ1zUUan+78IpRD+y4pUfG0nAzNM292K7ItvA==
 
-"material-colors@^1.2.6":
-  "integrity" "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="
-  "resolved" "https://registry.npmmirror.com/material-colors/-/material-colors-1.2.6.tgz"
-  "version" "1.2.6"
+material-colors@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.npmmirror.com/material-colors/-/material-colors-1.2.6.tgz"
+  integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==
 
-"md5.js@^1.3.4":
-  "integrity" "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="
-  "resolved" "https://registry.npmmirror.com/md5.js/-/md5.js-1.3.5.tgz"
-  "version" "1.3.5"
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.npmmirror.com/md5.js/-/md5.js-1.3.5.tgz"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
   dependencies:
-    "hash-base" "^3.0.0"
-    "inherits" "^2.0.1"
-    "safe-buffer" "^5.1.2"
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
 
-"mdn-data@2.0.14":
-  "integrity" "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-  "resolved" "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz"
-  "version" "2.0.14"
+mdn-data@2.0.14:
+  version "2.0.14"
+  resolved "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz"
+  integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
-"mdn-data@2.0.4":
-  "integrity" "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
-  "resolved" "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.4.tgz"
-  "version" "2.0.4"
+mdn-data@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.4.tgz"
+  integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
-"media-typer@0.3.0":
-  "integrity" "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
-  "resolved" "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz"
-  "version" "0.3.0"
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz"
+  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-"memory-fs@^0.4.1":
-  "integrity" "sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ=="
-  "resolved" "https://registry.npmmirror.com/memory-fs/-/memory-fs-0.4.1.tgz"
-  "version" "0.4.1"
+memory-fs@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npmmirror.com/memory-fs/-/memory-fs-0.4.1.tgz"
+  integrity sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==
   dependencies:
-    "errno" "^0.1.3"
-    "readable-stream" "^2.0.1"
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
 
-"memory-fs@^0.5.0":
-  "integrity" "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA=="
-  "resolved" "https://registry.npmmirror.com/memory-fs/-/memory-fs-0.5.0.tgz"
-  "version" "0.5.0"
+memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.npmmirror.com/memory-fs/-/memory-fs-0.5.0.tgz"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
   dependencies:
-    "errno" "^0.1.3"
-    "readable-stream" "^2.0.1"
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
 
-"merge-descriptors@1.0.1":
-  "integrity" "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
-  "resolved" "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
-  "version" "1.0.1"
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
+  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
 
-"merge-options@1.0.1":
-  "integrity" "sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg=="
-  "resolved" "https://registry.npmmirror.com/merge-options/-/merge-options-1.0.1.tgz"
-  "version" "1.0.1"
+merge-options@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/merge-options/-/merge-options-1.0.1.tgz"
+  integrity sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==
   dependencies:
-    "is-plain-obj" "^1.1"
+    is-plain-obj "^1.1"
 
-"merge-source-map@^1.1.0":
-  "integrity" "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="
-  "resolved" "https://registry.npmmirror.com/merge-source-map/-/merge-source-map-1.1.0.tgz"
-  "version" "1.1.0"
+merge-source-map@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/merge-source-map/-/merge-source-map-1.1.0.tgz"
+  integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
   dependencies:
-    "source-map" "^0.6.1"
+    source-map "^0.6.1"
 
-"merge-stream@^2.0.0":
-  "integrity" "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-  "resolved" "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz"
-  "version" "2.0.0"
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-"merge2@^1.2.3":
-  "integrity" "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
-  "resolved" "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz"
-  "version" "1.4.1"
+merge2@^1.2.3:
+  version "1.4.1"
+  resolved "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-"methods@~1.1.2":
-  "integrity" "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
-  "resolved" "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz"
-  "version" "1.1.2"
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz"
+  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-"microargs@1.1.2":
-  "integrity" "sha512-fUrX9ozzzUX6JlDoNXmUM5i4B0uBF5xPznZ0Y/izM9wOtAaTf44V2vUCRgGBLUq/SeGIcDgfnEZDVoT92HId0g=="
-  "resolved" "https://registry.npmmirror.com/microargs/-/microargs-1.1.2.tgz"
-  "version" "1.1.2"
+microargs@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/microargs/-/microargs-1.1.2.tgz"
+  integrity sha512-fUrX9ozzzUX6JlDoNXmUM5i4B0uBF5xPznZ0Y/izM9wOtAaTf44V2vUCRgGBLUq/SeGIcDgfnEZDVoT92HId0g==
 
-"microcli@1.3.3":
-  "integrity" "sha512-1isRaEBpfRC8vJMJymKknAH8CdPFABuWPVc18rlRWHOCcHLYEkJxcoH7FNkX7AuTGrB4Uf1ve6B0s/FfwzGWKg=="
-  "resolved" "https://registry.npmmirror.com/microcli/-/microcli-1.3.3.tgz"
-  "version" "1.3.3"
+microcli@1.3.3:
+  version "1.3.3"
+  resolved "https://registry.npmmirror.com/microcli/-/microcli-1.3.3.tgz"
+  integrity sha512-1isRaEBpfRC8vJMJymKknAH8CdPFABuWPVc18rlRWHOCcHLYEkJxcoH7FNkX7AuTGrB4Uf1ve6B0s/FfwzGWKg==
   dependencies:
-    "lodash" "4.17.11"
-    "microargs" "1.1.2"
+    lodash "4.17.11"
+    microargs "1.1.2"
 
-"micromatch@^3.1.10", "micromatch@^3.1.4":
-  "integrity" "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="
-  "resolved" "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.10.tgz"
-  "version" "3.1.10"
+micromatch@^3.1.10, micromatch@^3.1.4:
+  version "3.1.10"
+  resolved "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.10.tgz"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
-    "arr-diff" "^4.0.0"
-    "array-unique" "^0.3.2"
-    "braces" "^2.3.1"
-    "define-property" "^2.0.2"
-    "extend-shallow" "^3.0.2"
-    "extglob" "^2.0.4"
-    "fragment-cache" "^0.2.1"
-    "kind-of" "^6.0.2"
-    "nanomatch" "^1.2.9"
-    "object.pick" "^1.3.0"
-    "regex-not" "^1.0.0"
-    "snapdragon" "^0.8.1"
-    "to-regex" "^3.0.2"
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
 
-"micromatch@^4.0.2":
-  "integrity" "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="
-  "resolved" "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz"
-  "version" "4.0.5"
+micromatch@^4.0.2:
+  version "4.0.5"
+  resolved "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
   dependencies:
-    "braces" "^3.0.2"
-    "picomatch" "^2.3.1"
+    braces "^3.0.2"
+    picomatch "^2.3.1"
 
-"micromatch@^4.0.5":
-  "integrity" "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="
-  "resolved" "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz"
-  "version" "4.0.5"
+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==
   dependencies:
-    "braces" "^3.0.2"
-    "picomatch" "^2.3.1"
+    braces "^3.0.2"
+    picomatch "^2.3.1"
 
-"micromatch@3.1.0":
-  "integrity" "sha512-3StSelAE+hnRvMs8IdVW7Uhk8CVed5tp+kLLGlBP6WiRAXS21GPGu/Nat4WNPXj2Eoc24B02SaeoyozPMfj0/g=="
-  "resolved" "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.0.tgz"
-  "version" "3.1.0"
+micromatch@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.0.tgz"
+  integrity sha512-3StSelAE+hnRvMs8IdVW7Uhk8CVed5tp+kLLGlBP6WiRAXS21GPGu/Nat4WNPXj2Eoc24B02SaeoyozPMfj0/g==
   dependencies:
-    "arr-diff" "^4.0.0"
-    "array-unique" "^0.3.2"
-    "braces" "^2.2.2"
-    "define-property" "^1.0.0"
-    "extend-shallow" "^2.0.1"
-    "extglob" "^2.0.2"
-    "fragment-cache" "^0.2.1"
-    "kind-of" "^5.0.2"
-    "nanomatch" "^1.2.1"
-    "object.pick" "^1.3.0"
-    "regex-not" "^1.0.0"
-    "snapdragon" "^0.8.1"
-    "to-regex" "^3.0.1"
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.2.2"
+    define-property "^1.0.0"
+    extend-shallow "^2.0.1"
+    extglob "^2.0.2"
+    fragment-cache "^0.2.1"
+    kind-of "^5.0.2"
+    nanomatch "^1.2.1"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
 
-"miller-rabin@^4.0.0":
-  "integrity" "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="
-  "resolved" "https://registry.npmmirror.com/miller-rabin/-/miller-rabin-4.0.1.tgz"
-  "version" "4.0.1"
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/miller-rabin/-/miller-rabin-4.0.1.tgz"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
   dependencies:
-    "bn.js" "^4.0.0"
-    "brorand" "^1.0.1"
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
 
-"mime-db@>= 1.43.0 < 2", "mime-db@1.52.0":
-  "integrity" "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-  "resolved" "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz"
-  "version" "1.52.0"
+"mime-db@>= 1.43.0 < 2", mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-"mime-types@^2.1.12", "mime-types@~2.1.17", "mime-types@~2.1.19", "mime-types@~2.1.24", "mime-types@~2.1.34":
-  "integrity" "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="
-  "resolved" "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz"
-  "version" "2.1.35"
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
+  version "2.1.35"
+  resolved "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
-    "mime-db" "1.52.0"
+    mime-db "1.52.0"
 
-"mime@^2.4.4":
-  "integrity" "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="
-  "resolved" "https://registry.npmmirror.com/mime/-/mime-2.6.0.tgz"
-  "version" "2.6.0"
+mime@^2.4.4:
+  version "2.6.0"
+  resolved "https://registry.npmmirror.com/mime/-/mime-2.6.0.tgz"
+  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
 
-"mime@1.6.0":
-  "integrity" "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-  "resolved" "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz"
-  "version" "1.6.0"
+mime@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-"mimic-fn@^1.0.0":
-  "integrity" "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
-  "resolved" "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-1.2.0.tgz"
-  "version" "1.2.0"
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-1.2.0.tgz"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-"mimic-fn@^2.1.0":
-  "integrity" "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-  "resolved" "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-2.1.0.tgz"
-  "version" "2.1.0"
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-2.1.0.tgz"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-"min-dash@^3.0.0", "min-dash@^3.1.0", "min-dash@^3.3.0", "min-dash@^3.5.2", "min-dash@3.5.2":
-  "integrity" "sha512-YVbJZUtnzT5QsgJUp9H9uyJTW6NJgswFqI27RI/+MSox860uIjaGMbSQBftEzbMXiJVRG24hpoIh3SG666SHgA=="
-  "resolved" "https://registry.npmmirror.com/min-dash/-/min-dash-3.5.2.tgz"
-  "version" "3.5.2"
+min-dash@^3.0.0, min-dash@^3.1.0, min-dash@^3.3.0, min-dash@^3.5.2, min-dash@3.5.2:
+  version "3.5.2"
+  resolved "https://registry.npmmirror.com/min-dash/-/min-dash-3.5.2.tgz"
+  integrity sha512-YVbJZUtnzT5QsgJUp9H9uyJTW6NJgswFqI27RI/+MSox860uIjaGMbSQBftEzbMXiJVRG24hpoIh3SG666SHgA==
 
-"min-dash@^3.7.0":
-  "integrity" "sha512-evumdlmIlg9mbRVPbC4F5FuRhNmcMS5pvuBUbqb1G9v09Ro0ImPEgz5n3khir83lFok1inKqVDjnKEg3GpDxQg=="
-  "resolved" "https://registry.npmmirror.com/min-dash/-/min-dash-3.8.1.tgz"
-  "version" "3.8.1"
+min-dash@^3.7.0:
+  version "3.8.1"
+  resolved "https://registry.npmmirror.com/min-dash/-/min-dash-3.8.1.tgz"
+  integrity sha512-evumdlmIlg9mbRVPbC4F5FuRhNmcMS5pvuBUbqb1G9v09Ro0ImPEgz5n3khir83lFok1inKqVDjnKEg3GpDxQg==
 
-"min-dash@^3.8.1":
-  "integrity" "sha512-evumdlmIlg9mbRVPbC4F5FuRhNmcMS5pvuBUbqb1G9v09Ro0ImPEgz5n3khir83lFok1inKqVDjnKEg3GpDxQg=="
-  "resolved" "https://registry.npmmirror.com/min-dash/-/min-dash-3.8.1.tgz"
-  "version" "3.8.1"
+min-dash@^3.8.1:
+  version "3.8.1"
+  resolved "https://registry.npmmirror.com/min-dash/-/min-dash-3.8.1.tgz"
+  integrity sha512-evumdlmIlg9mbRVPbC4F5FuRhNmcMS5pvuBUbqb1G9v09Ro0ImPEgz5n3khir83lFok1inKqVDjnKEg3GpDxQg==
 
-"min-dash@^4.0.0", "min-dash@^4.1.0":
-  "integrity" "sha512-r+Z6vxXLSGr+otyCPx9NKPCSixw7LdfZREPTmqfd2a/d5D6w4NCdOxRJs+HyFO6v2pQkyHroGSiINWECK+OWPg=="
-  "resolved" "https://registry.npmmirror.com/min-dash/-/min-dash-4.1.1.tgz"
-  "version" "4.1.1"
+min-dash@^4.0.0, min-dash@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.npmmirror.com/min-dash/-/min-dash-4.1.1.tgz"
+  integrity sha512-r+Z6vxXLSGr+otyCPx9NKPCSixw7LdfZREPTmqfd2a/d5D6w4NCdOxRJs+HyFO6v2pQkyHroGSiINWECK+OWPg==
 
-"min-document@^2.19.0":
-  "integrity" "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ=="
-  "resolved" "https://registry.npmmirror.com/min-document/-/min-document-2.19.0.tgz"
-  "version" "2.19.0"
+min-document@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.npmmirror.com/min-document/-/min-document-2.19.0.tgz"
+  integrity sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==
   dependencies:
-    "dom-walk" "^0.1.0"
+    dom-walk "^0.1.0"
 
-"min-dom@^0.2.0":
-  "integrity" "sha512-VmxugbnAcVZGqvepjhOA4d4apmrpX8mMaRS+/jo0dI5Yorzrr4Ru9zc9KVALlY/+XakVCb8iQ+PYXljihQcsNw=="
-  "resolved" "https://registry.npmmirror.com/min-dom/-/min-dom-0.2.0.tgz"
-  "version" "0.2.0"
+min-dom@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmmirror.com/min-dom/-/min-dom-0.2.0.tgz"
+  integrity sha512-VmxugbnAcVZGqvepjhOA4d4apmrpX8mMaRS+/jo0dI5Yorzrr4Ru9zc9KVALlY/+XakVCb8iQ+PYXljihQcsNw==
   dependencies:
-    "component-classes" "^1.2.3"
-    "component-closest" "^0.1.4"
-    "component-delegate" "^0.2.3"
-    "component-event" "^0.1.4"
-    "component-matches-selector" "^0.1.5"
-    "component-query" "^0.0.3"
-    "domify" "^1.3.1"
+    component-classes "^1.2.3"
+    component-closest "^0.1.4"
+    component-delegate "^0.2.3"
+    component-event "^0.1.4"
+    component-matches-selector "^0.1.5"
+    component-query "^0.0.3"
+    domify "^1.3.1"
 
-"min-dom@^3.1.0":
-  "integrity" "sha512-v6YCmnDzxk4rRJntWTUiwggLupPw/8ZSRqUq0PDaBwVZEO/wYzCH4SKVBV+KkEvf3u0XaWHly5JEosPtqRATZA=="
-  "resolved" "https://registry.npmmirror.com/min-dom/-/min-dom-3.2.1.tgz"
-  "version" "3.2.1"
+min-dom@^3.1.0, min-dom@^3.1.3:
+  version "3.2.1"
+  resolved "https://registry.npmmirror.com/min-dom/-/min-dom-3.2.1.tgz"
+  integrity sha512-v6YCmnDzxk4rRJntWTUiwggLupPw/8ZSRqUq0PDaBwVZEO/wYzCH4SKVBV+KkEvf3u0XaWHly5JEosPtqRATZA==
   dependencies:
-    "component-event" "^0.1.4"
-    "domify" "^1.3.1"
-    "indexof" "0.0.1"
-    "matches-selector" "^1.2.0"
-    "min-dash" "^3.8.1"
+    component-event "^0.1.4"
+    domify "^1.3.1"
+    indexof "0.0.1"
+    matches-selector "^1.2.0"
+    min-dash "^3.8.1"
 
-"min-dom@^3.1.3":
-  "integrity" "sha512-v6YCmnDzxk4rRJntWTUiwggLupPw/8ZSRqUq0PDaBwVZEO/wYzCH4SKVBV+KkEvf3u0XaWHly5JEosPtqRATZA=="
-  "resolved" "https://registry.npmmirror.com/min-dom/-/min-dom-3.2.1.tgz"
-  "version" "3.2.1"
+min-dom@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmmirror.com/min-dom/-/min-dom-4.1.0.tgz"
+  integrity sha512-1lj1EyoSwY/UmTeT/hhPiZTsq+vK9D+8FAJ/53iK5jT1otkG9rJTixSKdjmTieEvdfES+sKbbTptzaQJhnacjA==
   dependencies:
-    "component-event" "^0.1.4"
-    "domify" "^1.3.1"
-    "indexof" "0.0.1"
-    "matches-selector" "^1.2.0"
-    "min-dash" "^3.8.1"
+    component-event "^0.2.1"
+    domify "^1.4.1"
+    min-dash "^4.0.0"
 
-"min-dom@^4.1.0":
-  "integrity" "sha512-1lj1EyoSwY/UmTeT/hhPiZTsq+vK9D+8FAJ/53iK5jT1otkG9rJTixSKdjmTieEvdfES+sKbbTptzaQJhnacjA=="
-  "resolved" "https://registry.npmmirror.com/min-dom/-/min-dom-4.1.0.tgz"
-  "version" "4.1.0"
+mini-css-extract-plugin@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.npmmirror.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"
+  integrity sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==
   dependencies:
-    "component-event" "^0.2.1"
-    "domify" "^1.4.1"
-    "min-dash" "^4.0.0"
+    loader-utils "^1.1.0"
+    normalize-url "1.9.1"
+    schema-utils "^1.0.0"
+    webpack-sources "^1.1.0"
 
-"mini-css-extract-plugin@^0.9.0":
-  "integrity" "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="
-  "resolved" "https://registry.npmmirror.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"
-  "version" "0.9.0"
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
+  integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
+
+minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
-    "loader-utils" "^1.1.0"
-    "normalize-url" "1.9.1"
-    "schema-utils" "^1.0.0"
-    "webpack-sources" "^1.1.0"
+    brace-expansion "^1.1.7"
 
-"minimalistic-assert@^1.0.0", "minimalistic-assert@^1.0.1":
-  "integrity" "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-  "resolved" "https://registry.npmmirror.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"
-  "version" "1.0.1"
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+  version "1.2.8"
+  resolved "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-"minimalistic-crypto-utils@^1.0.1":
-  "integrity" "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="
-  "resolved" "https://registry.npmmirror.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
-  "version" "1.0.1"
-
-"minimatch@^3.0.4", "minimatch@^3.1.1", "minimatch@^3.1.2":
-  "integrity" "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="
-  "resolved" "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz"
-  "version" "3.1.2"
+minipass-collect@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/minipass-collect/-/minipass-collect-1.0.2.tgz"
+  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
   dependencies:
-    "brace-expansion" "^1.1.7"
+    minipass "^3.0.0"
 
-"minimist@^1.2.0", "minimist@^1.2.5", "minimist@^1.2.6":
-  "integrity" "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
-  "resolved" "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz"
-  "version" "1.2.8"
-
-"minipass-collect@^1.0.2":
-  "integrity" "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="
-  "resolved" "https://registry.npmmirror.com/minipass-collect/-/minipass-collect-1.0.2.tgz"
-  "version" "1.0.2"
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/minipass-flush/-/minipass-flush-1.0.5.tgz"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
   dependencies:
-    "minipass" "^3.0.0"
+    minipass "^3.0.0"
 
-"minipass-flush@^1.0.5":
-  "integrity" "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="
-  "resolved" "https://registry.npmmirror.com/minipass-flush/-/minipass-flush-1.0.5.tgz"
-  "version" "1.0.5"
+minipass-pipeline@^1.2.2:
+  version "1.2.4"
+  resolved "https://registry.npmmirror.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
   dependencies:
-    "minipass" "^3.0.0"
+    minipass "^3.0.0"
 
-"minipass-pipeline@^1.2.2":
-  "integrity" "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="
-  "resolved" "https://registry.npmmirror.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"
-  "version" "1.2.4"
+minipass@^3.0.0, minipass@^3.1.1:
+  version "3.3.6"
+  resolved "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
   dependencies:
-    "minipass" "^3.0.0"
+    yallist "^4.0.0"
 
-"minipass@^3.0.0", "minipass@^3.1.1":
-  "integrity" "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
-  "resolved" "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz"
-  "version" "3.3.6"
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmmirror.com/minipass/-/minipass-5.0.0.tgz"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
+minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
   dependencies:
-    "yallist" "^4.0.0"
+    minipass "^3.0.0"
+    yallist "^4.0.0"
 
-"minipass@^5.0.0":
-  "integrity" "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="
-  "resolved" "https://registry.npmmirror.com/minipass/-/minipass-5.0.0.tgz"
-  "version" "5.0.0"
-
-"minizlib@^2.1.1":
-  "integrity" "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="
-  "resolved" "https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz"
-  "version" "2.1.2"
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/mississippi/-/mississippi-3.0.0.tgz"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
   dependencies:
-    "minipass" "^3.0.0"
-    "yallist" "^4.0.0"
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
 
-"mississippi@^3.0.0":
-  "integrity" "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA=="
-  "resolved" "https://registry.npmmirror.com/mississippi/-/mississippi-3.0.0.tgz"
-  "version" "3.0.0"
+mitt@^1.1.3:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/mitt/-/mitt-1.2.0.tgz"
+  integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==
+
+mitt@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/mitt/-/mitt-1.1.2.tgz"
+  integrity sha512-3btxP0O9iGADGWAkteQ8mzDtEspZqu4I32y4GZYCV5BrwtzdcRpF4dQgNdJadCrbBx7Lu6Sq9AVrerMHR0Hkmw==
+
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.npmmirror.com/mixin-deep/-/mixin-deep-1.3.2.tgz"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
-    "concat-stream" "^1.5.0"
-    "duplexify" "^3.4.2"
-    "end-of-stream" "^1.1.0"
-    "flush-write-stream" "^1.0.0"
-    "from2" "^2.1.0"
-    "parallel-transform" "^1.1.0"
-    "pump" "^3.0.0"
-    "pumpify" "^1.3.3"
-    "stream-each" "^1.1.0"
-    "through2" "^2.0.0"
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
 
-"mitt@^1.1.3":
-  "integrity" "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw=="
-  "resolved" "https://registry.npmmirror.com/mitt/-/mitt-1.2.0.tgz"
-  "version" "1.2.0"
-
-"mitt@1.1.2":
-  "integrity" "sha512-3btxP0O9iGADGWAkteQ8mzDtEspZqu4I32y4GZYCV5BrwtzdcRpF4dQgNdJadCrbBx7Lu6Sq9AVrerMHR0Hkmw=="
-  "resolved" "https://registry.npmmirror.com/mitt/-/mitt-1.1.2.tgz"
-  "version" "1.1.2"
-
-"mixin-deep@^1.2.0":
-  "integrity" "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="
-  "resolved" "https://registry.npmmirror.com/mixin-deep/-/mixin-deep-1.3.2.tgz"
-  "version" "1.3.2"
+mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.6, mkdirp@~0.5.1:
+  version "0.5.6"
+  resolved "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
-    "for-in" "^1.0.2"
-    "is-extendable" "^1.0.1"
+    minimist "^1.2.6"
 
-"mkdirp@^0.5.1":
-  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
-  "version" "0.5.6"
+mkdirp@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mockjs@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/mockjs/-/mockjs-1.1.0.tgz"
+  integrity sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==
   dependencies:
-    "minimist" "^1.2.6"
+    commander "*"
 
-"mkdirp@^0.5.3":
-  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
-  "version" "0.5.6"
+moddle-xml@^9.0.6:
+  version "9.0.6"
+  resolved "https://registry.npmmirror.com/moddle-xml/-/moddle-xml-9.0.6.tgz"
+  integrity sha512-tl0reHpsY/aKlLGhXeFlQWlYAQHFxTkFqC8tq8jXRYpQSnLVw13T6swMaourLd7EXqHdWsc+5ggsB+fEep6xZQ==
   dependencies:
-    "minimist" "^1.2.6"
+    min-dash "^3.5.2"
+    moddle "^5.0.2"
+    saxen "^8.1.2"
 
-"mkdirp@^0.5.6":
-  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
-  "version" "0.5.6"
+moddle@^5.0.2:
+  version "5.0.4"
+  resolved "https://registry.npmmirror.com/moddle/-/moddle-5.0.4.tgz"
+  integrity sha512-Kjb+hjuzO+YlojNGxEUXvdhLYTHTtAABDlDcJTtTcn5MbJF9Zkv4I1Fyvp3Ypmfgg1EfHDZ3PsCQTuML9JD6wg==
   dependencies:
-    "minimist" "^1.2.6"
+    min-dash "^3.0.0"
 
-"mkdirp@^1.0.3", "mkdirp@^1.0.4":
-  "integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
-  "version" "1.0.4"
+moment@^2.29.4:
+  version "2.29.4"
+  resolved "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz"
+  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
-"mkdirp@~0.5.1":
-  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
-  "version" "0.5.6"
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz"
+  integrity sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==
   dependencies:
-    "minimist" "^1.2.6"
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
 
-"mockjs@^1.1.0":
-  "integrity" "sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ=="
-  "resolved" "https://registry.npmmirror.com/mockjs/-/mockjs-1.1.0.tgz"
-  "version" "1.1.0"
-  dependencies:
-    "commander" "*"
-
-"moddle-xml@^9.0.6":
-  "integrity" "sha512-tl0reHpsY/aKlLGhXeFlQWlYAQHFxTkFqC8tq8jXRYpQSnLVw13T6swMaourLd7EXqHdWsc+5ggsB+fEep6xZQ=="
-  "resolved" "https://registry.npmmirror.com/moddle-xml/-/moddle-xml-9.0.6.tgz"
-  "version" "9.0.6"
-  dependencies:
-    "min-dash" "^3.5.2"
-    "moddle" "^5.0.2"
-    "saxen" "^8.1.2"
-
-"moddle@^5.0.2":
-  "integrity" "sha512-Kjb+hjuzO+YlojNGxEUXvdhLYTHTtAABDlDcJTtTcn5MbJF9Zkv4I1Fyvp3Ypmfgg1EfHDZ3PsCQTuML9JD6wg=="
-  "resolved" "https://registry.npmmirror.com/moddle/-/moddle-5.0.4.tgz"
-  "version" "5.0.4"
-  dependencies:
-    "min-dash" "^3.0.0"
-
-"moment@^2.29.4":
-  "integrity" "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
-  "resolved" "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz"
-  "version" "2.29.4"
-
-"move-concurrently@^1.0.1":
-  "integrity" "sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ=="
-  "resolved" "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz"
-  "version" "1.0.1"
-  dependencies:
-    "aproba" "^1.1.1"
-    "copy-concurrently" "^1.0.0"
-    "fs-write-stream-atomic" "^1.0.8"
-    "mkdirp" "^0.5.1"
-    "rimraf" "^2.5.4"
-    "run-queue" "^1.0.3"
-
-"mpd-parser@^0.22.1", "mpd-parser@0.22.1":
-  "integrity" "sha512-fwBebvpyPUU8bOzvhX0VQZgSohncbgYwUyJJoTSNpmy7ccD2ryiCvM7oRkn/xQH5cv73/xU7rJSNCLjdGFor0Q=="
-  "resolved" "https://registry.npmmirror.com/mpd-parser/-/mpd-parser-0.22.1.tgz"
-  "version" "0.22.1"
+mpd-parser@^0.22.1, mpd-parser@0.22.1:
+  version "0.22.1"
+  resolved "https://registry.npmmirror.com/mpd-parser/-/mpd-parser-0.22.1.tgz"
+  integrity sha512-fwBebvpyPUU8bOzvhX0VQZgSohncbgYwUyJJoTSNpmy7ccD2ryiCvM7oRkn/xQH5cv73/xU7rJSNCLjdGFor0Q==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@videojs/vhs-utils" "^3.0.5"
     "@xmldom/xmldom" "^0.8.3"
-    "global" "^4.4.0"
+    global "^4.4.0"
 
-"mpd-parser@^1.0.1", "mpd-parser@^1.2.2":
-  "integrity" "sha512-QCfB1koOoZw6E5La1cx+W/Yd0EZlRhHMqMr4TAJez0eRTuPDzPM5FWoiOqjyo37W+ISPLzmfJACSbJFEBjbL4Q=="
-  "resolved" "https://registry.npmmirror.com/mpd-parser/-/mpd-parser-1.2.2.tgz"
-  "version" "1.2.2"
+mpd-parser@^1.0.1, mpd-parser@^1.1.1:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/mpd-parser/-/mpd-parser-1.2.2.tgz"
+  integrity sha512-QCfB1koOoZw6E5La1cx+W/Yd0EZlRhHMqMr4TAJez0eRTuPDzPM5FWoiOqjyo37W+ISPLzmfJACSbJFEBjbL4Q==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@videojs/vhs-utils" "^3.0.5"
     "@xmldom/xmldom" "^0.8.3"
-    "global" "^4.4.0"
+    global "^4.4.0"
 
-"ms@^2.1.1", "ms@2.1.2":
-  "integrity" "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-  "resolved" "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz"
-  "version" "2.1.2"
+ms@^2.1.1, ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-"ms@2.0.0":
-  "integrity" "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-  "resolved" "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz"
-  "version" "2.0.0"
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz"
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-"ms@2.1.3":
-  "integrity" "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-  "resolved" "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz"
-  "version" "2.1.3"
+ms@2.1.3:
+  version "2.1.3"
+  resolved "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-"multicast-dns-service-types@^1.1.0":
-  "integrity" "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ=="
-  "resolved" "https://registry.npmmirror.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"
-  "version" "1.1.0"
+multicast-dns-service-types@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"
+  integrity sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==
 
-"multicast-dns@^6.0.1":
-  "integrity" "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="
-  "resolved" "https://registry.npmmirror.com/multicast-dns/-/multicast-dns-6.2.3.tgz"
-  "version" "6.2.3"
+multicast-dns@^6.0.1:
+  version "6.2.3"
+  resolved "https://registry.npmmirror.com/multicast-dns/-/multicast-dns-6.2.3.tgz"
+  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
   dependencies:
-    "dns-packet" "^1.3.1"
-    "thunky" "^1.0.2"
+    dns-packet "^1.3.1"
+    thunky "^1.0.2"
 
-"mute-stream@0.0.8":
-  "integrity" "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
-  "resolved" "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.8.tgz"
-  "version" "0.0.8"
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.8.tgz"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-"mux.js@^7.0.1", "mux.js@7.0.1":
-  "integrity" "sha512-Omz79uHqYpMP1V80JlvEdCiOW1hiw4mBvDh9gaZEpxvB+7WYb2soZSzfuSRrK2Kh9Pm6eugQNrIpY/Bnyhk4hw=="
-  "resolved" "https://registry.npmmirror.com/mux.js/-/mux.js-7.0.1.tgz"
-  "version" "7.0.1"
+mux.js@^6.2.0:
+  version "6.3.0"
+  resolved "https://registry.npmmirror.com/mux.js/-/mux.js-6.3.0.tgz"
+  integrity sha512-/QTkbSAP2+w1nxV+qTcumSDN5PA98P0tjrADijIzQHe85oBK3Akhy9AHlH0ne/GombLMz1rLyvVsmrgRxoPDrQ==
   dependencies:
     "@babel/runtime" "^7.11.2"
-    "global" "^4.4.0"
+    global "^4.4.0"
 
-"mux.js@4.3.2":
-  "integrity" "sha512-g0q6DPdvb3yYcoK7ElBGobdSSrhY/RjPt19U7uUc733aqvc5bCS/aCvL9z+448y+IoCZnYDwyZfQBBXMSmGOaQ=="
-  "resolved" "https://registry.npmmirror.com/mux.js/-/mux.js-4.3.2.tgz"
-  "version" "4.3.2"
+mux.js@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.npmmirror.com/mux.js/-/mux.js-4.3.2.tgz"
+  integrity sha512-g0q6DPdvb3yYcoK7ElBGobdSSrhY/RjPt19U7uUc733aqvc5bCS/aCvL9z+448y+IoCZnYDwyZfQBBXMSmGOaQ==
 
-"mux.js@6.0.1":
-  "integrity" "sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w=="
-  "resolved" "https://registry.npmmirror.com/mux.js/-/mux.js-6.0.1.tgz"
-  "version" "6.0.1"
+mux.js@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmmirror.com/mux.js/-/mux.js-6.0.1.tgz"
+  integrity sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==
   dependencies:
     "@babel/runtime" "^7.11.2"
-    "global" "^4.4.0"
+    global "^4.4.0"
 
-"mz@^2.4.0":
-  "integrity" "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="
-  "resolved" "https://registry.npmmirror.com/mz/-/mz-2.7.0.tgz"
-  "version" "2.7.0"
+mux.js@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmmirror.com/mux.js/-/mux.js-7.0.0.tgz"
+  integrity sha512-DeZmr+3NDrO02k4SREtl4VB5GyGPCz2fzMjDxBIlamkxffSTLge97rtNMoonnmFHTp96QggDucUtKv3fmyObrA==
   dependencies:
-    "any-promise" "^1.0.0"
-    "object-assign" "^4.0.1"
-    "thenify-all" "^1.0.0"
+    "@babel/runtime" "^7.11.2"
+    global "^4.4.0"
 
-"nanoid@^3.3.6":
-  "integrity" "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
-  "resolved" "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz"
-  "version" "3.3.6"
-
-"nanomatch@^1.2.1", "nanomatch@^1.2.9":
-  "integrity" "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="
-  "resolved" "https://registry.npmmirror.com/nanomatch/-/nanomatch-1.2.13.tgz"
-  "version" "1.2.13"
+mz@^2.4.0:
+  version "2.7.0"
+  resolved "https://registry.npmmirror.com/mz/-/mz-2.7.0.tgz"
+  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
   dependencies:
-    "arr-diff" "^4.0.0"
-    "array-unique" "^0.3.2"
-    "define-property" "^2.0.2"
-    "extend-shallow" "^3.0.2"
-    "fragment-cache" "^0.2.1"
-    "is-windows" "^1.0.2"
-    "kind-of" "^6.0.2"
-    "object.pick" "^1.3.0"
-    "regex-not" "^1.0.0"
-    "snapdragon" "^0.8.1"
-    "to-regex" "^3.0.1"
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
 
-"natural-compare@^1.4.0":
-  "integrity" "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
-  "resolved" "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz"
-  "version" "1.4.0"
+nanoid@^3.3.6:
+  version "3.3.6"
+  resolved "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz"
+  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
-"negotiator@0.6.3":
-  "integrity" "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
-  "resolved" "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz"
-  "version" "0.6.3"
-
-"neo-async@^2.5.0", "neo-async@^2.6.0", "neo-async@^2.6.1", "neo-async@^2.6.2":
-  "integrity" "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
-  "resolved" "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz"
-  "version" "2.6.2"
-
-"nice-try@^1.0.4":
-  "integrity" "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-  "resolved" "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz"
-  "version" "1.0.5"
-
-"no-case@^2.2.0":
-  "integrity" "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="
-  "resolved" "https://registry.npmmirror.com/no-case/-/no-case-2.3.2.tgz"
-  "version" "2.3.2"
+nanomatch@^1.2.1, nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.npmmirror.com/nanomatch/-/nanomatch-1.2.13.tgz"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
-    "lower-case" "^1.1.1"
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
 
-"node-forge@^0.10.0":
-  "integrity" "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
-  "resolved" "https://registry.npmmirror.com/node-forge/-/node-forge-0.10.0.tgz"
-  "version" "0.10.0"
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz"
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-"node-libs-browser@^2.2.1":
-  "integrity" "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="
-  "resolved" "https://registry.npmmirror.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz"
-  "version" "2.2.1"
+negotiator@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+
+neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1, neo-async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+no-case@^2.2.0:
+  version "2.3.2"
+  resolved "https://registry.npmmirror.com/no-case/-/no-case-2.3.2.tgz"
+  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
   dependencies:
-    "assert" "^1.1.1"
-    "browserify-zlib" "^0.2.0"
-    "buffer" "^4.3.0"
-    "console-browserify" "^1.1.0"
-    "constants-browserify" "^1.0.0"
-    "crypto-browserify" "^3.11.0"
-    "domain-browser" "^1.1.1"
-    "events" "^3.0.0"
-    "https-browserify" "^1.0.0"
-    "os-browserify" "^0.3.0"
-    "path-browserify" "0.0.1"
-    "process" "^0.11.10"
-    "punycode" "^1.2.4"
-    "querystring-es3" "^0.2.0"
-    "readable-stream" "^2.3.3"
-    "stream-browserify" "^2.0.1"
-    "stream-http" "^2.7.2"
-    "string_decoder" "^1.0.0"
-    "timers-browserify" "^2.0.4"
-    "tty-browserify" "0.0.0"
-    "url" "^0.11.0"
-    "util" "^0.11.0"
-    "vm-browserify" "^1.0.1"
+    lower-case "^1.1.1"
 
-"node-releases@^2.0.13":
-  "integrity" "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
-  "resolved" "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.13.tgz"
-  "version" "2.0.13"
+node-forge@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.npmmirror.com/node-forge/-/node-forge-0.10.0.tgz"
+  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
-"nopt@^5.0.0":
-  "integrity" "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="
-  "resolved" "https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz"
-  "version" "5.0.0"
+node-libs-browser@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.npmmirror.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
   dependencies:
-    "abbrev" "1"
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^3.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.1"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
 
-"normalize-package-data@^2.5.0":
-  "integrity" "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="
-  "resolved" "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"
-  "version" "2.5.0"
+node-releases@^2.0.12:
+  version "2.0.13"
+  resolved "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.13.tgz"
+  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
+
+nopt@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz"
+  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
   dependencies:
-    "hosted-git-info" "^2.1.4"
-    "resolve" "^1.10.0"
-    "semver" "2 || 3 || 4 || 5"
-    "validate-npm-package-license" "^3.0.1"
+    abbrev "1"
 
-"normalize-path@^1.0.0":
-  "integrity" "sha512-7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA=="
-  "resolved" "https://registry.npmmirror.com/normalize-path/-/normalize-path-1.0.0.tgz"
-  "version" "1.0.0"
-
-"normalize-path@^2.1.1":
-  "integrity" "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w=="
-  "resolved" "https://registry.npmmirror.com/normalize-path/-/normalize-path-2.1.1.tgz"
-  "version" "2.1.1"
+normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
-    "remove-trailing-separator" "^1.0.1"
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
 
-"normalize-path@^3.0.0":
-  "integrity" "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
-  "resolved" "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz"
-  "version" "3.0.0"
+normalize-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/normalize-path/-/normalize-path-1.0.0.tgz"
+  integrity sha512-7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA==
 
-"normalize-path@~3.0.0":
-  "integrity" "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
-  "resolved" "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz"
-  "version" "3.0.0"
-
-"normalize-range@^0.1.2":
-  "integrity" "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="
-  "resolved" "https://registry.npmmirror.com/normalize-range/-/normalize-range-0.1.2.tgz"
-  "version" "0.1.2"
-
-"normalize-url@^3.0.0":
-  "integrity" "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="
-  "resolved" "https://registry.npmmirror.com/normalize-url/-/normalize-url-3.3.0.tgz"
-  "version" "3.3.0"
-
-"normalize-url@1.9.1":
-  "integrity" "sha512-A48My/mtCklowHBlI8Fq2jFWK4tX4lJ5E6ytFsSOq1fzpvT0SQSgKhSg7lN5c2uYFOrUAOQp6zhhJnpp1eMloQ=="
-  "resolved" "https://registry.npmmirror.com/normalize-url/-/normalize-url-1.9.1.tgz"
-  "version" "1.9.1"
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmmirror.com/normalize-path/-/normalize-path-2.1.1.tgz"
+  integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
   dependencies:
-    "object-assign" "^4.0.1"
-    "prepend-http" "^1.0.0"
-    "query-string" "^4.1.0"
-    "sort-keys" "^1.0.0"
+    remove-trailing-separator "^1.0.1"
 
-"normalize-wheel@^1.0.1":
-  "integrity" "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
-  "resolved" "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz"
-  "version" "1.0.1"
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-"npm-run-path@^2.0.0":
-  "integrity" "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="
-  "resolved" "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-2.0.2.tgz"
-  "version" "2.0.2"
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.npmmirror.com/normalize-range/-/normalize-range-0.1.2.tgz"
+  integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
+
+normalize-url@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.npmmirror.com/normalize-url/-/normalize-url-3.3.0.tgz"
+  integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
+
+normalize-url@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.npmmirror.com/normalize-url/-/normalize-url-1.9.1.tgz"
+  integrity sha512-A48My/mtCklowHBlI8Fq2jFWK4tX4lJ5E6ytFsSOq1fzpvT0SQSgKhSg7lN5c2uYFOrUAOQp6zhhJnpp1eMloQ==
   dependencies:
-    "path-key" "^2.0.0"
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
 
-"npm-run-path@^4.0.0":
-  "integrity" "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="
-  "resolved" "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz"
-  "version" "4.0.1"
+normalize-wheel@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz"
+  integrity sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-2.0.2.tgz"
+  integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==
   dependencies:
-    "path-key" "^3.0.0"
+    path-key "^2.0.0"
 
-"npm-run-path@^4.0.1":
-  "integrity" "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="
-  "resolved" "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz"
-  "version" "4.0.1"
+npm-run-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
-    "path-key" "^3.0.0"
+    path-key "^3.0.0"
 
-"nprogress@0.2.0":
-  "integrity" "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA=="
-  "resolved" "https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz"
-  "version" "0.2.0"
-
-"nth-check@^1.0.2":
-  "integrity" "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="
-  "resolved" "https://registry.npmmirror.com/nth-check/-/nth-check-1.0.2.tgz"
-  "version" "1.0.2"
+npm-run-path@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
-    "boolbase" "~1.0.0"
+    path-key "^3.0.0"
 
-"nth-check@^2.0.1":
-  "integrity" "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="
-  "resolved" "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz"
-  "version" "2.1.1"
+nprogress@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz"
+  integrity sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==
+
+nth-check@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/nth-check/-/nth-check-1.0.2.tgz"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
   dependencies:
-    "boolbase" "^1.0.0"
+    boolbase "~1.0.0"
 
-"num2fraction@^1.2.2":
-  "integrity" "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg=="
-  "resolved" "https://registry.npmmirror.com/num2fraction/-/num2fraction-1.2.2.tgz"
-  "version" "1.2.2"
-
-"nzh@^1.0.8":
-  "integrity" "sha512-Hmx1wuoj5zoFCEhfic4zW/2csg/vb5BxXAUGUNIyBlSu7ZtZezGVGloqNCnRcHVU1fMC9ZTfvbi6ayPWC1sRSQ=="
-  "resolved" "https://registry.npmmirror.com/nzh/-/nzh-1.0.11.tgz"
-  "version" "1.0.11"
-
-"oauth-sign@~0.9.0":
-  "integrity" "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-  "resolved" "https://registry.npmmirror.com/oauth-sign/-/oauth-sign-0.9.0.tgz"
-  "version" "0.9.0"
-
-"object-assign@^4.0.1", "object-assign@^4.1.0", "object-assign@^4.1.1":
-  "integrity" "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-  "resolved" "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz"
-  "version" "4.1.1"
-
-"object-copy@^0.1.0":
-  "integrity" "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ=="
-  "resolved" "https://registry.npmmirror.com/object-copy/-/object-copy-0.1.0.tgz"
-  "version" "0.1.0"
+nth-check@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz"
+  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
   dependencies:
-    "copy-descriptor" "^0.1.0"
-    "define-property" "^0.2.5"
-    "kind-of" "^3.0.3"
+    boolbase "^1.0.0"
 
-"object-hash@^1.1.4":
-  "integrity" "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="
-  "resolved" "https://registry.npmmirror.com/object-hash/-/object-hash-1.3.1.tgz"
-  "version" "1.3.1"
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/num2fraction/-/num2fraction-1.2.2.tgz"
+  integrity sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==
 
-"object-inspect@^1.12.2", "object-inspect@^1.13.1", "object-inspect@^1.9.0":
-  "integrity" "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
-  "resolved" "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.1.tgz"
-  "version" "1.13.1"
+nzh@^1.0.8:
+  version "1.0.11"
+  resolved "https://registry.npmmirror.com/nzh/-/nzh-1.0.11.tgz"
+  integrity sha512-Hmx1wuoj5zoFCEhfic4zW/2csg/vb5BxXAUGUNIyBlSu7ZtZezGVGloqNCnRcHVU1fMC9ZTfvbi6ayPWC1sRSQ==
 
-"object-is@^1.0.1":
-  "integrity" "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="
-  "resolved" "https://registry.npmmirror.com/object-is/-/object-is-1.1.5.tgz"
-  "version" "1.1.5"
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.npmmirror.com/oauth-sign/-/oauth-sign-0.9.0.tgz"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz"
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.npmmirror.com/object-copy/-/object-copy-0.1.0.tgz"
+  integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.1.3"
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
 
-"object-keys@^1.1.1":
-  "integrity" "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-  "resolved" "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz"
-  "version" "1.1.1"
+object-hash@^1.1.4:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/object-hash/-/object-hash-1.3.1.tgz"
+  integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
 
-"object-refs@^0.3.0":
-  "integrity" "sha512-eP0ywuoWOaDoiake/6kTJlPJhs+k0qNm4nYRzXLNHj6vh+5M3i9R1epJTdxIPGlhWc4fNRQ7a6XJNCX+/L4FOQ=="
-  "resolved" "https://registry.npmmirror.com/object-refs/-/object-refs-0.3.0.tgz"
-  "version" "0.3.0"
+object-inspect@^1.12.2, object-inspect@^1.12.3, object-inspect@^1.9.0:
+  version "1.12.3"
+  resolved "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz"
+  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
 
-"object-visit@^1.0.0":
-  "integrity" "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA=="
-  "resolved" "https://registry.npmmirror.com/object-visit/-/object-visit-1.0.1.tgz"
-  "version" "1.0.1"
+object-is@^1.0.1:
+  version "1.1.5"
+  resolved "https://registry.npmmirror.com/object-is/-/object-is-1.1.5.tgz"
+  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
   dependencies:
-    "isobject" "^3.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
 
-"object.assign@^4.1.0", "object.assign@^4.1.2", "object.assign@^4.1.4":
-  "integrity" "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="
-  "resolved" "https://registry.npmmirror.com/object.assign/-/object.assign-4.1.4.tgz"
-  "version" "4.1.4"
+object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object-refs@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmmirror.com/object-refs/-/object-refs-0.3.0.tgz"
+  integrity sha512-eP0ywuoWOaDoiake/6kTJlPJhs+k0qNm4nYRzXLNHj6vh+5M3i9R1epJTdxIPGlhWc4fNRQ7a6XJNCX+/L4FOQ==
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/object-visit/-/object-visit-1.0.1.tgz"
+  integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.1.4"
-    "has-symbols" "^1.0.3"
-    "object-keys" "^1.1.1"
+    isobject "^3.0.0"
 
-"object.entries@^1.1.2":
-  "integrity" "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA=="
-  "resolved" "https://registry.npmmirror.com/object.entries/-/object.entries-1.1.7.tgz"
-  "version" "1.1.7"
+object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.npmmirror.com/object.assign/-/object.assign-4.1.4.tgz"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
+    object-keys "^1.1.1"
 
-"object.fromentries@^2.0.7":
-  "integrity" "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA=="
-  "resolved" "https://registry.npmmirror.com/object.fromentries/-/object.fromentries-2.0.7.tgz"
-  "version" "2.0.7"
+object.entries@^1.1.2:
+  version "1.1.6"
+  resolved "https://registry.npmmirror.com/object.entries/-/object.entries-1.1.6.tgz"
+  integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-"object.getownpropertydescriptors@^2.0.3", "object.getownpropertydescriptors@^2.1.0":
-  "integrity" "sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g=="
-  "resolved" "https://registry.npmmirror.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz"
-  "version" "2.1.7"
+object.getownpropertydescriptors@^2.0.3:
+  version "2.1.6"
+  resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz"
+  integrity sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==
   dependencies:
-    "array.prototype.reduce" "^1.0.6"
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "safe-array-concat" "^1.0.0"
+    array.prototype.reduce "^1.0.5"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.21.2"
+    safe-array-concat "^1.0.0"
 
-"object.groupby@^1.0.1":
-  "integrity" "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ=="
-  "resolved" "https://registry.npmmirror.com/object.groupby/-/object.groupby-1.0.1.tgz"
-  "version" "1.0.1"
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npmmirror.com/object.pick/-/object.pick-1.3.0.tgz"
+  integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "get-intrinsic" "^1.2.1"
+    isobject "^3.0.1"
 
-"object.pick@^1.3.0":
-  "integrity" "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="
-  "resolved" "https://registry.npmmirror.com/object.pick/-/object.pick-1.3.0.tgz"
-  "version" "1.3.0"
+object.values@^1.1.0, object.values@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.npmmirror.com/object.values/-/object.values-1.1.6.tgz"
+  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
   dependencies:
-    "isobject" "^3.0.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-"object.values@^1.1.0", "object.values@^1.1.7":
-  "integrity" "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng=="
-  "resolved" "https://registry.npmmirror.com/object.values/-/object.values-1.1.7.tgz"
-  "version" "1.1.7"
+obuf@^1.0.0, obuf@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/obuf/-/obuf-1.1.2.tgz"
+  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
+
+omelette@0.4.5:
+  version "0.4.5"
+  resolved "https://registry.npmmirror.com/omelette/-/omelette-0.4.5.tgz"
+  integrity sha512-b0k9uqwF60u15KmVkneVw96VYRtZu2QCbXUQ26SgdyVUgMBzctzIfhNPKAWl4oqJEKpe52CzBYSS+HIKtiK8sw==
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/on-finished/-/on-finished-2.3.0.tgz"
+  integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    ee-first "1.1.1"
 
-"obuf@^1.0.0", "obuf@^1.1.2":
-  "integrity" "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
-  "resolved" "https://registry.npmmirror.com/obuf/-/obuf-1.1.2.tgz"
-  "version" "1.1.2"
-
-"omelette@0.4.5":
-  "integrity" "sha512-b0k9uqwF60u15KmVkneVw96VYRtZu2QCbXUQ26SgdyVUgMBzctzIfhNPKAWl4oqJEKpe52CzBYSS+HIKtiK8sw=="
-  "resolved" "https://registry.npmmirror.com/omelette/-/omelette-0.4.5.tgz"
-  "version" "0.4.5"
-
-"on-finished@~2.3.0":
-  "integrity" "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="
-  "resolved" "https://registry.npmmirror.com/on-finished/-/on-finished-2.3.0.tgz"
-  "version" "2.3.0"
+on-finished@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz"
+  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
   dependencies:
-    "ee-first" "1.1.1"
+    ee-first "1.1.1"
 
-"on-finished@2.4.1":
-  "integrity" "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="
-  "resolved" "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz"
-  "version" "2.4.1"
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/on-headers/-/on-headers-1.0.2.tgz"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/once/-/once-1.4.0.tgz"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
-    "ee-first" "1.1.1"
+    wrappy "1"
 
-"on-headers@~1.0.2":
-  "integrity" "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
-  "resolved" "https://registry.npmmirror.com/on-headers/-/on-headers-1.0.2.tgz"
-  "version" "1.0.2"
-
-"once@^1.3.0", "once@^1.3.1", "once@^1.4.0":
-  "integrity" "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="
-  "resolved" "https://registry.npmmirror.com/once/-/once-1.4.0.tgz"
-  "version" "1.4.0"
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/onetime/-/onetime-2.0.1.tgz"
+  integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==
   dependencies:
-    "wrappy" "1"
+    mimic-fn "^1.0.0"
 
-"onetime@^2.0.0":
-  "integrity" "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ=="
-  "resolved" "https://registry.npmmirror.com/onetime/-/onetime-2.0.1.tgz"
-  "version" "2.0.1"
+onetime@^5.1.0, onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
-    "mimic-fn" "^1.0.0"
+    mimic-fn "^2.1.0"
 
-"onetime@^5.1.0":
-  "integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="
-  "resolved" "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz"
-  "version" "5.1.2"
+open@^6.3.0:
+  version "6.4.0"
+  resolved "https://registry.npmmirror.com/open/-/open-6.4.0.tgz"
+  integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
   dependencies:
-    "mimic-fn" "^2.1.0"
+    is-wsl "^1.1.0"
 
-"onetime@^5.1.2":
-  "integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="
-  "resolved" "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz"
-  "version" "5.1.2"
+opener@^1.5.1:
+  version "1.5.2"
+  resolved "https://registry.npmmirror.com/opener/-/opener-1.5.2.tgz"
+  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
+
+opn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.npmmirror.com/opn/-/opn-5.5.0.tgz"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
   dependencies:
-    "mimic-fn" "^2.1.0"
+    is-wsl "^1.1.0"
 
-"open@^6.3.0":
-  "integrity" "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="
-  "resolved" "https://registry.npmmirror.com/open/-/open-6.4.0.tgz"
-  "version" "6.4.0"
+optionator@^0.8.3:
+  version "0.8.3"
+  resolved "https://registry.npmmirror.com/optionator/-/optionator-0.8.3.tgz"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   dependencies:
-    "is-wsl" "^1.1.0"
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
 
-"opener@^1.5.1":
-  "integrity" "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="
-  "resolved" "https://registry.npmmirror.com/opener/-/opener-1.5.2.tgz"
-  "version" "1.5.2"
-
-"opn@^5.5.0":
-  "integrity" "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="
-  "resolved" "https://registry.npmmirror.com/opn/-/opn-5.5.0.tgz"
-  "version" "5.5.0"
+ora@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.npmmirror.com/ora/-/ora-3.4.0.tgz"
+  integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==
   dependencies:
-    "is-wsl" "^1.1.0"
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-spinners "^2.0.0"
+    log-symbols "^2.2.0"
+    strip-ansi "^5.2.0"
+    wcwidth "^1.0.1"
 
-"optionator@^0.8.3":
-  "integrity" "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="
-  "resolved" "https://registry.npmmirror.com/optionator/-/optionator-0.8.3.tgz"
-  "version" "0.8.3"
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmmirror.com/os-browserify/-/os-browserify-0.3.0.tgz"
+  integrity sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==
+
+os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/p-finally/-/p-finally-1.0.0.tgz"
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
+
+p-finally@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/p-finally/-/p-finally-2.0.1.tgz"
+  integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
+
+p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
-    "deep-is" "~0.1.3"
-    "fast-levenshtein" "~2.0.6"
-    "levn" "~0.3.0"
-    "prelude-ls" "~1.1.2"
-    "type-check" "~0.3.2"
-    "word-wrap" "~1.2.3"
+    p-try "^2.0.0"
 
-"ora@^3.4.0":
-  "integrity" "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="
-  "resolved" "https://registry.npmmirror.com/ora/-/ora-3.4.0.tgz"
-  "version" "3.4.0"
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/p-limit/-/p-limit-3.1.0.tgz"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
-    "chalk" "^2.4.2"
-    "cli-cursor" "^2.1.0"
-    "cli-spinners" "^2.0.0"
-    "log-symbols" "^2.2.0"
-    "strip-ansi" "^5.2.0"
-    "wcwidth" "^1.0.1"
+    yocto-queue "^0.1.0"
 
-"os-browserify@^0.3.0":
-  "integrity" "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A=="
-  "resolved" "https://registry.npmmirror.com/os-browserify/-/os-browserify-0.3.0.tgz"
-  "version" "0.3.0"
-
-"os-tmpdir@~1.0.2":
-  "integrity" "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="
-  "resolved" "https://registry.npmmirror.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
-  "version" "1.0.2"
-
-"p-finally@^1.0.0":
-  "integrity" "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="
-  "resolved" "https://registry.npmmirror.com/p-finally/-/p-finally-1.0.0.tgz"
-  "version" "1.0.0"
-
-"p-finally@^2.0.0":
-  "integrity" "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="
-  "resolved" "https://registry.npmmirror.com/p-finally/-/p-finally-2.0.1.tgz"
-  "version" "2.0.1"
-
-"p-limit@^2.0.0", "p-limit@^2.2.0", "p-limit@^2.2.1":
-  "integrity" "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="
-  "resolved" "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz"
-  "version" "2.3.0"
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/p-locate/-/p-locate-3.0.0.tgz"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
   dependencies:
-    "p-try" "^2.0.0"
+    p-limit "^2.0.0"
 
-"p-limit@^3.0.2":
-  "integrity" "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="
-  "resolved" "https://registry.npmmirror.com/p-limit/-/p-limit-3.1.0.tgz"
-  "version" "3.1.0"
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
   dependencies:
-    "yocto-queue" "^0.1.0"
+    p-limit "^2.2.0"
 
-"p-locate@^3.0.0":
-  "integrity" "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="
-  "resolved" "https://registry.npmmirror.com/p-locate/-/p-locate-3.0.0.tgz"
-  "version" "3.0.0"
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/p-map/-/p-map-2.1.0.tgz"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
+
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/p-map/-/p-map-4.0.0.tgz"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
   dependencies:
-    "p-limit" "^2.0.0"
+    aggregate-error "^3.0.0"
 
-"p-locate@^4.1.0":
-  "integrity" "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="
-  "resolved" "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz"
-  "version" "4.1.0"
+p-retry@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmmirror.com/p-retry/-/p-retry-3.0.1.tgz"
+  integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
   dependencies:
-    "p-limit" "^2.2.0"
+    retry "^0.12.0"
 
-"p-map@^2.0.0":
-  "integrity" "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="
-  "resolved" "https://registry.npmmirror.com/p-map/-/p-map-2.1.0.tgz"
-  "version" "2.1.0"
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-"p-map@^4.0.0":
-  "integrity" "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="
-  "resolved" "https://registry.npmmirror.com/p-map/-/p-map-4.0.0.tgz"
-  "version" "4.0.0"
+pako@~1.0.5:
+  version "1.0.11"
+  resolved "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
+parallel-transform@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/parallel-transform/-/parallel-transform-1.2.0.tgz"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
   dependencies:
-    "aggregate-error" "^3.0.0"
+    cyclist "^1.0.1"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
 
-"p-retry@^3.0.1":
-  "integrity" "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w=="
-  "resolved" "https://registry.npmmirror.com/p-retry/-/p-retry-3.0.1.tgz"
-  "version" "3.0.1"
+param-case@2.1.x:
+  version "2.1.1"
+  resolved "https://registry.npmmirror.com/param-case/-/param-case-2.1.1.tgz"
+  integrity sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==
   dependencies:
-    "retry" "^0.12.0"
+    no-case "^2.2.0"
 
-"p-try@^2.0.0":
-  "integrity" "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-  "resolved" "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz"
-  "version" "2.2.0"
+parchment@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmmirror.com/parchment/-/parchment-1.1.4.tgz"
+  integrity sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==
 
-"pako@~1.0.5":
-  "integrity" "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
-  "resolved" "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz"
-  "version" "1.0.11"
-
-"parallel-transform@^1.1.0":
-  "integrity" "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg=="
-  "resolved" "https://registry.npmmirror.com/parallel-transform/-/parallel-transform-1.2.0.tgz"
-  "version" "1.2.0"
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
   dependencies:
-    "cyclist" "^1.0.1"
-    "inherits" "^2.0.3"
-    "readable-stream" "^2.1.5"
+    callsites "^3.0.0"
 
-"param-case@2.1.x":
-  "integrity" "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w=="
-  "resolved" "https://registry.npmmirror.com/param-case/-/param-case-2.1.1.tgz"
-  "version" "2.1.1"
+parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+  version "5.1.6"
+  resolved "https://registry.npmmirror.com/parse-asn1/-/parse-asn1-5.1.6.tgz"
+  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
   dependencies:
-    "no-case" "^2.2.0"
+    asn1.js "^5.2.0"
+    browserify-aes "^1.0.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
 
-"parchment@^1.1.4":
-  "integrity" "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
-  "resolved" "https://registry.npmmirror.com/parchment/-/parchment-1.1.4.tgz"
-  "version" "1.1.4"
+parse-headers@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.npmmirror.com/parse-headers/-/parse-headers-2.0.5.tgz"
+  integrity sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA==
 
-"parent-module@^1.0.0":
-  "integrity" "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="
-  "resolved" "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz"
-  "version" "1.0.1"
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/parse-json/-/parse-json-4.0.0.tgz"
+  integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==
   dependencies:
-    "callsites" "^3.0.0"
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
 
-"parse-asn1@^5.0.0", "parse-asn1@^5.1.6":
-  "integrity" "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="
-  "resolved" "https://registry.npmmirror.com/parse-asn1/-/parse-asn1-5.1.6.tgz"
-  "version" "5.1.6"
-  dependencies:
-    "asn1.js" "^5.2.0"
-    "browserify-aes" "^1.0.0"
-    "evp_bytestokey" "^1.0.0"
-    "pbkdf2" "^3.0.3"
-    "safe-buffer" "^5.1.1"
-
-"parse-headers@^2.0.0":
-  "integrity" "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA=="
-  "resolved" "https://registry.npmmirror.com/parse-headers/-/parse-headers-2.0.5.tgz"
-  "version" "2.0.5"
-
-"parse-json@^4.0.0":
-  "integrity" "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw=="
-  "resolved" "https://registry.npmmirror.com/parse-json/-/parse-json-4.0.0.tgz"
-  "version" "4.0.0"
-  dependencies:
-    "error-ex" "^1.3.1"
-    "json-parse-better-errors" "^1.0.1"
-
-"parse-json@^5.0.0":
-  "integrity" "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="
-  "resolved" "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz"
-  "version" "5.2.0"
+parse-json@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "error-ex" "^1.3.1"
-    "json-parse-even-better-errors" "^2.3.0"
-    "lines-and-columns" "^1.1.6"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
 
-"parse5-htmlparser2-tree-adapter@^6.0.0":
-  "integrity" "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA=="
-  "resolved" "https://registry.npmmirror.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"
-  "version" "6.0.1"
+parse5-htmlparser2-tree-adapter@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.npmmirror.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"
+  integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
   dependencies:
-    "parse5" "^6.0.1"
+    parse5 "^6.0.1"
 
-"parse5@^5.1.1":
-  "integrity" "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="
-  "resolved" "https://registry.npmmirror.com/parse5/-/parse5-5.1.1.tgz"
-  "version" "5.1.1"
+parse5@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmmirror.com/parse5/-/parse5-5.1.1.tgz"
+  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
 
-"parse5@^6.0.1":
-  "integrity" "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
-  "resolved" "https://registry.npmmirror.com/parse5/-/parse5-6.0.1.tgz"
-  "version" "6.0.1"
+parse5@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmmirror.com/parse5/-/parse5-6.0.1.tgz"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-"parseurl@~1.3.2", "parseurl@~1.3.3":
-  "integrity" "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-  "resolved" "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz"
-  "version" "1.3.3"
+parseurl@~1.3.2, parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
-"pascalcase@^0.1.1":
-  "integrity" "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw=="
-  "resolved" "https://registry.npmmirror.com/pascalcase/-/pascalcase-0.1.1.tgz"
-  "version" "0.1.1"
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npmmirror.com/pascalcase/-/pascalcase-0.1.1.tgz"
+  integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
 
-"path-browserify@0.0.1":
-  "integrity" "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="
-  "resolved" "https://registry.npmmirror.com/path-browserify/-/path-browserify-0.0.1.tgz"
-  "version" "0.0.1"
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npmmirror.com/path-browserify/-/path-browserify-0.0.1.tgz"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
 
-"path-dirname@^1.0.0":
-  "integrity" "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q=="
-  "resolved" "https://registry.npmmirror.com/path-dirname/-/path-dirname-1.0.2.tgz"
-  "version" "1.0.2"
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/path-dirname/-/path-dirname-1.0.2.tgz"
+  integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==
 
-"path-exists@^2.0.0":
-  "integrity" "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ=="
-  "resolved" "https://registry.npmmirror.com/path-exists/-/path-exists-2.1.0.tgz"
-  "version" "2.1.0"
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/path-exists/-/path-exists-2.1.0.tgz"
+  integrity sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==
   dependencies:
-    "pinkie-promise" "^2.0.0"
+    pinkie-promise "^2.0.0"
 
-"path-exists@^3.0.0":
-  "integrity" "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="
-  "resolved" "https://registry.npmmirror.com/path-exists/-/path-exists-3.0.0.tgz"
-  "version" "3.0.0"
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/path-exists/-/path-exists-3.0.0.tgz"
+  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
 
-"path-exists@^4.0.0":
-  "integrity" "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-  "resolved" "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz"
-  "version" "4.0.0"
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-"path-intersection@^2.2.1":
-  "integrity" "sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA=="
-  "resolved" "https://registry.npmmirror.com/path-intersection/-/path-intersection-2.2.1.tgz"
-  "version" "2.2.1"
+path-intersection@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.npmmirror.com/path-intersection/-/path-intersection-2.2.1.tgz"
+  integrity sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==
 
-"path-is-absolute@^1.0.0":
-  "integrity" "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
-  "resolved" "https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-  "version" "1.0.1"
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-"path-is-inside@^1.0.2":
-  "integrity" "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w=="
-  "resolved" "https://registry.npmmirror.com/path-is-inside/-/path-is-inside-1.0.2.tgz"
-  "version" "1.0.2"
+path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/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":
-  "integrity" "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="
-  "resolved" "https://registry.npmmirror.com/path-key/-/path-key-2.0.1.tgz"
-  "version" "2.0.1"
+path-key@^2.0.0, 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==
 
-"path-key@^3.0.0", "path-key@^3.1.0":
-  "integrity" "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-  "resolved" "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz"
-  "version" "3.1.1"
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-"path-parse@^1.0.7":
-  "integrity" "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-  "resolved" "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz"
-  "version" "1.0.7"
+path-parse@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-"path-to-regexp@0.1.7":
-  "integrity" "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
-  "resolved" "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
-  "version" "0.1.7"
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
+  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
-"path-type@^3.0.0":
-  "integrity" "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="
-  "resolved" "https://registry.npmmirror.com/path-type/-/path-type-3.0.0.tgz"
-  "version" "3.0.0"
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/path-type/-/path-type-3.0.0.tgz"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
-    "pify" "^3.0.0"
+    pify "^3.0.0"
 
-"pbkdf2@^3.0.3":
-  "integrity" "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="
-  "resolved" "https://registry.npmmirror.com/pbkdf2/-/pbkdf2-3.1.2.tgz"
-  "version" "3.1.2"
+pbkdf2@^3.0.3:
+  version "3.1.2"
+  resolved "https://registry.npmmirror.com/pbkdf2/-/pbkdf2-3.1.2.tgz"
+  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
   dependencies:
-    "create-hash" "^1.1.2"
-    "create-hmac" "^1.1.4"
-    "ripemd160" "^2.0.1"
-    "safe-buffer" "^5.0.1"
-    "sha.js" "^2.4.8"
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
 
-"performance-now@^2.1.0":
-  "integrity" "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
-  "resolved" "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz"
-  "version" "2.1.0"
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz"
+  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
-"picocolors@^0.2.1":
-  "integrity" "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-  "resolved" "https://registry.npmmirror.com/picocolors/-/picocolors-0.2.1.tgz"
-  "version" "0.2.1"
+picocolors@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.npmmirror.com/picocolors/-/picocolors-0.2.1.tgz"
+  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
-"picocolors@^1.0.0":
-  "integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-  "resolved" "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz"
-  "version" "1.0.0"
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-"picomatch@^2.0.4", "picomatch@^2.2.1", "picomatch@^2.3.1":
-  "integrity" "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
-  "resolved" "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz"
-  "version" "2.3.1"
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-"pidtree@^0.5.0":
-  "integrity" "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA=="
-  "resolved" "https://registry.npmmirror.com/pidtree/-/pidtree-0.5.0.tgz"
-  "version" "0.5.0"
+pidtree@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.npmmirror.com/pidtree/-/pidtree-0.5.0.tgz"
+  integrity sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==
 
-"pify@^2.0.0":
-  "integrity" "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
-  "resolved" "https://registry.npmmirror.com/pify/-/pify-2.3.0.tgz"
-  "version" "2.3.0"
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/pify/-/pify-2.3.0.tgz"
+  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
-"pify@^3.0.0":
-  "integrity" "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="
-  "resolved" "https://registry.npmmirror.com/pify/-/pify-3.0.0.tgz"
-  "version" "3.0.0"
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/pify/-/pify-3.0.0.tgz"
+  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
-"pify@^4.0.1":
-  "integrity" "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-  "resolved" "https://registry.npmmirror.com/pify/-/pify-4.0.1.tgz"
-  "version" "4.0.1"
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/pify/-/pify-4.0.1.tgz"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-"pinkie-promise@^2.0.0":
-  "integrity" "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw=="
-  "resolved" "https://registry.npmmirror.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-  "version" "2.0.1"
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
+  integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==
   dependencies:
-    "pinkie" "^2.0.0"
+    pinkie "^2.0.0"
 
-"pinkie@^2.0.0":
-  "integrity" "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg=="
-  "resolved" "https://registry.npmmirror.com/pinkie/-/pinkie-2.0.4.tgz"
-  "version" "2.0.4"
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.npmmirror.com/pinkie/-/pinkie-2.0.4.tgz"
+  integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
 
-"pkcs7@^0.2.3":
-  "integrity" "sha512-kJRwmADEQUg+qJyRgWLtpEL9q9cFjZschejTEK3GRjKvnsU9G5WWoe/wKqRgbBoqWdVSeTUKP6vIA3Y72M3rWA=="
-  "resolved" "https://registry.npmmirror.com/pkcs7/-/pkcs7-0.2.3.tgz"
-  "version" "0.2.3"
+pkcs7@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.npmmirror.com/pkcs7/-/pkcs7-0.2.3.tgz"
+  integrity sha512-kJRwmADEQUg+qJyRgWLtpEL9q9cFjZschejTEK3GRjKvnsU9G5WWoe/wKqRgbBoqWdVSeTUKP6vIA3Y72M3rWA==
 
-"pkcs7@^1.0.4":
-  "integrity" "sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ=="
-  "resolved" "https://registry.npmmirror.com/pkcs7/-/pkcs7-1.0.4.tgz"
-  "version" "1.0.4"
+pkcs7@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/pkcs7/-/pkcs7-1.0.4.tgz"
+  integrity sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==
   dependencies:
     "@babel/runtime" "^7.5.5"
 
-"pkg-dir@^1.0.0":
-  "integrity" "sha512-c6pv3OE78mcZ92ckebVDqg0aWSoKhOTbwCV6qbCWMk546mAL9pZln0+QsN/yQ7fkucd4+yJPLrCBXNt8Ruk+Eg=="
-  "resolved" "https://registry.npmmirror.com/pkg-dir/-/pkg-dir-1.0.0.tgz"
-  "version" "1.0.0"
+pkg-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/pkg-dir/-/pkg-dir-1.0.0.tgz"
+  integrity sha512-c6pv3OE78mcZ92ckebVDqg0aWSoKhOTbwCV6qbCWMk546mAL9pZln0+QsN/yQ7fkucd4+yJPLrCBXNt8Ruk+Eg==
   dependencies:
-    "find-up" "^1.0.0"
+    find-up "^1.0.0"
 
-"pkg-dir@^3.0.0":
-  "integrity" "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="
-  "resolved" "https://registry.npmmirror.com/pkg-dir/-/pkg-dir-3.0.0.tgz"
-  "version" "3.0.0"
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/pkg-dir/-/pkg-dir-3.0.0.tgz"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
   dependencies:
-    "find-up" "^3.0.0"
+    find-up "^3.0.0"
 
-"pkg-dir@^4.1.0":
-  "integrity" "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="
-  "resolved" "https://registry.npmmirror.com/pkg-dir/-/pkg-dir-4.2.0.tgz"
-  "version" "4.2.0"
+pkg-dir@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.npmmirror.com/pkg-dir/-/pkg-dir-4.2.0.tgz"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
   dependencies:
-    "find-up" "^4.0.0"
+    find-up "^4.0.0"
 
-"pnp-webpack-plugin@^1.6.4":
-  "integrity" "sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg=="
-  "resolved" "https://registry.npmmirror.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz"
-  "version" "1.7.0"
+pnp-webpack-plugin@^1.6.4:
+  version "1.7.0"
+  resolved "https://registry.npmmirror.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz"
+  integrity sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==
   dependencies:
-    "ts-pnp" "^1.1.6"
-
-"portfinder@^1.0.26":
-  "integrity" "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg=="
-  "resolved" "https://registry.npmmirror.com/portfinder/-/portfinder-1.0.32.tgz"
-  "version" "1.0.32"
-  dependencies:
-    "async" "^2.6.4"
-    "debug" "^3.2.7"
-    "mkdirp" "^0.5.6"
-
-"posix-character-classes@^0.1.0":
-  "integrity" "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="
-  "resolved" "https://registry.npmmirror.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"
-  "version" "0.1.1"
-
-"postcss-calc@^7.0.1":
-  "integrity" "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg=="
-  "resolved" "https://registry.npmmirror.com/postcss-calc/-/postcss-calc-7.0.5.tgz"
-  "version" "7.0.5"
-  dependencies:
-    "postcss" "^7.0.27"
-    "postcss-selector-parser" "^6.0.2"
-    "postcss-value-parser" "^4.0.2"
-
-"postcss-colormin@^4.0.3":
-  "integrity" "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="
-  "resolved" "https://registry.npmmirror.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz"
-  "version" "4.0.3"
-  dependencies:
-    "browserslist" "^4.0.0"
-    "color" "^3.0.0"
-    "has" "^1.0.0"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-convert-values@^4.0.1":
-  "integrity" "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="
-  "resolved" "https://registry.npmmirror.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"
-  "version" "4.0.1"
-  dependencies:
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-discard-comments@^4.0.2":
-  "integrity" "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="
-  "resolved" "https://registry.npmmirror.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "postcss" "^7.0.0"
-
-"postcss-discard-duplicates@^4.0.2":
-  "integrity" "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="
-  "resolved" "https://registry.npmmirror.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "postcss" "^7.0.0"
-
-"postcss-discard-empty@^4.0.1":
-  "integrity" "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="
-  "resolved" "https://registry.npmmirror.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"
-  "version" "4.0.1"
-  dependencies:
-    "postcss" "^7.0.0"
-
-"postcss-discard-overridden@^4.0.1":
-  "integrity" "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="
-  "resolved" "https://registry.npmmirror.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"
-  "version" "4.0.1"
-  dependencies:
-    "postcss" "^7.0.0"
-
-"postcss-load-config@^2.0.0":
-  "integrity" "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw=="
-  "resolved" "https://registry.npmmirror.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz"
-  "version" "2.1.2"
-  dependencies:
-    "cosmiconfig" "^5.0.0"
-    "import-cwd" "^2.0.0"
-
-"postcss-loader@^3.0.0":
-  "integrity" "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA=="
-  "resolved" "https://registry.npmmirror.com/postcss-loader/-/postcss-loader-3.0.0.tgz"
-  "version" "3.0.0"
-  dependencies:
-    "loader-utils" "^1.1.0"
-    "postcss" "^7.0.0"
-    "postcss-load-config" "^2.0.0"
-    "schema-utils" "^1.0.0"
-
-"postcss-merge-longhand@^4.0.11":
-  "integrity" "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="
-  "resolved" "https://registry.npmmirror.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"
-  "version" "4.0.11"
-  dependencies:
-    "css-color-names" "0.0.4"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-    "stylehacks" "^4.0.0"
-
-"postcss-merge-rules@^4.0.3":
-  "integrity" "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="
-  "resolved" "https://registry.npmmirror.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"
-  "version" "4.0.3"
-  dependencies:
-    "browserslist" "^4.0.0"
-    "caniuse-api" "^3.0.0"
-    "cssnano-util-same-parent" "^4.0.0"
-    "postcss" "^7.0.0"
-    "postcss-selector-parser" "^3.0.0"
-    "vendors" "^1.0.0"
-
-"postcss-minify-font-values@^4.0.2":
-  "integrity" "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="
-  "resolved" "https://registry.npmmirror.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-minify-gradients@^4.0.2":
-  "integrity" "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="
-  "resolved" "https://registry.npmmirror.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "cssnano-util-get-arguments" "^4.0.0"
-    "is-color-stop" "^1.0.0"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-minify-params@^4.0.2":
-  "integrity" "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="
-  "resolved" "https://registry.npmmirror.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "alphanum-sort" "^1.0.0"
-    "browserslist" "^4.0.0"
-    "cssnano-util-get-arguments" "^4.0.0"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-    "uniqs" "^2.0.0"
-
-"postcss-minify-selectors@^4.0.2":
-  "integrity" "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="
-  "resolved" "https://registry.npmmirror.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "alphanum-sort" "^1.0.0"
-    "has" "^1.0.0"
-    "postcss" "^7.0.0"
-    "postcss-selector-parser" "^3.0.0"
-
-"postcss-modules-extract-imports@^2.0.0":
-  "integrity" "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="
-  "resolved" "https://registry.npmmirror.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz"
-  "version" "2.0.0"
-  dependencies:
-    "postcss" "^7.0.5"
-
-"postcss-modules-local-by-default@^3.0.2":
-  "integrity" "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw=="
-  "resolved" "https://registry.npmmirror.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"
-  "version" "3.0.3"
-  dependencies:
-    "icss-utils" "^4.1.1"
-    "postcss" "^7.0.32"
-    "postcss-selector-parser" "^6.0.2"
-    "postcss-value-parser" "^4.1.0"
-
-"postcss-modules-scope@^2.2.0":
-  "integrity" "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ=="
-  "resolved" "https://registry.npmmirror.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"
-  "version" "2.2.0"
-  dependencies:
-    "postcss" "^7.0.6"
-    "postcss-selector-parser" "^6.0.0"
-
-"postcss-modules-values@^3.0.0":
-  "integrity" "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg=="
-  "resolved" "https://registry.npmmirror.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"
-  "version" "3.0.0"
-  dependencies:
-    "icss-utils" "^4.0.0"
-    "postcss" "^7.0.6"
-
-"postcss-normalize-charset@^4.0.1":
-  "integrity" "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="
-  "resolved" "https://registry.npmmirror.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"
-  "version" "4.0.1"
-  dependencies:
-    "postcss" "^7.0.0"
-
-"postcss-normalize-display-values@^4.0.2":
-  "integrity" "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="
-  "resolved" "https://registry.npmmirror.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "cssnano-util-get-match" "^4.0.0"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-normalize-positions@^4.0.2":
-  "integrity" "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="
-  "resolved" "https://registry.npmmirror.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "cssnano-util-get-arguments" "^4.0.0"
-    "has" "^1.0.0"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-normalize-repeat-style@^4.0.2":
-  "integrity" "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="
-  "resolved" "https://registry.npmmirror.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "cssnano-util-get-arguments" "^4.0.0"
-    "cssnano-util-get-match" "^4.0.0"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-normalize-string@^4.0.2":
-  "integrity" "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="
-  "resolved" "https://registry.npmmirror.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "has" "^1.0.0"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-normalize-timing-functions@^4.0.2":
-  "integrity" "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="
-  "resolved" "https://registry.npmmirror.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "cssnano-util-get-match" "^4.0.0"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-normalize-unicode@^4.0.1":
-  "integrity" "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="
-  "resolved" "https://registry.npmmirror.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"
-  "version" "4.0.1"
-  dependencies:
-    "browserslist" "^4.0.0"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-normalize-url@^4.0.1":
-  "integrity" "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="
-  "resolved" "https://registry.npmmirror.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"
-  "version" "4.0.1"
-  dependencies:
-    "is-absolute-url" "^2.0.0"
-    "normalize-url" "^3.0.0"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-normalize-whitespace@^4.0.2":
-  "integrity" "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="
-  "resolved" "https://registry.npmmirror.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-ordered-values@^4.1.2":
-  "integrity" "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="
-  "resolved" "https://registry.npmmirror.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"
-  "version" "4.1.2"
-  dependencies:
-    "cssnano-util-get-arguments" "^4.0.0"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-prefix-selector@^1.6.0":
-  "integrity" "sha512-rdVMIi7Q4B0XbXqNUEI+Z4E+pueiu/CS5E6vRCQommzdQ/sgsS4dK42U7GX8oJR+TJOtT+Qv3GkNo6iijUMp3Q=="
-  "resolved" "https://registry.npmmirror.com/postcss-prefix-selector/-/postcss-prefix-selector-1.16.0.tgz"
-  "version" "1.16.0"
-
-"postcss-reduce-initial@^4.0.3":
-  "integrity" "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="
-  "resolved" "https://registry.npmmirror.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"
-  "version" "4.0.3"
-  dependencies:
-    "browserslist" "^4.0.0"
-    "caniuse-api" "^3.0.0"
-    "has" "^1.0.0"
-    "postcss" "^7.0.0"
-
-"postcss-reduce-transforms@^4.0.2":
-  "integrity" "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="
-  "resolved" "https://registry.npmmirror.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"
-  "version" "4.0.2"
-  dependencies:
-    "cssnano-util-get-match" "^4.0.0"
-    "has" "^1.0.0"
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-
-"postcss-selector-parser@^3.0.0":
-  "integrity" "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="
-  "resolved" "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"
-  "version" "3.1.2"
-  dependencies:
-    "dot-prop" "^5.2.0"
-    "indexes-of" "^1.0.1"
-    "uniq" "^1.0.1"
-
-"postcss-selector-parser@^6.0.0", "postcss-selector-parser@^6.0.2", "postcss-selector-parser@^6.0.9":
-  "integrity" "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ=="
-  "resolved" "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz"
-  "version" "6.0.13"
-  dependencies:
-    "cssesc" "^3.0.0"
-    "util-deprecate" "^1.0.2"
-
-"postcss-svgo@^4.0.3":
-  "integrity" "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw=="
-  "resolved" "https://registry.npmmirror.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz"
-  "version" "4.0.3"
-  dependencies:
-    "postcss" "^7.0.0"
-    "postcss-value-parser" "^3.0.0"
-    "svgo" "^1.0.0"
-
-"postcss-unique-selectors@^4.0.1":
-  "integrity" "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="
-  "resolved" "https://registry.npmmirror.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"
-  "version" "4.0.1"
-  dependencies:
-    "alphanum-sort" "^1.0.0"
-    "postcss" "^7.0.0"
-    "uniqs" "^2.0.0"
-
-"postcss-value-parser@^3.0.0":
-  "integrity" "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-  "resolved" "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"
-  "version" "3.3.1"
-
-"postcss-value-parser@^4.0.2", "postcss-value-parser@^4.1.0":
-  "integrity" "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
-  "resolved" "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
-  "version" "4.2.0"
-
-"postcss@^5.2.17":
-  "integrity" "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz"
-  "version" "5.2.18"
-  dependencies:
-    "chalk" "^1.1.3"
-    "js-base64" "^2.1.9"
-    "source-map" "^0.5.6"
-    "supports-color" "^3.2.3"
-
-"postcss@^7.0.0":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^7.0.1":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^7.0.14":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^7.0.27":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^7.0.32":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^7.0.36":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^7.0.5":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^7.0.6":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^8.4.14", "postcss@^8.4.31", "postcss@>4 <9":
-  "integrity" "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.31.tgz"
-  "version" "8.4.31"
-  dependencies:
-    "nanoid" "^3.3.6"
-    "picocolors" "^1.0.0"
-    "source-map-js" "^1.0.2"
-
-"posthtml-parser@^0.2.0", "posthtml-parser@^0.2.1":
-  "integrity" "sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw=="
-  "resolved" "https://registry.npmmirror.com/posthtml-parser/-/posthtml-parser-0.2.1.tgz"
-  "version" "0.2.1"
-  dependencies:
-    "htmlparser2" "^3.8.3"
-    "isobject" "^2.1.0"
-
-"posthtml-rename-id@^1.0":
-  "integrity" "sha512-UKXf9OF/no8WZo9edRzvuMenb6AD5hDLzIepJW+a4oJT+T/Lx7vfMYWT4aWlGNQh0WMhnUx1ipN9OkZ9q+ddEw=="
-  "resolved" "https://registry.npmmirror.com/posthtml-rename-id/-/posthtml-rename-id-1.0.12.tgz"
-  "version" "1.0.12"
-  dependencies:
-    "escape-string-regexp" "1.0.5"
-
-"posthtml-render@^1.0.5", "posthtml-render@^1.0.6":
-  "integrity" "sha512-W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw=="
-  "resolved" "https://registry.npmmirror.com/posthtml-render/-/posthtml-render-1.4.0.tgz"
-  "version" "1.4.0"
-
-"posthtml-svg-mode@^1.0.3":
-  "integrity" "sha512-hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ=="
-  "resolved" "https://registry.npmmirror.com/posthtml-svg-mode/-/posthtml-svg-mode-1.0.3.tgz"
-  "version" "1.0.3"
-  dependencies:
-    "merge-options" "1.0.1"
-    "posthtml" "^0.9.2"
-    "posthtml-parser" "^0.2.1"
-    "posthtml-render" "^1.0.6"
-
-"posthtml@^0.9.2":
-  "integrity" "sha512-spBB5sgC4cv2YcW03f/IAUN1pgDJWNWD8FzkyY4mArLUMJW+KlQhlmUdKAHQuPfb00Jl5xIfImeOsf6YL8QK7Q=="
-  "resolved" "https://registry.npmmirror.com/posthtml/-/posthtml-0.9.2.tgz"
-  "version" "0.9.2"
-  dependencies:
-    "posthtml-parser" "^0.2.0"
-    "posthtml-render" "^1.0.5"
-
-"preact@^10.11.2":
-  "integrity" "sha512-mKUD7RRkQQM6s7Rkmi7IFkoEHjuFqRQUaXamO61E6Nn7vqF/bo7EZCmSyrUnp2UWHw0O7XjZ2eeXis+m7tf4lg=="
-  "resolved" "https://registry.npmmirror.com/preact/-/preact-10.18.1.tgz"
-  "version" "10.18.1"
-
-"prelude-ls@~1.1.2":
-  "integrity" "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
-  "resolved" "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.1.2.tgz"
-  "version" "1.1.2"
-
-"prepend-http@^1.0.0":
-  "integrity" "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg=="
-  "resolved" "https://registry.npmmirror.com/prepend-http/-/prepend-http-1.0.4.tgz"
-  "version" "1.0.4"
-
-"prettier-linter-helpers@^1.0.0":
-  "integrity" "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="
-  "resolved" "https://registry.npmmirror.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"
-  "version" "1.0.0"
-  dependencies:
-    "fast-diff" "^1.1.2"
-
-"prettier@^1.18.2 || ^2.0.0", "prettier@>= 1.13.0", "prettier@>=1.13.0":
-  "integrity" "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q=="
-  "resolved" "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz"
-  "version" "2.8.8"
-
-"pretty-error@^2.0.2":
-  "integrity" "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw=="
-  "resolved" "https://registry.npmmirror.com/pretty-error/-/pretty-error-2.1.2.tgz"
-  "version" "2.1.2"
-  dependencies:
-    "lodash" "^4.17.20"
-    "renderkid" "^2.0.4"
-
-"process-nextick-args@~2.0.0":
-  "integrity" "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-  "resolved" "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
-  "version" "2.0.1"
-
-"process@^0.11.10":
-  "integrity" "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
-  "resolved" "https://registry.npmmirror.com/process/-/process-0.11.10.tgz"
-  "version" "0.11.10"
-
-"process@~0.5.1":
-  "integrity" "sha512-oNpcutj+nYX2FjdEW7PGltWhXulAnFlM0My/k48L90hARCOJtvBbQXc/6itV2jDvU5xAAtonP+r6wmQgCcbAUA=="
-  "resolved" "https://registry.npmmirror.com/process/-/process-0.5.2.tgz"
-  "version" "0.5.2"
-
-"progress@^2.0.0":
-  "integrity" "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-  "resolved" "https://registry.npmmirror.com/progress/-/progress-2.0.3.tgz"
-  "version" "2.0.3"
-
-"promise-inflight@^1.0.1":
-  "integrity" "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="
-  "resolved" "https://registry.npmmirror.com/promise-inflight/-/promise-inflight-1.0.1.tgz"
-  "version" "1.0.1"
-
-"proto-list@~1.2.1":
-  "integrity" "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="
-  "resolved" "https://registry.npmmirror.com/proto-list/-/proto-list-1.2.4.tgz"
-  "version" "1.2.4"
-
-"proxy-addr@~2.0.7":
-  "integrity" "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="
-  "resolved" "https://registry.npmmirror.com/proxy-addr/-/proxy-addr-2.0.7.tgz"
-  "version" "2.0.7"
-  dependencies:
-    "forwarded" "0.2.0"
-    "ipaddr.js" "1.9.1"
-
-"prr@~1.0.1":
-  "integrity" "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw=="
-  "resolved" "https://registry.npmmirror.com/prr/-/prr-1.0.1.tgz"
-  "version" "1.0.1"
-
-"pseudomap@^1.0.2":
-  "integrity" "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
-  "resolved" "https://registry.npmmirror.com/pseudomap/-/pseudomap-1.0.2.tgz"
-  "version" "1.0.2"
-
-"psl@^1.1.28":
-  "integrity" "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
-  "resolved" "https://registry.npmmirror.com/psl/-/psl-1.9.0.tgz"
-  "version" "1.9.0"
-
-"public-encrypt@^4.0.0":
-  "integrity" "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="
-  "resolved" "https://registry.npmmirror.com/public-encrypt/-/public-encrypt-4.0.3.tgz"
-  "version" "4.0.3"
-  dependencies:
-    "bn.js" "^4.1.0"
-    "browserify-rsa" "^4.0.0"
-    "create-hash" "^1.1.0"
-    "parse-asn1" "^5.0.0"
-    "randombytes" "^2.0.1"
-    "safe-buffer" "^5.1.2"
-
-"pump@^2.0.0":
-  "integrity" "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="
-  "resolved" "https://registry.npmmirror.com/pump/-/pump-2.0.1.tgz"
-  "version" "2.0.1"
-  dependencies:
-    "end-of-stream" "^1.1.0"
-    "once" "^1.3.1"
-
-"pump@^3.0.0":
-  "integrity" "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="
-  "resolved" "https://registry.npmmirror.com/pump/-/pump-3.0.0.tgz"
-  "version" "3.0.0"
-  dependencies:
-    "end-of-stream" "^1.1.0"
-    "once" "^1.3.1"
-
-"pumpify@^1.3.3":
-  "integrity" "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="
-  "resolved" "https://registry.npmmirror.com/pumpify/-/pumpify-1.5.1.tgz"
-  "version" "1.5.1"
-  dependencies:
-    "duplexify" "^3.6.0"
-    "inherits" "^2.0.3"
-    "pump" "^2.0.0"
-
-"punycode@^1.2.4":
-  "integrity" "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
-  "resolved" "https://registry.npmmirror.com/punycode/-/punycode-1.4.1.tgz"
-  "version" "1.4.1"
-
-"punycode@^1.4.1":
-  "integrity" "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
-  "resolved" "https://registry.npmmirror.com/punycode/-/punycode-1.4.1.tgz"
-  "version" "1.4.1"
-
-"punycode@^2.1.0", "punycode@^2.1.1":
-  "integrity" "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
-  "resolved" "https://registry.npmmirror.com/punycode/-/punycode-2.3.0.tgz"
-  "version" "2.3.0"
-
-"q@^1.1.2":
-  "integrity" "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="
-  "resolved" "https://registry.npmmirror.com/q/-/q-1.5.1.tgz"
-  "version" "1.5.1"
-
-"qrcode.vue@^1.7.0":
-  "integrity" "sha512-R7t6Y3fDDtcU7L4rtqwGUDP9xD64gJhIwpfjhRCTKmBoYF6SS49PIJHRJ048cse6OI7iwTwgyy2C46N9Ygoc6g=="
-  "resolved" "https://registry.npmmirror.com/qrcode.vue/-/qrcode.vue-1.7.0.tgz"
-  "version" "1.7.0"
-
-"qs@^6.11.2":
-  "integrity" "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA=="
-  "resolved" "https://registry.npmmirror.com/qs/-/qs-6.11.2.tgz"
-  "version" "6.11.2"
-  dependencies:
-    "side-channel" "^1.0.4"
-
-"qs@~6.5.2":
-  "integrity" "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
-  "resolved" "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz"
-  "version" "6.5.3"
-
-"qs@6.11.0":
-  "integrity" "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="
-  "resolved" "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz"
-  "version" "6.11.0"
-  dependencies:
-    "side-channel" "^1.0.4"
-
-"query-string@^4.1.0", "query-string@^4.3.2":
-  "integrity" "sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q=="
-  "resolved" "https://registry.npmmirror.com/query-string/-/query-string-4.3.4.tgz"
-  "version" "4.3.4"
-  dependencies:
-    "object-assign" "^4.1.0"
-    "strict-uri-encode" "^1.0.0"
-
-"querystring-es3@^0.2.0":
-  "integrity" "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA=="
-  "resolved" "https://registry.npmmirror.com/querystring-es3/-/querystring-es3-0.2.1.tgz"
-  "version" "0.2.1"
-
-"querystringify@^2.1.1":
-  "integrity" "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
-  "resolved" "https://registry.npmmirror.com/querystringify/-/querystringify-2.2.0.tgz"
-  "version" "2.2.0"
-
-"quill-delta@^3.6.2":
-  "integrity" "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg=="
-  "resolved" "https://registry.npmmirror.com/quill-delta/-/quill-delta-3.6.3.tgz"
-  "version" "3.6.3"
-  dependencies:
-    "deep-equal" "^1.0.1"
-    "extend" "^3.0.2"
-    "fast-diff" "1.1.2"
-
-"quill@^1.3.4", "quill@1.3.7":
-  "integrity" "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g=="
-  "resolved" "https://registry.npmmirror.com/quill/-/quill-1.3.7.tgz"
-  "version" "1.3.7"
-  dependencies:
-    "clone" "^2.1.1"
-    "deep-equal" "^1.0.1"
-    "eventemitter3" "^2.0.3"
-    "extend" "^3.0.2"
-    "parchment" "^1.1.4"
-    "quill-delta" "^3.6.2"
-
-"raf@^3.4.1":
-  "integrity" "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA=="
-  "resolved" "https://registry.npmmirror.com/raf/-/raf-3.4.1.tgz"
-  "version" "3.4.1"
-  dependencies:
-    "performance-now" "^2.1.0"
-
-"randombytes@^2.0.0", "randombytes@^2.0.1", "randombytes@^2.0.5", "randombytes@^2.1.0":
-  "integrity" "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="
-  "resolved" "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz"
-  "version" "2.1.0"
-  dependencies:
-    "safe-buffer" "^5.1.0"
-
-"randomfill@^1.0.3":
-  "integrity" "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="
-  "resolved" "https://registry.npmmirror.com/randomfill/-/randomfill-1.0.4.tgz"
-  "version" "1.0.4"
-  dependencies:
-    "randombytes" "^2.0.5"
-    "safe-buffer" "^5.1.0"
-
-"range-parser@^1.2.1", "range-parser@~1.2.1":
-  "integrity" "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-  "resolved" "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz"
-  "version" "1.2.1"
-
-"raw-body@2.5.1":
-  "integrity" "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="
-  "resolved" "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.1.tgz"
-  "version" "2.5.1"
-  dependencies:
-    "bytes" "3.1.2"
-    "http-errors" "2.0.0"
-    "iconv-lite" "0.4.24"
-    "unpipe" "1.0.0"
-
-"read-pkg@^5.1.1":
-  "integrity" "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="
-  "resolved" "https://registry.npmmirror.com/read-pkg/-/read-pkg-5.2.0.tgz"
-  "version" "5.2.0"
+    ts-pnp "^1.1.6"
+
+portfinder@^1.0.26:
+  version "1.0.32"
+  resolved "https://registry.npmmirror.com/portfinder/-/portfinder-1.0.32.tgz"
+  integrity sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==
+  dependencies:
+    async "^2.6.4"
+    debug "^3.2.7"
+    mkdirp "^0.5.6"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.npmmirror.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"
+  integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
+
+postcss-calc@^7.0.1:
+  version "7.0.5"
+  resolved "https://registry.npmmirror.com/postcss-calc/-/postcss-calc-7.0.5.tgz"
+  integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==
+  dependencies:
+    postcss "^7.0.27"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.0.2"
+
+postcss-colormin@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.npmmirror.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz"
+  integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==
+  dependencies:
+    browserslist "^4.0.0"
+    color "^3.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-convert-values@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"
+  integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==
+  dependencies:
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-discard-comments@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"
+  integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-discard-duplicates@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"
+  integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-discard-empty@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"
+  integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-discard-overridden@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"
+  integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-load-config@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.npmmirror.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz"
+  integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==
+  dependencies:
+    cosmiconfig "^5.0.0"
+    import-cwd "^2.0.0"
+
+postcss-loader@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/postcss-loader/-/postcss-loader-3.0.0.tgz"
+  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
+  dependencies:
+    loader-utils "^1.1.0"
+    postcss "^7.0.0"
+    postcss-load-config "^2.0.0"
+    schema-utils "^1.0.0"
+
+postcss-merge-longhand@^4.0.11:
+  version "4.0.11"
+  resolved "https://registry.npmmirror.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"
+  integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==
+  dependencies:
+    css-color-names "0.0.4"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+    stylehacks "^4.0.0"
+
+postcss-merge-rules@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.npmmirror.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"
+  integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-api "^3.0.0"
+    cssnano-util-same-parent "^4.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
+    vendors "^1.0.0"
+
+postcss-minify-font-values@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"
+  integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==
+  dependencies:
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-minify-gradients@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"
+  integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==
+  dependencies:
+    cssnano-util-get-arguments "^4.0.0"
+    is-color-stop "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-minify-params@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"
+  integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==
+  dependencies:
+    alphanum-sort "^1.0.0"
+    browserslist "^4.0.0"
+    cssnano-util-get-arguments "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+    uniqs "^2.0.0"
+
+postcss-minify-selectors@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"
+  integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==
+  dependencies:
+    alphanum-sort "^1.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
+
+postcss-modules-extract-imports@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz"
+  integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
+  dependencies:
+    postcss "^7.0.5"
+
+postcss-modules-local-by-default@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.npmmirror.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"
+  integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==
+  dependencies:
+    icss-utils "^4.1.1"
+    postcss "^7.0.32"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.1.0"
+
+postcss-modules-scope@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.npmmirror.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"
+  integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==
+  dependencies:
+    postcss "^7.0.6"
+    postcss-selector-parser "^6.0.0"
+
+postcss-modules-values@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"
+  integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==
+  dependencies:
+    icss-utils "^4.0.0"
+    postcss "^7.0.6"
+
+postcss-normalize-charset@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"
+  integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-normalize-display-values@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"
+  integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==
+  dependencies:
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-positions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"
+  integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==
+  dependencies:
+    cssnano-util-get-arguments "^4.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-repeat-style@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"
+  integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==
+  dependencies:
+    cssnano-util-get-arguments "^4.0.0"
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-string@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"
+  integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==
+  dependencies:
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-timing-functions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"
+  integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==
+  dependencies:
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-unicode@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"
+  integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==
+  dependencies:
+    browserslist "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-url@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"
+  integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==
+  dependencies:
+    is-absolute-url "^2.0.0"
+    normalize-url "^3.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-whitespace@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"
+  integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==
+  dependencies:
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-ordered-values@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.npmmirror.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"
+  integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==
+  dependencies:
+    cssnano-util-get-arguments "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-prefix-selector@^1.6.0:
+  version "1.16.0"
+  resolved "https://registry.npmmirror.com/postcss-prefix-selector/-/postcss-prefix-selector-1.16.0.tgz"
+  integrity sha512-rdVMIi7Q4B0XbXqNUEI+Z4E+pueiu/CS5E6vRCQommzdQ/sgsS4dK42U7GX8oJR+TJOtT+Qv3GkNo6iijUMp3Q==
+
+postcss-reduce-initial@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.npmmirror.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"
+  integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-api "^3.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+
+postcss-reduce-transforms@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"
+  integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==
+  dependencies:
+    cssnano-util-get-match "^4.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-selector-parser@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"
+  integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==
+  dependencies:
+    dot-prop "^5.2.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.9:
+  version "6.0.13"
+  resolved "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz"
+  integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
+postcss-svgo@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.npmmirror.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz"
+  integrity sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==
+  dependencies:
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+    svgo "^1.0.0"
+
+postcss-unique-selectors@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"
+  integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==
+  dependencies:
+    alphanum-sort "^1.0.0"
+    postcss "^7.0.0"
+    uniqs "^2.0.0"
+
+postcss-value-parser@^3.0.0:
+  version "3.3.1"
+  resolved "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"
+  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
+
+postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
+  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
+
+postcss@^5.2.17:
+  version "5.2.18"
+  resolved "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz"
+  integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==
+  dependencies:
+    chalk "^1.1.3"
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6, "postcss@>4 <9":
+  version "7.0.39"
+  resolved "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
+  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
+  dependencies:
+    picocolors "^0.2.1"
+    source-map "^0.6.1"
+
+postcss@^8.1.10:
+  version "8.4.27"
+  resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz"
+  integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==
+  dependencies:
+    nanoid "^3.3.6"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
+postcss@^8.4.14:
+  version "8.4.27"
+  resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz"
+  integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==
+  dependencies:
+    nanoid "^3.3.6"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
+posthtml-parser@^0.2.0, posthtml-parser@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.npmmirror.com/posthtml-parser/-/posthtml-parser-0.2.1.tgz"
+  integrity sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==
+  dependencies:
+    htmlparser2 "^3.8.3"
+    isobject "^2.1.0"
+
+posthtml-rename-id@^1.0:
+  version "1.0.12"
+  resolved "https://registry.npmmirror.com/posthtml-rename-id/-/posthtml-rename-id-1.0.12.tgz"
+  integrity sha512-UKXf9OF/no8WZo9edRzvuMenb6AD5hDLzIepJW+a4oJT+T/Lx7vfMYWT4aWlGNQh0WMhnUx1ipN9OkZ9q+ddEw==
+  dependencies:
+    escape-string-regexp "1.0.5"
+
+posthtml-render@^1.0.5, posthtml-render@^1.0.6:
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/posthtml-render/-/posthtml-render-1.4.0.tgz"
+  integrity sha512-W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw==
+
+posthtml-svg-mode@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/posthtml-svg-mode/-/posthtml-svg-mode-1.0.3.tgz"
+  integrity sha512-hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ==
+  dependencies:
+    merge-options "1.0.1"
+    posthtml "^0.9.2"
+    posthtml-parser "^0.2.1"
+    posthtml-render "^1.0.6"
+
+posthtml@^0.9.2:
+  version "0.9.2"
+  resolved "https://registry.npmmirror.com/posthtml/-/posthtml-0.9.2.tgz"
+  integrity sha512-spBB5sgC4cv2YcW03f/IAUN1pgDJWNWD8FzkyY4mArLUMJW+KlQhlmUdKAHQuPfb00Jl5xIfImeOsf6YL8QK7Q==
+  dependencies:
+    posthtml-parser "^0.2.0"
+    posthtml-render "^1.0.5"
+
+preact@^10.11.2:
+  version "10.18.1"
+  resolved "https://registry.npmmirror.com/preact/-/preact-10.18.1.tgz"
+  integrity sha512-mKUD7RRkQQM6s7Rkmi7IFkoEHjuFqRQUaXamO61E6Nn7vqF/bo7EZCmSyrUnp2UWHw0O7XjZ2eeXis+m7tf4lg==
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.1.2.tgz"
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
+
+prepend-http@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/prepend-http/-/prepend-http-1.0.4.tgz"
+  integrity sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==
+
+prettier-linter-helpers@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"
+  integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
+  dependencies:
+    fast-diff "^1.1.2"
+
+"prettier@^1.18.2 || ^2.0.0", "prettier@>= 1.13.0", prettier@>=1.13.0:
+  version "2.8.8"
+  resolved "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
+
+pretty-error@^2.0.2:
+  version "2.1.2"
+  resolved "https://registry.npmmirror.com/pretty-error/-/pretty-error-2.1.2.tgz"
+  integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==
+  dependencies:
+    lodash "^4.17.20"
+    renderkid "^2.0.4"
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.npmmirror.com/process/-/process-0.11.10.tgz"
+  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
+
+process@~0.5.1:
+  version "0.5.2"
+  resolved "https://registry.npmmirror.com/process/-/process-0.5.2.tgz"
+  integrity sha512-oNpcutj+nYX2FjdEW7PGltWhXulAnFlM0My/k48L90hARCOJtvBbQXc/6itV2jDvU5xAAtonP+r6wmQgCcbAUA==
+
+progress@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.npmmirror.com/progress/-/progress-2.0.3.tgz"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/promise-inflight/-/promise-inflight-1.0.1.tgz"
+  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
+
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.npmmirror.com/proto-list/-/proto-list-1.2.4.tgz"
+  integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
+
+proxy-addr@~2.0.7:
+  version "2.0.7"
+  resolved "https://registry.npmmirror.com/proxy-addr/-/proxy-addr-2.0.7.tgz"
+  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
+  dependencies:
+    forwarded "0.2.0"
+    ipaddr.js "1.9.1"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/prr/-/prr-1.0.1.tgz"
+  integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/pseudomap/-/pseudomap-1.0.2.tgz"
+  integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
+
+psl@^1.1.28:
+  version "1.9.0"
+  resolved "https://registry.npmmirror.com/psl/-/psl-1.9.0.tgz"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
+
+public-encrypt@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.npmmirror.com/public-encrypt/-/public-encrypt-4.0.3.tgz"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/pump/-/pump-2.0.1.tgz"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/pump/-/pump-3.0.0.tgz"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.npmmirror.com/pumpify/-/pumpify-1.5.1.tgz"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+punycode@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.npmmirror.com/punycode/-/punycode-1.4.1.tgz"
+  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.npmmirror.com/punycode/-/punycode-1.4.1.tgz"
+  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
+
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/punycode/-/punycode-2.3.0.tgz"
+  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
+
+q@^1.1.2:
+  version "1.5.1"
+  resolved "https://registry.npmmirror.com/q/-/q-1.5.1.tgz"
+  integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
+
+qrcode.vue@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.npmmirror.com/qrcode.vue/-/qrcode.vue-1.7.0.tgz"
+  integrity sha512-R7t6Y3fDDtcU7L4rtqwGUDP9xD64gJhIwpfjhRCTKmBoYF6SS49PIJHRJ048cse6OI7iwTwgyy2C46N9Ygoc6g==
+
+qs@^6.11.0, qs@^6.11.2:
+  version "6.11.2"
+  resolved "https://registry.npmmirror.com/qs/-/qs-6.11.2.tgz"
+  integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
+  dependencies:
+    side-channel "^1.0.4"
+
+qs@~6.5.2:
+  version "6.5.3"
+  resolved "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+
+qs@6.11.0:
+  version "6.11.0"
+  resolved "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
+  dependencies:
+    side-channel "^1.0.4"
+
+query-string@^4.1.0, query-string@^4.3.2:
+  version "4.3.4"
+  resolved "https://registry.npmmirror.com/query-string/-/query-string-4.3.4.tgz"
+  integrity sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.npmmirror.com/querystring-es3/-/querystring-es3-0.2.1.tgz"
+  integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==
+
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.npmmirror.com/querystringify/-/querystringify-2.2.0.tgz"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+
+quill-delta@^3.6.2:
+  version "3.6.3"
+  resolved "https://registry.npmmirror.com/quill-delta/-/quill-delta-3.6.3.tgz"
+  integrity sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==
+  dependencies:
+    deep-equal "^1.0.1"
+    extend "^3.0.2"
+    fast-diff "1.1.2"
+
+quill@^1.3.4, quill@1.3.7:
+  version "1.3.7"
+  resolved "https://registry.npmmirror.com/quill/-/quill-1.3.7.tgz"
+  integrity sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==
+  dependencies:
+    clone "^2.1.1"
+    deep-equal "^1.0.1"
+    eventemitter3 "^2.0.3"
+    extend "^3.0.2"
+    parchment "^1.1.4"
+    quill-delta "^3.6.2"
+
+raf@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.npmmirror.com/raf/-/raf-3.4.1.tgz"
+  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
+  dependencies:
+    performance-now "^2.1.0"
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/randomfill/-/randomfill-1.0.4.tgz"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@^1.2.1, range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.1.tgz"
+  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+read-pkg@^5.1.1:
+  version "5.2.0"
+  resolved "https://registry.npmmirror.com/read-pkg/-/read-pkg-5.2.0.tgz"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
-    "normalize-package-data" "^2.5.0"
-    "parse-json" "^5.0.0"
-    "type-fest" "^0.6.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
 
-"readable-stream@^2.0.0", "readable-stream@^2.0.1", "readable-stream@^2.0.2", "readable-stream@^2.1.5", "readable-stream@^2.2.2", "readable-stream@^2.3.3", "readable-stream@^2.3.6", "readable-stream@~2.3.6", "readable-stream@1 || 2":
-  "integrity" "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="
-  "resolved" "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz"
-  "version" "2.3.8"
+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6, "readable-stream@1 || 2":
+  version "2.3.8"
+  resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
   dependencies:
-    "core-util-is" "~1.0.0"
-    "inherits" "~2.0.3"
-    "isarray" "~1.0.0"
-    "process-nextick-args" "~2.0.0"
-    "safe-buffer" "~5.1.1"
-    "string_decoder" "~1.1.1"
-    "util-deprecate" "~1.0.1"
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
 
-"readable-stream@^3.0.6":
-  "integrity" "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="
-  "resolved" "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz"
-  "version" "3.6.2"
+readable-stream@^3.0.6:
+  version "3.6.2"
+  resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
-    "inherits" "^2.0.3"
-    "string_decoder" "^1.1.1"
-    "util-deprecate" "^1.0.1"
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
 
-"readable-stream@^3.1.1":
-  "integrity" "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="
-  "resolved" "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz"
-  "version" "3.6.2"
+readable-stream@^3.1.1:
+  version "3.6.2"
+  resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
-    "inherits" "^2.0.3"
-    "string_decoder" "^1.1.1"
-    "util-deprecate" "^1.0.1"
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
 
-"readable-stream@^3.6.0":
-  "integrity" "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="
-  "resolved" "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz"
-  "version" "3.6.2"
+readable-stream@^3.6.0:
+  version "3.6.2"
+  resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
-    "inherits" "^2.0.3"
-    "string_decoder" "^1.1.1"
-    "util-deprecate" "^1.0.1"
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
 
-"readable-stream@^3.6.2":
-  "integrity" "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="
-  "resolved" "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz"
-  "version" "3.6.2"
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.npmmirror.com/readdirp/-/readdirp-2.2.1.tgz"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
   dependencies:
-    "inherits" "^2.0.3"
-    "string_decoder" "^1.1.1"
-    "util-deprecate" "^1.0.1"
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
 
-"readdirp@^2.2.1":
-  "integrity" "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="
-  "resolved" "https://registry.npmmirror.com/readdirp/-/readdirp-2.2.1.tgz"
-  "version" "2.2.1"
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
-    "graceful-fs" "^4.1.11"
-    "micromatch" "^3.1.10"
-    "readable-stream" "^2.0.2"
+    picomatch "^2.2.1"
 
-"readdirp@~3.6.0":
-  "integrity" "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="
-  "resolved" "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz"
-  "version" "3.6.0"
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.npmmirror.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
-    "picomatch" "^2.2.1"
+    regenerate "^1.4.2"
 
-"regenerate-unicode-properties@^10.1.0":
-  "integrity" "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q=="
-  "resolved" "https://registry.npmmirror.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz"
-  "version" "10.1.1"
-  dependencies:
-    "regenerate" "^1.4.2"
+regenerate@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.npmmirror.com/regenerate/-/regenerate-1.4.2.tgz"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-"regenerate@^1.4.2":
-  "integrity" "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
-  "resolved" "https://registry.npmmirror.com/regenerate/-/regenerate-1.4.2.tgz"
-  "version" "1.4.2"
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-"regenerator-runtime@^0.11.0":
-  "integrity" "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-  "resolved" "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"
-  "version" "0.11.1"
+regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.7:
+  version "0.13.11"
+  resolved "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-"regenerator-runtime@^0.13.7":
-  "integrity" "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-  "resolved" "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"
-  "version" "0.13.11"
-
-"regenerator-runtime@^0.14.0":
-  "integrity" "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
-  "resolved" "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz"
-  "version" "0.14.0"
-
-"regenerator-transform@^0.15.2":
-  "integrity" "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg=="
-  "resolved" "https://registry.npmmirror.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz"
-  "version" "0.15.2"
+regenerator-transform@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.npmmirror.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz"
+  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-"regex-not@^1.0.0", "regex-not@^1.0.2":
-  "integrity" "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="
-  "resolved" "https://registry.npmmirror.com/regex-not/-/regex-not-1.0.2.tgz"
-  "version" "1.0.2"
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/regex-not/-/regex-not-1.0.2.tgz"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
-    "extend-shallow" "^3.0.2"
-    "safe-regex" "^1.1.0"
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
 
-"regexp.prototype.flags@^1.2.0", "regexp.prototype.flags@^1.5.1":
-  "integrity" "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg=="
-  "resolved" "https://registry.npmmirror.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz"
-  "version" "1.5.1"
+regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.npmmirror.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz"
+  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "set-function-name" "^2.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    functions-have-names "^1.2.3"
 
-"regexpp@^2.0.1":
-  "integrity" "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
-  "resolved" "https://registry.npmmirror.com/regexpp/-/regexpp-2.0.1.tgz"
-  "version" "2.0.1"
+regexpp@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/regexpp/-/regexpp-2.0.1.tgz"
+  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
-"regexpu-core@^5.3.1":
-  "integrity" "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ=="
-  "resolved" "https://registry.npmmirror.com/regexpu-core/-/regexpu-core-5.3.2.tgz"
-  "version" "5.3.2"
+regexpu-core@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.npmmirror.com/regexpu-core/-/regexpu-core-5.3.2.tgz"
+  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
   dependencies:
     "@babel/regjsgen" "^0.8.0"
-    "regenerate" "^1.4.2"
-    "regenerate-unicode-properties" "^10.1.0"
-    "regjsparser" "^0.9.1"
-    "unicode-match-property-ecmascript" "^2.0.0"
-    "unicode-match-property-value-ecmascript" "^2.1.0"
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsparser "^0.9.1"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
 
-"regjsparser@^0.9.1":
-  "integrity" "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ=="
-  "resolved" "https://registry.npmmirror.com/regjsparser/-/regjsparser-0.9.1.tgz"
-  "version" "0.9.1"
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.npmmirror.com/regjsparser/-/regjsparser-0.9.1.tgz"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
-    "jsesc" "~0.5.0"
+    jsesc "~0.5.0"
 
-"relateurl@0.2.x":
-  "integrity" "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="
-  "resolved" "https://registry.npmmirror.com/relateurl/-/relateurl-0.2.7.tgz"
-  "version" "0.2.7"
+relateurl@0.2.x:
+  version "0.2.7"
+  resolved "https://registry.npmmirror.com/relateurl/-/relateurl-0.2.7.tgz"
+  integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==
 
-"remove-trailing-separator@^1.0.1":
-  "integrity" "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="
-  "resolved" "https://registry.npmmirror.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
-  "version" "1.1.0"
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
+  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
 
-"renderkid@^2.0.4":
-  "integrity" "sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ=="
-  "resolved" "https://registry.npmmirror.com/renderkid/-/renderkid-2.0.7.tgz"
-  "version" "2.0.7"
+renderkid@^2.0.4:
+  version "2.0.7"
+  resolved "https://registry.npmmirror.com/renderkid/-/renderkid-2.0.7.tgz"
+  integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==
   dependencies:
-    "css-select" "^4.1.3"
-    "dom-converter" "^0.2.0"
-    "htmlparser2" "^6.1.0"
-    "lodash" "^4.17.21"
-    "strip-ansi" "^3.0.1"
+    css-select "^4.1.3"
+    dom-converter "^0.2.0"
+    htmlparser2 "^6.1.0"
+    lodash "^4.17.21"
+    strip-ansi "^3.0.1"
 
-"repeat-element@^1.1.2":
-  "integrity" "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ=="
-  "resolved" "https://registry.npmmirror.com/repeat-element/-/repeat-element-1.1.4.tgz"
-  "version" "1.1.4"
+repeat-element@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.npmmirror.com/repeat-element/-/repeat-element-1.1.4.tgz"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
-"repeat-string@^1.6.1":
-  "integrity" "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="
-  "resolved" "https://registry.npmmirror.com/repeat-string/-/repeat-string-1.6.1.tgz"
-  "version" "1.6.1"
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.npmmirror.com/repeat-string/-/repeat-string-1.6.1.tgz"
+  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
-"request@^2.88.2":
-  "integrity" "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="
-  "resolved" "https://registry.npmmirror.com/request/-/request-2.88.2.tgz"
-  "version" "2.88.2"
+request@^2.88.2:
+  version "2.88.2"
+  resolved "https://registry.npmmirror.com/request/-/request-2.88.2.tgz"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
   dependencies:
-    "aws-sign2" "~0.7.0"
-    "aws4" "^1.8.0"
-    "caseless" "~0.12.0"
-    "combined-stream" "~1.0.6"
-    "extend" "~3.0.2"
-    "forever-agent" "~0.6.1"
-    "form-data" "~2.3.2"
-    "har-validator" "~5.1.3"
-    "http-signature" "~1.2.0"
-    "is-typedarray" "~1.0.0"
-    "isstream" "~0.1.2"
-    "json-stringify-safe" "~5.0.1"
-    "mime-types" "~2.1.19"
-    "oauth-sign" "~0.9.0"
-    "performance-now" "^2.1.0"
-    "qs" "~6.5.2"
-    "safe-buffer" "^5.1.2"
-    "tough-cookie" "~2.5.0"
-    "tunnel-agent" "^0.6.0"
-    "uuid" "^3.3.2"
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
 
-"require-directory@^2.1.1":
-  "integrity" "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
-  "resolved" "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz"
-  "version" "2.1.1"
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz"
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
-"require-main-filename@^2.0.0":
-  "integrity" "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-  "resolved" "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz"
-  "version" "2.0.0"
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-"requires-port@^1.0.0":
-  "integrity" "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
-  "resolved" "https://registry.npmmirror.com/requires-port/-/requires-port-1.0.0.tgz"
-  "version" "1.0.0"
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/requires-port/-/requires-port-1.0.0.tgz"
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
-"resize-observer-polyfill@^1.5.0":
-  "integrity" "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
-  "resolved" "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"
-  "version" "1.5.1"
+resize-observer-polyfill@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"
+  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
 
-"resolve-cwd@^2.0.0":
-  "integrity" "sha512-ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg=="
-  "resolved" "https://registry.npmmirror.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz"
-  "version" "2.0.0"
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz"
+  integrity sha512-ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg==
   dependencies:
-    "resolve-from" "^3.0.0"
+    resolve-from "^3.0.0"
 
-"resolve-from@^3.0.0":
-  "integrity" "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw=="
-  "resolved" "https://registry.npmmirror.com/resolve-from/-/resolve-from-3.0.0.tgz"
-  "version" "3.0.0"
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/resolve-from/-/resolve-from-3.0.0.tgz"
+  integrity sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==
 
-"resolve-from@^4.0.0":
-  "integrity" "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-  "resolved" "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz"
-  "version" "4.0.0"
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-"resolve-url@^0.2.1":
-  "integrity" "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
-  "resolved" "https://registry.npmmirror.com/resolve-url/-/resolve-url-0.2.1.tgz"
-  "version" "0.2.1"
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.npmmirror.com/resolve-url/-/resolve-url-0.2.1.tgz"
+  integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
-"resolve@^1.10.0", "resolve@^1.12.0", "resolve@^1.14.2", "resolve@^1.22.4":
-  "integrity" "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw=="
-  "resolved" "https://registry.npmmirror.com/resolve/-/resolve-1.22.8.tgz"
-  "version" "1.22.8"
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.22.1:
+  version "1.22.2"
+  resolved "https://registry.npmmirror.com/resolve/-/resolve-1.22.2.tgz"
+  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
   dependencies:
-    "is-core-module" "^2.13.0"
-    "path-parse" "^1.0.7"
-    "supports-preserve-symlinks-flag" "^1.0.0"
+    is-core-module "^2.11.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
 
-"restore-cursor@^2.0.0":
-  "integrity" "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="
-  "resolved" "https://registry.npmmirror.com/restore-cursor/-/restore-cursor-2.0.0.tgz"
-  "version" "2.0.0"
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/restore-cursor/-/restore-cursor-2.0.0.tgz"
+  integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==
   dependencies:
-    "onetime" "^2.0.0"
-    "signal-exit" "^3.0.2"
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
 
-"restore-cursor@^3.1.0":
-  "integrity" "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="
-  "resolved" "https://registry.npmmirror.com/restore-cursor/-/restore-cursor-3.1.0.tgz"
-  "version" "3.1.0"
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/restore-cursor/-/restore-cursor-3.1.0.tgz"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
   dependencies:
-    "onetime" "^5.1.0"
-    "signal-exit" "^3.0.2"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
 
-"ret@~0.1.10":
-  "integrity" "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
-  "resolved" "https://registry.npmmirror.com/ret/-/ret-0.1.15.tgz"
-  "version" "0.1.15"
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.npmmirror.com/ret/-/ret-0.1.15.tgz"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-"retry@^0.12.0":
-  "integrity" "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="
-  "resolved" "https://registry.npmmirror.com/retry/-/retry-0.12.0.tgz"
-  "version" "0.12.0"
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.npmmirror.com/retry/-/retry-0.12.0.tgz"
+  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
 
-"rfdc@^1.3.0":
-  "integrity" "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
-  "resolved" "https://registry.npmmirror.com/rfdc/-/rfdc-1.3.0.tgz"
-  "version" "1.3.0"
+rfdc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npmmirror.com/rfdc/-/rfdc-1.3.0.tgz"
+  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
-"rgb-regex@^1.0.1":
-  "integrity" "sha512-gDK5mkALDFER2YLqH6imYvK6g02gpNGM4ILDZ472EwWfXZnC2ZEpoB2ECXTyOVUKuk/bPJZMzwQPBYICzP+D3w=="
-  "resolved" "https://registry.npmmirror.com/rgb-regex/-/rgb-regex-1.0.1.tgz"
-  "version" "1.0.1"
+rgb-regex@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/rgb-regex/-/rgb-regex-1.0.1.tgz"
+  integrity sha512-gDK5mkALDFER2YLqH6imYvK6g02gpNGM4ILDZ472EwWfXZnC2ZEpoB2ECXTyOVUKuk/bPJZMzwQPBYICzP+D3w==
 
-"rgba-regex@^1.0.0":
-  "integrity" "sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg=="
-  "resolved" "https://registry.npmmirror.com/rgba-regex/-/rgba-regex-1.0.0.tgz"
-  "version" "1.0.0"
+rgba-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/rgba-regex/-/rgba-regex-1.0.0.tgz"
+  integrity sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==
 
-"rgbcolor@^1.0.1":
-  "integrity" "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw=="
-  "resolved" "https://registry.npmmirror.com/rgbcolor/-/rgbcolor-1.0.1.tgz"
-  "version" "1.0.1"
+rgbcolor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/rgbcolor/-/rgbcolor-1.0.1.tgz"
+  integrity sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==
 
-"rimraf@^2.5.4", "rimraf@^2.6.1", "rimraf@^2.6.3":
-  "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
-  "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
-  "version" "2.7.1"
+rimraf@^2.5.4:
+  version "2.7.1"
+  resolved "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
-    "glob" "^7.1.3"
+    glob "^7.1.3"
 
-"rimraf@^3.0.2":
-  "integrity" "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="
-  "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz"
-  "version" "3.0.2"
+rimraf@^2.6.1:
+  version "2.7.1"
+  resolved "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
-    "glob" "^7.1.3"
+    glob "^7.1.3"
 
-"rimraf@2.6.3":
-  "integrity" "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="
-  "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.6.3.tgz"
-  "version" "2.6.3"
+rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
-    "glob" "^7.1.3"
+    glob "^7.1.3"
 
-"ripemd160@^2.0.0", "ripemd160@^2.0.1":
-  "integrity" "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="
-  "resolved" "https://registry.npmmirror.com/ripemd160/-/ripemd160-2.0.2.tgz"
-  "version" "2.0.2"
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
-    "hash-base" "^3.0.0"
-    "inherits" "^2.0.1"
+    glob "^7.1.3"
 
-"run-async@^2.4.0":
-  "integrity" "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
-  "resolved" "https://registry.npmmirror.com/run-async/-/run-async-2.4.1.tgz"
-  "version" "2.4.1"
-
-"run-queue@^1.0.0", "run-queue@^1.0.3":
-  "integrity" "sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg=="
-  "resolved" "https://registry.npmmirror.com/run-queue/-/run-queue-1.0.3.tgz"
-  "version" "1.0.3"
+rimraf@2.6.3:
+  version "2.6.3"
+  resolved "https://registry.npmmirror.com/rimraf/-/rimraf-2.6.3.tgz"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
-    "aproba" "^1.1.1"
+    glob "^7.1.3"
 
-"runjs@4.4.2":
-  "integrity" "sha512-/DB54HRJnxfGA/a9QLZMyAn8H84SMt8oVGF7Vz+OS4BMCve312DXNRpy6Z8yohLuoMctoalXQtvmpd2ChQYD4Q=="
-  "resolved" "https://registry.npmmirror.com/runjs/-/runjs-4.4.2.tgz"
-  "version" "4.4.2"
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/ripemd160/-/ripemd160-2.0.2.tgz"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
-    "chalk" "2.3.0"
-    "lodash.padend" "4.6.1"
-    "microcli" "1.3.3"
-    "omelette" "0.4.5"
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
 
-"rust-result@^1.0.0":
-  "integrity" "sha512-6cJzSBU+J/RJCF063onnQf0cDUOHs9uZI1oroSGnHOph+CQTIJ5Pp2hK5kEQq1+7yE/EEWfulSNXAQ2jikPthA=="
-  "resolved" "https://registry.npmmirror.com/rust-result/-/rust-result-1.0.0.tgz"
-  "version" "1.0.0"
+run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.npmmirror.com/run-async/-/run-async-2.4.1.tgz"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/run-queue/-/run-queue-1.0.3.tgz"
+  integrity sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==
   dependencies:
-    "individual" "^2.0.0"
+    aproba "^1.1.1"
 
-"rxjs@^6.6.0":
-  "integrity" "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="
-  "resolved" "https://registry.npmmirror.com/rxjs/-/rxjs-6.6.7.tgz"
-  "version" "6.6.7"
+runjs@4.4.2:
+  version "4.4.2"
+  resolved "https://registry.npmmirror.com/runjs/-/runjs-4.4.2.tgz"
+  integrity sha512-/DB54HRJnxfGA/a9QLZMyAn8H84SMt8oVGF7Vz+OS4BMCve312DXNRpy6Z8yohLuoMctoalXQtvmpd2ChQYD4Q==
   dependencies:
-    "tslib" "^1.9.0"
+    chalk "2.3.0"
+    lodash.padend "4.6.1"
+    microcli "1.3.3"
+    omelette "0.4.5"
 
-"rxjs@^7.5.5":
-  "integrity" "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg=="
-  "resolved" "https://registry.npmmirror.com/rxjs/-/rxjs-7.8.1.tgz"
-  "version" "7.8.1"
+rust-result@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/rust-result/-/rust-result-1.0.0.tgz"
+  integrity sha512-6cJzSBU+J/RJCF063onnQf0cDUOHs9uZI1oroSGnHOph+CQTIJ5Pp2hK5kEQq1+7yE/EEWfulSNXAQ2jikPthA==
   dependencies:
-    "tslib" "^2.1.0"
+    individual "^2.0.0"
 
-"safe-array-concat@^1.0.0", "safe-array-concat@^1.0.1":
-  "integrity" "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q=="
-  "resolved" "https://registry.npmmirror.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz"
-  "version" "1.0.1"
+rxjs@^6.6.0:
+  version "6.6.7"
+  resolved "https://registry.npmmirror.com/rxjs/-/rxjs-6.6.7.tgz"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
-    "call-bind" "^1.0.2"
-    "get-intrinsic" "^1.2.1"
-    "has-symbols" "^1.0.3"
-    "isarray" "^2.0.5"
+    tslib "^1.9.0"
 
-"safe-buffer@^5.0.1", "safe-buffer@^5.1.0", "safe-buffer@^5.1.1", "safe-buffer@^5.1.2", "safe-buffer@^5.2.0", "safe-buffer@^5.2.1", "safe-buffer@>=5.1.0", "safe-buffer@5.2.1":
-  "integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-  "resolved" "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz"
-  "version" "5.2.1"
-
-"safe-buffer@~5.1.0":
-  "integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-  "resolved" "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz"
-  "version" "5.1.2"
-
-"safe-buffer@~5.1.1":
-  "integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-  "resolved" "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz"
-  "version" "5.1.2"
-
-"safe-buffer@5.1.2":
-  "integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-  "resolved" "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz"
-  "version" "5.1.2"
-
-"safe-json-parse@4.0.0":
-  "integrity" "sha512-RjZPPHugjK0TOzFrLZ8inw44s9bKox99/0AZW9o/BEQVrJfhI+fIHMErnPyRa89/yRXUUr93q+tiN6zhoVV4wQ=="
-  "resolved" "https://registry.npmmirror.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz"
-  "version" "4.0.0"
+rxjs@^7.5.5:
+  version "7.8.1"
+  resolved "https://registry.npmmirror.com/rxjs/-/rxjs-7.8.1.tgz"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
   dependencies:
-    "rust-result" "^1.0.0"
+    tslib "^2.1.0"
 
-"safe-regex-test@^1.0.0":
-  "integrity" "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="
-  "resolved" "https://registry.npmmirror.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz"
-  "version" "1.0.0"
+safe-array-concat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz"
+  integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==
   dependencies:
-    "call-bind" "^1.0.2"
-    "get-intrinsic" "^1.1.3"
-    "is-regex" "^1.1.4"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
 
-"safe-regex@^1.1.0":
-  "integrity" "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg=="
-  "resolved" "https://registry.npmmirror.com/safe-regex/-/safe-regex-1.1.0.tgz"
-  "version" "1.1.0"
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@>=5.1.0, safe-buffer@5.2.1:
+  version "5.2.1"
+  resolved "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-buffer@~5.1.0:
+  version "5.1.2"
+  resolved "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-buffer@5.1.2:
+  version "5.1.2"
+  resolved "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-json-parse@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz"
+  integrity sha512-RjZPPHugjK0TOzFrLZ8inw44s9bKox99/0AZW9o/BEQVrJfhI+fIHMErnPyRa89/yRXUUr93q+tiN6zhoVV4wQ==
   dependencies:
-    "ret" "~0.1.10"
+    rust-result "^1.0.0"
 
-"safer-buffer@^2.0.2", "safer-buffer@^2.1.0", "safer-buffer@>= 2.1.2 < 3", "safer-buffer@~2.1.0":
-  "integrity" "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-  "resolved" "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz"
-  "version" "2.1.2"
-
-"sass-loader@10.2.0":
-  "integrity" "sha512-kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw=="
-  "resolved" "https://registry.npmmirror.com/sass-loader/-/sass-loader-10.2.0.tgz"
-  "version" "10.2.0"
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
   dependencies:
-    "klona" "^2.0.4"
-    "loader-utils" "^2.0.0"
-    "neo-async" "^2.6.2"
-    "schema-utils" "^3.0.0"
-    "semver" "^7.3.2"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
 
-"sass@^1.3.0", "sass@1.32.13":
-  "integrity" "sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA=="
-  "resolved" "https://registry.npmmirror.com/sass/-/sass-1.32.13.tgz"
-  "version" "1.32.13"
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/safe-regex/-/safe-regex-1.1.0.tgz"
+  integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==
   dependencies:
-    "chokidar" ">=3.0.0 <4.0.0"
+    ret "~0.1.10"
 
-"sax@^1.2.4":
-  "integrity" "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
-  "resolved" "https://registry.npmmirror.com/sax/-/sax-1.3.0.tgz"
-  "version" "1.3.0"
+safer-buffer@^2.0.2, safer-buffer@^2.1.0, "safer-buffer@>= 2.1.2 < 3", safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-"sax@~1.2.4":
-  "integrity" "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-  "resolved" "https://registry.npmmirror.com/sax/-/sax-1.2.4.tgz"
-  "version" "1.2.4"
-
-"saxen@^8.1.2":
-  "integrity" "sha512-xUOiiFbc3Ow7p8KMxwsGICPx46ZQvy3+qfNVhrkwfz3Vvq45eGt98Ft5IQaA1R/7Tb5B5MKh9fUR9x3c3nDTxw=="
-  "resolved" "https://registry.npmmirror.com/saxen/-/saxen-8.1.2.tgz"
-  "version" "8.1.2"
-
-"schema-utils@^1.0.0":
-  "integrity" "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="
-  "resolved" "https://registry.npmmirror.com/schema-utils/-/schema-utils-1.0.0.tgz"
-  "version" "1.0.0"
+sass-loader@10.2.0:
+  version "10.2.0"
+  resolved "https://registry.npmmirror.com/sass-loader/-/sass-loader-10.2.0.tgz"
+  integrity sha512-kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw==
   dependencies:
-    "ajv" "^6.1.0"
-    "ajv-errors" "^1.0.0"
-    "ajv-keywords" "^3.1.0"
+    klona "^2.0.4"
+    loader-utils "^2.0.0"
+    neo-async "^2.6.2"
+    schema-utils "^3.0.0"
+    semver "^7.3.2"
 
-"schema-utils@^2.0.0", "schema-utils@^2.5.0", "schema-utils@^2.6.5", "schema-utils@^2.7.0":
-  "integrity" "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="
-  "resolved" "https://registry.npmmirror.com/schema-utils/-/schema-utils-2.7.1.tgz"
-  "version" "2.7.1"
+sass@^1.3.0, sass@1.32.13:
+  version "1.32.13"
+  resolved "https://registry.npmmirror.com/sass/-/sass-1.32.13.tgz"
+  integrity sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"
+
+sax@^1.2.4, sax@~1.2.4:
+  version "1.2.4"
+  resolved "https://registry.npmmirror.com/sax/-/sax-1.2.4.tgz"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+saxen@^8.1.2:
+  version "8.1.2"
+  resolved "https://registry.npmmirror.com/saxen/-/saxen-8.1.2.tgz"
+  integrity sha512-xUOiiFbc3Ow7p8KMxwsGICPx46ZQvy3+qfNVhrkwfz3Vvq45eGt98Ft5IQaA1R/7Tb5B5MKh9fUR9x3c3nDTxw==
+
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/schema-utils/-/schema-utils-1.0.0.tgz"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.7.0:
+  version "2.7.1"
+  resolved "https://registry.npmmirror.com/schema-utils/-/schema-utils-2.7.1.tgz"
+  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
   dependencies:
     "@types/json-schema" "^7.0.5"
-    "ajv" "^6.12.4"
-    "ajv-keywords" "^3.5.2"
+    ajv "^6.12.4"
+    ajv-keywords "^3.5.2"
 
-"schema-utils@^3.0.0":
-  "integrity" "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg=="
-  "resolved" "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz"
-  "version" "3.3.0"
+schema-utils@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
   dependencies:
     "@types/json-schema" "^7.0.8"
-    "ajv" "^6.12.5"
-    "ajv-keywords" "^3.5.2"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
 
-"screenfull@5.0.2":
-  "integrity" "sha512-cCF2b+L/mnEiORLN5xSAz6H3t18i2oHh9BA8+CQlAh5DRw2+NFAGQJOSYbcGw8B2k04g/lVvFcfZ83b3ysH5UQ=="
-  "resolved" "https://registry.npmmirror.com/screenfull/-/screenfull-5.0.2.tgz"
-  "version" "5.0.2"
+screenfull@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.npmmirror.com/screenfull/-/screenfull-5.0.2.tgz"
+  integrity sha512-cCF2b+L/mnEiORLN5xSAz6H3t18i2oHh9BA8+CQlAh5DRw2+NFAGQJOSYbcGw8B2k04g/lVvFcfZ83b3ysH5UQ==
 
-"script-ext-html-webpack-plugin@2.1.5":
-  "integrity" "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ=="
-  "resolved" "https://registry.npmmirror.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz"
-  "version" "2.1.5"
+script-ext-html-webpack-plugin@2.1.5:
+  version "2.1.5"
+  resolved "https://registry.npmmirror.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz"
+  integrity sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==
   dependencies:
-    "debug" "^4.2.0"
+    debug "^4.2.0"
 
-"scroll-tabs@^1.0.1":
-  "integrity" "sha512-W4xjEwNS4QAyQnaJ450vQTcKpbnalBAfsTDV926WrxEMOqjyj2To8uv2d0Cp0oxMdk5TkygtzXmctPNc2zgBcg=="
-  "resolved" "https://registry.npmmirror.com/scroll-tabs/-/scroll-tabs-1.0.1.tgz"
-  "version" "1.0.1"
+scroll-tabs@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/scroll-tabs/-/scroll-tabs-1.0.1.tgz"
+  integrity sha512-W4xjEwNS4QAyQnaJ450vQTcKpbnalBAfsTDV926WrxEMOqjyj2To8uv2d0Cp0oxMdk5TkygtzXmctPNc2zgBcg==
   dependencies:
-    "min-dash" "^3.1.0"
-    "min-dom" "^3.1.0"
-    "mitt" "^1.1.3"
+    min-dash "^3.1.0"
+    min-dom "^3.1.0"
+    mitt "^1.1.3"
 
-"select-hose@^2.0.0":
-  "integrity" "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
-  "resolved" "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz"
-  "version" "2.0.0"
+select-hose@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz"
+  integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==
 
-"select@^1.1.2":
-  "integrity" "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
-  "resolved" "https://registry.npmmirror.com/select/-/select-1.1.2.tgz"
-  "version" "1.1.2"
+select@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/select/-/select-1.1.2.tgz"
+  integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==
 
-"selection-update@^0.1.2":
-  "integrity" "sha512-4jzoJNh7VT2s2tvm/kUSskSw7pD0BVcrrGccbfOMK+3AXLBPz6nIy1yo+pbXgvNoTNII96Pq92+sAY+rF0LUAA=="
-  "resolved" "https://registry.npmmirror.com/selection-update/-/selection-update-0.1.2.tgz"
-  "version" "0.1.2"
+selection-update@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.npmmirror.com/selection-update/-/selection-update-0.1.2.tgz"
+  integrity sha512-4jzoJNh7VT2s2tvm/kUSskSw7pD0BVcrrGccbfOMK+3AXLBPz6nIy1yo+pbXgvNoTNII96Pq92+sAY+rF0LUAA==
 
-"selfsigned@^1.10.8":
-  "integrity" "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA=="
-  "resolved" "https://registry.npmmirror.com/selfsigned/-/selfsigned-1.10.14.tgz"
-  "version" "1.10.14"
+selfsigned@^1.10.8:
+  version "1.10.14"
+  resolved "https://registry.npmmirror.com/selfsigned/-/selfsigned-1.10.14.tgz"
+  integrity sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==
   dependencies:
-    "node-forge" "^0.10.0"
+    node-forge "^0.10.0"
 
-"semver@^5.5.0", "semver@^5.6.0", "semver@2 || 3 || 4 || 5":
-  "integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
-  "version" "5.7.2"
+semver@^5.5.0:
+  version "5.7.2"
+  resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-"semver@^6.0.0":
-  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
-  "version" "6.3.1"
+semver@^5.6.0:
+  version "5.7.2"
+  resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-"semver@^6.1.0":
-  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
-  "version" "6.3.1"
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-"semver@^6.1.2":
-  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
-  "version" "6.3.1"
-
-"semver@^6.3.0":
-  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
-  "version" "6.3.1"
-
-"semver@^6.3.1":
-  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
-  "version" "6.3.1"
-
-"semver@^7.3.2":
-  "integrity" "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz"
-  "version" "7.5.4"
+semver@^7.3.2:
+  version "7.5.4"
+  resolved "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
-    "lru-cache" "^6.0.0"
+    lru-cache "^6.0.0"
 
-"semver@^7.3.5":
-  "integrity" "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz"
-  "version" "7.5.4"
+semver@^7.3.5:
+  version "7.5.4"
+  resolved "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
-    "lru-cache" "^6.0.0"
+    lru-cache "^6.0.0"
 
-"semver@^7.3.6":
-  "integrity" "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz"
-  "version" "7.5.4"
+semver@^7.3.6:
+  version "7.5.4"
+  resolved "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
-    "lru-cache" "^6.0.0"
+    lru-cache "^6.0.0"
 
-"send@0.18.0":
-  "integrity" "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="
-  "resolved" "https://registry.npmmirror.com/send/-/send-0.18.0.tgz"
-  "version" "0.18.0"
+"semver@2 || 3 || 4 || 5":
+  version "5.7.2"
+  resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
+
+send@0.18.0:
+  version "0.18.0"
+  resolved "https://registry.npmmirror.com/send/-/send-0.18.0.tgz"
+  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
   dependencies:
-    "debug" "2.6.9"
-    "depd" "2.0.0"
-    "destroy" "1.2.0"
-    "encodeurl" "~1.0.2"
-    "escape-html" "~1.0.3"
-    "etag" "~1.8.1"
-    "fresh" "0.5.2"
-    "http-errors" "2.0.0"
-    "mime" "1.6.0"
-    "ms" "2.1.3"
-    "on-finished" "2.4.1"
-    "range-parser" "~1.2.1"
-    "statuses" "2.0.1"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "2.0.0"
+    mime "1.6.0"
+    ms "2.1.3"
+    on-finished "2.4.1"
+    range-parser "~1.2.1"
+    statuses "2.0.1"
 
-"serialize-javascript@^4.0.0":
-  "integrity" "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="
-  "resolved" "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz"
-  "version" "4.0.0"
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
   dependencies:
-    "randombytes" "^2.1.0"
+    randombytes "^2.1.0"
 
-"serialize-javascript@^5.0.1":
-  "integrity" "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="
-  "resolved" "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"
-  "version" "5.0.1"
+serialize-javascript@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"
+  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
   dependencies:
-    "randombytes" "^2.1.0"
+    randombytes "^2.1.0"
 
-"serve-index@^1.9.1":
-  "integrity" "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw=="
-  "resolved" "https://registry.npmmirror.com/serve-index/-/serve-index-1.9.1.tgz"
-  "version" "1.9.1"
+serve-index@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.npmmirror.com/serve-index/-/serve-index-1.9.1.tgz"
+  integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==
   dependencies:
-    "accepts" "~1.3.4"
-    "batch" "0.6.1"
-    "debug" "2.6.9"
-    "escape-html" "~1.0.3"
-    "http-errors" "~1.6.2"
-    "mime-types" "~2.1.17"
-    "parseurl" "~1.3.2"
+    accepts "~1.3.4"
+    batch "0.6.1"
+    debug "2.6.9"
+    escape-html "~1.0.3"
+    http-errors "~1.6.2"
+    mime-types "~2.1.17"
+    parseurl "~1.3.2"
 
-"serve-static@1.15.0":
-  "integrity" "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="
-  "resolved" "https://registry.npmmirror.com/serve-static/-/serve-static-1.15.0.tgz"
-  "version" "1.15.0"
+serve-static@1.15.0:
+  version "1.15.0"
+  resolved "https://registry.npmmirror.com/serve-static/-/serve-static-1.15.0.tgz"
+  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
   dependencies:
-    "encodeurl" "~1.0.2"
-    "escape-html" "~1.0.3"
-    "parseurl" "~1.3.3"
-    "send" "0.18.0"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.18.0"
 
-"set-blocking@^2.0.0":
-  "integrity" "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
-  "resolved" "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz"
-  "version" "2.0.0"
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz"
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
-"set-function-length@^1.1.1":
-  "integrity" "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ=="
-  "resolved" "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.1.1.tgz"
-  "version" "1.1.1"
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/set-value/-/set-value-2.0.1.tgz"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
-    "define-data-property" "^1.1.1"
-    "get-intrinsic" "^1.2.1"
-    "gopd" "^1.0.1"
-    "has-property-descriptors" "^1.0.0"
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
 
-"set-function-name@^2.0.0":
-  "integrity" "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA=="
-  "resolved" "https://registry.npmmirror.com/set-function-name/-/set-function-name-2.0.1.tgz"
-  "version" "2.0.1"
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz"
+  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.1.0.tgz"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.npmmirror.com/sha.js/-/sha.js-2.4.11.tgz"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
-    "define-data-property" "^1.0.1"
-    "functions-have-names" "^1.2.3"
-    "has-property-descriptors" "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
-"set-value@^2.0.0", "set-value@^2.0.1":
-  "integrity" "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="
-  "resolved" "https://registry.npmmirror.com/set-value/-/set-value-2.0.1.tgz"
-  "version" "2.0.1"
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/shebang-command/-/shebang-command-1.2.0.tgz"
+  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
   dependencies:
-    "extend-shallow" "^2.0.1"
-    "is-extendable" "^0.1.1"
-    "is-plain-object" "^2.0.3"
-    "split-string" "^3.0.1"
+    shebang-regex "^1.0.0"
 
-"setimmediate@^1.0.4":
-  "integrity" "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
-  "resolved" "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz"
-  "version" "1.0.5"
-
-"setprototypeof@1.1.0":
-  "integrity" "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-  "resolved" "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.1.0.tgz"
-  "version" "1.1.0"
-
-"setprototypeof@1.2.0":
-  "integrity" "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-  "resolved" "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz"
-  "version" "1.2.0"
-
-"sha.js@^2.4.0", "sha.js@^2.4.8":
-  "integrity" "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="
-  "resolved" "https://registry.npmmirror.com/sha.js/-/sha.js-2.4.11.tgz"
-  "version" "2.4.11"
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
   dependencies:
-    "inherits" "^2.0.1"
-    "safe-buffer" "^5.0.1"
+    shebang-regex "^3.0.0"
 
-"shebang-command@^1.2.0":
-  "integrity" "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="
-  "resolved" "https://registry.npmmirror.com/shebang-command/-/shebang-command-1.2.0.tgz"
-  "version" "1.2.0"
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-1.0.0.tgz"
+  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+shell-quote@^1.7.3:
+  version "1.8.1"
+  resolved "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.8.1.tgz"
+  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
+
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
   dependencies:
-    "shebang-regex" "^1.0.0"
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
 
-"shebang-command@^2.0.0":
-  "integrity" "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="
-  "resolved" "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz"
-  "version" "2.0.0"
+sigmund@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/sigmund/-/sigmund-1.0.1.tgz"
+  integrity sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==
+
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
+  version "3.0.7"
+  resolved "https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
+simple-swizzle@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.npmmirror.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz"
+  integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==
   dependencies:
-    "shebang-regex" "^3.0.0"
+    is-arrayish "^0.3.1"
 
-"shebang-regex@^1.0.0":
-  "integrity" "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="
-  "resolved" "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-1.0.0.tgz"
-  "version" "1.0.0"
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/slash/-/slash-1.0.0.tgz"
+  integrity sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==
 
-"shebang-regex@^3.0.0":
-  "integrity" "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-  "resolved" "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz"
-  "version" "3.0.0"
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/slash/-/slash-2.0.0.tgz"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
-"shell-quote@^1.8.1":
-  "integrity" "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA=="
-  "resolved" "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.8.1.tgz"
-  "version" "1.8.1"
-
-"side-channel@^1.0.4":
-  "integrity" "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="
-  "resolved" "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz"
-  "version" "1.0.4"
+slice-ansi@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-2.1.0.tgz"
+  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
   dependencies:
-    "call-bind" "^1.0.0"
-    "get-intrinsic" "^1.0.2"
-    "object-inspect" "^1.9.0"
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
+    is-fullwidth-code-point "^2.0.0"
 
-"sigmund@^1.0.1":
-  "integrity" "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="
-  "resolved" "https://registry.npmmirror.com/sigmund/-/sigmund-1.0.1.tgz"
-  "version" "1.0.1"
-
-"signal-exit@^3.0.0", "signal-exit@^3.0.2", "signal-exit@^3.0.3":
-  "integrity" "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-  "resolved" "https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz"
-  "version" "3.0.7"
-
-"simple-swizzle@^0.2.2":
-  "integrity" "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="
-  "resolved" "https://registry.npmmirror.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz"
-  "version" "0.2.2"
+slice-ansi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-3.0.0.tgz"
+  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
   dependencies:
-    "is-arrayish" "^0.3.1"
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
 
-"slash@^1.0.0":
-  "integrity" "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg=="
-  "resolved" "https://registry.npmmirror.com/slash/-/slash-1.0.0.tgz"
-  "version" "1.0.0"
-
-"slash@^2.0.0":
-  "integrity" "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="
-  "resolved" "https://registry.npmmirror.com/slash/-/slash-2.0.0.tgz"
-  "version" "2.0.0"
-
-"slice-ansi@^2.1.0":
-  "integrity" "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="
-  "resolved" "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-2.1.0.tgz"
-  "version" "2.1.0"
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-4.0.0.tgz"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
   dependencies:
-    "ansi-styles" "^3.2.0"
-    "astral-regex" "^1.0.0"
-    "is-fullwidth-code-point" "^2.0.0"
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
 
-"slice-ansi@^3.0.0":
-  "integrity" "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="
-  "resolved" "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-3.0.0.tgz"
-  "version" "3.0.0"
+slice-ansi@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-5.0.0.tgz"
+  integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==
   dependencies:
-    "ansi-styles" "^4.0.0"
-    "astral-regex" "^2.0.0"
-    "is-fullwidth-code-point" "^3.0.0"
+    ansi-styles "^6.0.0"
+    is-fullwidth-code-point "^4.0.0"
 
-"slice-ansi@^4.0.0":
-  "integrity" "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="
-  "resolved" "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-4.0.0.tgz"
-  "version" "4.0.0"
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.npmmirror.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
-    "ansi-styles" "^4.0.0"
-    "astral-regex" "^2.0.0"
-    "is-fullwidth-code-point" "^3.0.0"
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
 
-"slice-ansi@^5.0.0":
-  "integrity" "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ=="
-  "resolved" "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-5.0.0.tgz"
-  "version" "5.0.0"
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmmirror.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
-    "ansi-styles" "^6.0.0"
-    "is-fullwidth-code-point" "^4.0.0"
+    kind-of "^3.2.0"
 
-"snapdragon-node@^2.0.1":
-  "integrity" "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="
-  "resolved" "https://registry.npmmirror.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"
-  "version" "2.1.1"
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.npmmirror.com/snapdragon/-/snapdragon-0.8.2.tgz"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
-    "define-property" "^1.0.0"
-    "isobject" "^3.0.0"
-    "snapdragon-util" "^3.0.1"
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
 
-"snapdragon-util@^3.0.1":
-  "integrity" "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="
-  "resolved" "https://registry.npmmirror.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"
-  "version" "3.0.1"
-  dependencies:
-    "kind-of" "^3.2.0"
-
-"snapdragon@^0.8.1":
-  "integrity" "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="
-  "resolved" "https://registry.npmmirror.com/snapdragon/-/snapdragon-0.8.2.tgz"
-  "version" "0.8.2"
-  dependencies:
-    "base" "^0.11.1"
-    "debug" "^2.2.0"
-    "define-property" "^0.2.5"
-    "extend-shallow" "^2.0.1"
-    "map-cache" "^0.2.2"
-    "source-map" "^0.5.6"
-    "source-map-resolve" "^0.5.0"
-    "use" "^3.1.0"
-
-"socket.io-client@^4.5.1":
-  "integrity" "sha512-vtA0uD4ibrYD793SOIAwlo8cj6haOeMHrGvwPxJsxH7CeIksqJ+3Zc06RvWTIFgiSqx4A3sOnTXpfAEE2Zyz6w=="
-  "resolved" "https://registry.npmmirror.com/socket.io-client/-/socket.io-client-4.7.2.tgz"
-  "version" "4.7.2"
+socket.io-client@^4.5.1:
+  version "4.7.2"
+  resolved "https://registry.npmmirror.com/socket.io-client/-/socket.io-client-4.7.2.tgz"
+  integrity sha512-vtA0uD4ibrYD793SOIAwlo8cj6haOeMHrGvwPxJsxH7CeIksqJ+3Zc06RvWTIFgiSqx4A3sOnTXpfAEE2Zyz6w==
   dependencies:
     "@socket.io/component-emitter" "~3.1.0"
-    "debug" "~4.3.2"
-    "engine.io-client" "~6.5.2"
-    "socket.io-parser" "~4.2.4"
+    debug "~4.3.2"
+    engine.io-client "~6.5.2"
+    socket.io-parser "~4.2.4"
 
-"socket.io-parser@~4.2.4":
-  "integrity" "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew=="
-  "resolved" "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz"
-  "version" "4.2.4"
+socket.io-parser@~4.2.4:
+  version "4.2.4"
+  resolved "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz"
+  integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==
   dependencies:
     "@socket.io/component-emitter" "~3.1.0"
-    "debug" "~4.3.1"
+    debug "~4.3.1"
 
-"sockjs-client@^1.5.0":
-  "integrity" "sha512-2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw=="
-  "resolved" "https://registry.npmmirror.com/sockjs-client/-/sockjs-client-1.6.1.tgz"
-  "version" "1.6.1"
+sockjs-client@^1.5.0:
+  version "1.6.1"
+  resolved "https://registry.npmmirror.com/sockjs-client/-/sockjs-client-1.6.1.tgz"
+  integrity sha512-2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw==
   dependencies:
-    "debug" "^3.2.7"
-    "eventsource" "^2.0.2"
-    "faye-websocket" "^0.11.4"
-    "inherits" "^2.0.4"
-    "url-parse" "^1.5.10"
+    debug "^3.2.7"
+    eventsource "^2.0.2"
+    faye-websocket "^0.11.4"
+    inherits "^2.0.4"
+    url-parse "^1.5.10"
 
-"sockjs@^0.3.21":
-  "integrity" "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="
-  "resolved" "https://registry.npmmirror.com/sockjs/-/sockjs-0.3.24.tgz"
-  "version" "0.3.24"
+sockjs@^0.3.21:
+  version "0.3.24"
+  resolved "https://registry.npmmirror.com/sockjs/-/sockjs-0.3.24.tgz"
+  integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==
   dependencies:
-    "faye-websocket" "^0.11.3"
-    "uuid" "^8.3.2"
-    "websocket-driver" "^0.7.4"
+    faye-websocket "^0.11.3"
+    uuid "^8.3.2"
+    websocket-driver "^0.7.4"
 
-"sort-keys@^1.0.0":
-  "integrity" "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg=="
-  "resolved" "https://registry.npmmirror.com/sort-keys/-/sort-keys-1.1.2.tgz"
-  "version" "1.1.2"
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/sort-keys/-/sort-keys-1.1.2.tgz"
+  integrity sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==
   dependencies:
-    "is-plain-obj" "^1.0.0"
+    is-plain-obj "^1.0.0"
 
-"sortablejs@1.10.2":
-  "integrity" "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
-  "resolved" "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.10.2.tgz"
-  "version" "1.10.2"
+sortablejs@1.10.2:
+  version "1.10.2"
+  resolved "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.10.2.tgz"
+  integrity sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==
 
-"source-list-map@^2.0.0":
-  "integrity" "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
-  "resolved" "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz"
-  "version" "2.0.1"
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-"source-map-js@^1.0.2":
-  "integrity" "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
-  "resolved" "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz"
-  "version" "1.0.2"
+source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
-"source-map-resolve@^0.5.0":
-  "integrity" "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="
-  "resolved" "https://registry.npmmirror.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"
-  "version" "0.5.3"
+source-map-resolve@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.npmmirror.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
-    "atob" "^2.1.2"
-    "decode-uri-component" "^0.2.0"
-    "resolve-url" "^0.2.1"
-    "source-map-url" "^0.4.0"
-    "urix" "^0.1.0"
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
 
-"source-map-support@~0.5.12", "source-map-support@~0.5.20":
-  "integrity" "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="
-  "resolved" "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz"
-  "version" "0.5.21"
+source-map-support@~0.5.12, source-map-support@~0.5.20:
+  version "0.5.21"
+  resolved "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
-    "buffer-from" "^1.0.0"
-    "source-map" "^0.6.0"
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
 
-"source-map-url@^0.4.0":
-  "integrity" "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="
-  "resolved" "https://registry.npmmirror.com/source-map-url/-/source-map-url-0.4.1.tgz"
-  "version" "0.4.1"
+source-map-url@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.npmmirror.com/source-map-url/-/source-map-url-0.4.1.tgz"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
-"source-map@^0.5.6":
-  "integrity" "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-  "resolved" "https://registry.npmmirror.com/source-map/-/source-map-0.5.7.tgz"
-  "version" "0.5.7"
+source-map@^0.5.6:
+  version "0.5.7"
+  resolved "https://registry.npmmirror.com/source-map/-/source-map-0.5.7.tgz"
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
-"source-map@^0.6.0", "source-map@^0.6.1", "source-map@~0.6.0", "source-map@~0.6.1":
-  "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-  "resolved" "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz"
-  "version" "0.6.1"
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-"source-map@^0.7.3":
-  "integrity" "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
-  "resolved" "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz"
-  "version" "0.7.4"
+source-map@^0.7.3:
+  version "0.7.4"
+  resolved "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz"
+  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
 
-"spdx-correct@^3.0.0":
-  "integrity" "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA=="
-  "resolved" "https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.2.0.tgz"
-  "version" "3.2.0"
+spdx-correct@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.2.0.tgz"
+  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
   dependencies:
-    "spdx-expression-parse" "^3.0.0"
-    "spdx-license-ids" "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
 
-"spdx-exceptions@^2.1.0":
-  "integrity" "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
-  "resolved" "https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"
-  "version" "2.3.0"
+spdx-exceptions@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
-"spdx-expression-parse@^3.0.0":
-  "integrity" "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="
-  "resolved" "https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
-  "version" "3.0.1"
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
-    "spdx-exceptions" "^2.1.0"
-    "spdx-license-ids" "^3.0.0"
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
 
-"spdx-license-ids@^3.0.0":
-  "integrity" "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="
-  "resolved" "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz"
-  "version" "3.0.16"
+spdx-license-ids@^3.0.0:
+  version "3.0.13"
+  resolved "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz"
+  integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
 
-"spdy-transport@^3.0.0":
-  "integrity" "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="
-  "resolved" "https://registry.npmmirror.com/spdy-transport/-/spdy-transport-3.0.0.tgz"
-  "version" "3.0.0"
+spdy-transport@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/spdy-transport/-/spdy-transport-3.0.0.tgz"
+  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
   dependencies:
-    "debug" "^4.1.0"
-    "detect-node" "^2.0.4"
-    "hpack.js" "^2.1.6"
-    "obuf" "^1.1.2"
-    "readable-stream" "^3.0.6"
-    "wbuf" "^1.7.3"
+    debug "^4.1.0"
+    detect-node "^2.0.4"
+    hpack.js "^2.1.6"
+    obuf "^1.1.2"
+    readable-stream "^3.0.6"
+    wbuf "^1.7.3"
 
-"spdy@^4.0.2":
-  "integrity" "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="
-  "resolved" "https://registry.npmmirror.com/spdy/-/spdy-4.0.2.tgz"
-  "version" "4.0.2"
+spdy@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/spdy/-/spdy-4.0.2.tgz"
+  integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
   dependencies:
-    "debug" "^4.1.0"
-    "handle-thing" "^2.0.0"
-    "http-deceiver" "^1.2.7"
-    "select-hose" "^2.0.0"
-    "spdy-transport" "^3.0.0"
+    debug "^4.1.0"
+    handle-thing "^2.0.0"
+    http-deceiver "^1.2.7"
+    select-hose "^2.0.0"
+    spdy-transport "^3.0.0"
 
-"split-string@^3.0.1", "split-string@^3.0.2":
-  "integrity" "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="
-  "resolved" "https://registry.npmmirror.com/split-string/-/split-string-3.1.0.tgz"
-  "version" "3.1.0"
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/split-string/-/split-string-3.1.0.tgz"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
-    "extend-shallow" "^3.0.0"
+    extend-shallow "^3.0.0"
 
-"sprintf-js@~1.0.2":
-  "integrity" "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
-  "resolved" "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.0.3.tgz"
-  "version" "1.0.3"
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.0.3.tgz"
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-"ssf@~0.11.2":
-  "integrity" "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="
-  "resolved" "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz"
-  "version" "0.11.2"
+ssf@~0.11.2:
+  version "0.11.2"
+  resolved "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz"
+  integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
   dependencies:
-    "frac" "~1.1.2"
+    frac "~1.1.2"
 
-"sshpk@^1.7.0":
-  "integrity" "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ=="
-  "resolved" "https://registry.npmmirror.com/sshpk/-/sshpk-1.18.0.tgz"
-  "version" "1.18.0"
+sshpk@^1.7.0:
+  version "1.17.0"
+  resolved "https://registry.npmmirror.com/sshpk/-/sshpk-1.17.0.tgz"
+  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
   dependencies:
-    "asn1" "~0.2.3"
-    "assert-plus" "^1.0.0"
-    "bcrypt-pbkdf" "^1.0.0"
-    "dashdash" "^1.12.0"
-    "ecc-jsbn" "~0.1.1"
-    "getpass" "^0.1.1"
-    "jsbn" "~0.1.0"
-    "safer-buffer" "^2.0.2"
-    "tweetnacl" "~0.14.0"
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
 
-"ssri@^6.0.1":
-  "integrity" "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q=="
-  "resolved" "https://registry.npmmirror.com/ssri/-/ssri-6.0.2.tgz"
-  "version" "6.0.2"
+ssri@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.npmmirror.com/ssri/-/ssri-6.0.2.tgz"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
-    "figgy-pudding" "^3.5.1"
+    figgy-pudding "^3.5.1"
 
-"ssri@^8.0.1":
-  "integrity" "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="
-  "resolved" "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz"
-  "version" "8.0.1"
+ssri@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz"
+  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
   dependencies:
-    "minipass" "^3.1.1"
+    minipass "^3.1.1"
 
-"stable@^0.1.8":
-  "integrity" "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
-  "resolved" "https://registry.npmmirror.com/stable/-/stable-0.1.8.tgz"
-  "version" "0.1.8"
+stable@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.npmmirror.com/stable/-/stable-0.1.8.tgz"
+  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
-"stackblur-canvas@^2.0.0":
-  "integrity" "sha512-8S1aIA+UoF6erJYnglGPug6MaHYGo1Ot7h5fuXx4fUPvcvQfcdw2o/ppCse63+eZf8PPidSu4v1JnmEVtEDnpg=="
-  "resolved" "https://registry.npmmirror.com/stackblur-canvas/-/stackblur-canvas-2.6.0.tgz"
-  "version" "2.6.0"
+stackblur-canvas@^2.0.0:
+  version "2.6.0"
+  resolved "https://registry.npmmirror.com/stackblur-canvas/-/stackblur-canvas-2.6.0.tgz"
+  integrity sha512-8S1aIA+UoF6erJYnglGPug6MaHYGo1Ot7h5fuXx4fUPvcvQfcdw2o/ppCse63+eZf8PPidSu4v1JnmEVtEDnpg==
 
-"stackframe@^1.3.4":
-  "integrity" "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="
-  "resolved" "https://registry.npmmirror.com/stackframe/-/stackframe-1.3.4.tgz"
-  "version" "1.3.4"
+stackframe@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.npmmirror.com/stackframe/-/stackframe-1.3.4.tgz"
+  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
 
-"static-extend@^0.1.1":
-  "integrity" "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g=="
-  "resolved" "https://registry.npmmirror.com/static-extend/-/static-extend-0.1.2.tgz"
-  "version" "0.1.2"
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.npmmirror.com/static-extend/-/static-extend-0.1.2.tgz"
+  integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==
   dependencies:
-    "define-property" "^0.2.5"
-    "object-copy" "^0.1.0"
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
 
 "statuses@>= 1.4.0 < 2":
-  "integrity" "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
-  "resolved" "https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz"
-  "version" "1.5.0"
+  version "1.5.0"
+  resolved "https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz"
+  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-"statuses@~1.3.1":
-  "integrity" "sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg=="
-  "resolved" "https://registry.npmmirror.com/statuses/-/statuses-1.3.1.tgz"
-  "version" "1.3.1"
+statuses@~1.3.1:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/statuses/-/statuses-1.3.1.tgz"
+  integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==
 
-"statuses@2.0.1":
-  "integrity" "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
-  "resolved" "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz"
-  "version" "2.0.1"
+statuses@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz"
+  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
-"stream-browserify@^2.0.1":
-  "integrity" "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="
-  "resolved" "https://registry.npmmirror.com/stream-browserify/-/stream-browserify-2.0.2.tgz"
-  "version" "2.0.2"
+stream-browserify@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/stream-browserify/-/stream-browserify-2.0.2.tgz"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
   dependencies:
-    "inherits" "~2.0.1"
-    "readable-stream" "^2.0.2"
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
 
-"stream-each@^1.1.0":
-  "integrity" "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="
-  "resolved" "https://registry.npmmirror.com/stream-each/-/stream-each-1.2.3.tgz"
-  "version" "1.2.3"
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.npmmirror.com/stream-each/-/stream-each-1.2.3.tgz"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
   dependencies:
-    "end-of-stream" "^1.1.0"
-    "stream-shift" "^1.0.0"
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
 
-"stream-http@^2.7.2":
-  "integrity" "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="
-  "resolved" "https://registry.npmmirror.com/stream-http/-/stream-http-2.8.3.tgz"
-  "version" "2.8.3"
+stream-http@^2.7.2:
+  version "2.8.3"
+  resolved "https://registry.npmmirror.com/stream-http/-/stream-http-2.8.3.tgz"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
   dependencies:
-    "builtin-status-codes" "^3.0.0"
-    "inherits" "^2.0.1"
-    "readable-stream" "^2.3.6"
-    "to-arraybuffer" "^1.0.0"
-    "xtend" "^4.0.0"
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
 
-"stream-shift@^1.0.0":
-  "integrity" "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
-  "resolved" "https://registry.npmmirror.com/stream-shift/-/stream-shift-1.0.1.tgz"
-  "version" "1.0.1"
+stream-shift@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/stream-shift/-/stream-shift-1.0.1.tgz"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
-"strict-uri-encode@^1.0.0":
-  "integrity" "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ=="
-  "resolved" "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"
-  "version" "1.1.0"
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"
+  integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==
 
-"string_decoder@^1.0.0", "string_decoder@^1.1.1", "string_decoder@~1.1.1":
-  "integrity" "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="
-  "resolved" "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz"
-  "version" "1.1.1"
+string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
-    "safe-buffer" "~5.1.0"
+    safe-buffer "~5.1.0"
 
-"string-argv@^0.3.1":
-  "integrity" "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q=="
-  "resolved" "https://registry.npmmirror.com/string-argv/-/string-argv-0.3.2.tgz"
-  "version" "0.3.2"
+string-argv@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.npmmirror.com/string-argv/-/string-argv-0.3.2.tgz"
+  integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
 
-"string-width@^3.0.0", "string-width@^3.1.0":
-  "integrity" "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="
-  "resolved" "https://registry.npmmirror.com/string-width/-/string-width-3.1.0.tgz"
-  "version" "3.1.0"
+string-width@^3.0.0, string-width@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/string-width/-/string-width-3.1.0.tgz"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
   dependencies:
-    "emoji-regex" "^7.0.1"
-    "is-fullwidth-code-point" "^2.0.0"
-    "strip-ansi" "^5.1.0"
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
 
-"string-width@^4.1.0", "string-width@^4.2.0", "string-width@^4.2.3":
-  "integrity" "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="
-  "resolved" "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz"
-  "version" "4.2.3"
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
-    "emoji-regex" "^8.0.0"
-    "is-fullwidth-code-point" "^3.0.0"
-    "strip-ansi" "^6.0.1"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
 
-"string-width@^5.0.0":
-  "integrity" "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="
-  "resolved" "https://registry.npmmirror.com/string-width/-/string-width-5.1.2.tgz"
-  "version" "5.1.2"
+string-width@^5.0.0:
+  version "5.1.2"
+  resolved "https://registry.npmmirror.com/string-width/-/string-width-5.1.2.tgz"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
   dependencies:
-    "eastasianwidth" "^0.2.0"
-    "emoji-regex" "^9.2.2"
-    "strip-ansi" "^7.0.1"
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
 
-"string.prototype.trim@^1.2.8":
-  "integrity" "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ=="
-  "resolved" "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz"
-  "version" "1.2.8"
+string.prototype.trim@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz"
+  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-"string.prototype.trimend@^1.0.7":
-  "integrity" "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA=="
-  "resolved" "https://registry.npmmirror.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz"
-  "version" "1.0.7"
+string.prototype.trimend@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.npmmirror.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"
+  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-"string.prototype.trimstart@^1.0.7":
-  "integrity" "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg=="
-  "resolved" "https://registry.npmmirror.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz"
-  "version" "1.0.7"
+string.prototype.trimstart@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.npmmirror.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"
+  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
   dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-"strip-ansi@^3.0.0":
-  "integrity" "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="
-  "resolved" "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz"
-  "version" "3.0.1"
+strip-ansi@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz"
+  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
   dependencies:
-    "ansi-regex" "^2.0.0"
+    ansi-regex "^2.0.0"
 
-"strip-ansi@^3.0.1":
-  "integrity" "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="
-  "resolved" "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz"
-  "version" "3.0.1"
+strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz"
+  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
   dependencies:
-    "ansi-regex" "^2.0.0"
+    ansi-regex "^2.0.0"
 
-"strip-ansi@^5.0.0":
-  "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="
-  "resolved" "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-5.2.0.tgz"
-  "version" "5.2.0"
+strip-ansi@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-5.2.0.tgz"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    "ansi-regex" "^4.1.0"
+    ansi-regex "^4.1.0"
 
-"strip-ansi@^5.1.0":
-  "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="
-  "resolved" "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-5.2.0.tgz"
-  "version" "5.2.0"
+strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-5.2.0.tgz"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    "ansi-regex" "^4.1.0"
+    ansi-regex "^4.1.0"
 
-"strip-ansi@^5.2.0":
-  "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="
-  "resolved" "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-5.2.0.tgz"
-  "version" "5.2.0"
+strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-5.2.0.tgz"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    "ansi-regex" "^4.1.0"
+    ansi-regex "^4.1.0"
 
-"strip-ansi@^6.0.0", "strip-ansi@^6.0.1":
-  "integrity" "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="
-  "resolved" "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz"
-  "version" "6.0.1"
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    "ansi-regex" "^5.0.1"
+    ansi-regex "^5.0.1"
 
-"strip-ansi@^7.0.1":
-  "integrity" "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="
-  "resolved" "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz"
-  "version" "7.1.0"
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
   dependencies:
-    "ansi-regex" "^6.0.1"
+    ansi-regex "^6.0.1"
 
-"strip-bom@^3.0.0":
-  "integrity" "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="
-  "resolved" "https://registry.npmmirror.com/strip-bom/-/strip-bom-3.0.0.tgz"
-  "version" "3.0.0"
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/strip-bom/-/strip-bom-3.0.0.tgz"
+  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
-"strip-eof@^1.0.0":
-  "integrity" "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="
-  "resolved" "https://registry.npmmirror.com/strip-eof/-/strip-eof-1.0.0.tgz"
-  "version" "1.0.0"
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/strip-eof/-/strip-eof-1.0.0.tgz"
+  integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==
 
-"strip-final-newline@^2.0.0":
-  "integrity" "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
-  "resolved" "https://registry.npmmirror.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
-  "version" "2.0.0"
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-"strip-indent@^2.0.0":
-  "integrity" "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA=="
-  "resolved" "https://registry.npmmirror.com/strip-indent/-/strip-indent-2.0.0.tgz"
-  "version" "2.0.0"
+strip-indent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/strip-indent/-/strip-indent-2.0.0.tgz"
+  integrity sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==
 
-"strip-json-comments@^3.0.1":
-  "integrity" "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
-  "resolved" "https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
-  "version" "3.1.1"
+strip-json-comments@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-"stylehacks@^4.0.0":
-  "integrity" "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="
-  "resolved" "https://registry.npmmirror.com/stylehacks/-/stylehacks-4.0.3.tgz"
-  "version" "4.0.3"
+stylehacks@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.npmmirror.com/stylehacks/-/stylehacks-4.0.3.tgz"
+  integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==
   dependencies:
-    "browserslist" "^4.0.0"
-    "postcss" "^7.0.0"
-    "postcss-selector-parser" "^3.0.0"
+    browserslist "^4.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
 
-"supports-color@^2.0.0":
-  "integrity" "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="
-  "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-2.0.0.tgz"
-  "version" "2.0.0"
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/supports-color/-/supports-color-2.0.0.tgz"
+  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
 
-"supports-color@^3.2.3":
-  "integrity" "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A=="
-  "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-3.2.3.tgz"
-  "version" "3.2.3"
+supports-color@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.npmmirror.com/supports-color/-/supports-color-3.2.3.tgz"
+  integrity sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==
   dependencies:
-    "has-flag" "^1.0.0"
+    has-flag "^1.0.0"
 
-"supports-color@^4.0.0":
-  "integrity" "sha512-ycQR/UbvI9xIlEdQT1TQqwoXtEldExbCEAJgRo5YXlmSKjv6ThHnP9/vwGa1gr19Gfw+LkFd7KqYMhzrRC5JYw=="
-  "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-4.5.0.tgz"
-  "version" "4.5.0"
+supports-color@^4.0.0:
+  version "4.5.0"
+  resolved "https://registry.npmmirror.com/supports-color/-/supports-color-4.5.0.tgz"
+  integrity sha512-ycQR/UbvI9xIlEdQT1TQqwoXtEldExbCEAJgRo5YXlmSKjv6ThHnP9/vwGa1gr19Gfw+LkFd7KqYMhzrRC5JYw==
   dependencies:
-    "has-flag" "^2.0.0"
+    has-flag "^2.0.0"
 
-"supports-color@^5.3.0":
-  "integrity" "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="
-  "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz"
-  "version" "5.5.0"
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
-    "has-flag" "^3.0.0"
+    has-flag "^3.0.0"
 
-"supports-color@^6.1.0":
-  "integrity" "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="
-  "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-6.1.0.tgz"
-  "version" "6.1.0"
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.npmmirror.com/supports-color/-/supports-color-6.1.0.tgz"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
   dependencies:
-    "has-flag" "^3.0.0"
+    has-flag "^3.0.0"
 
-"supports-color@^7.0.0":
-  "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
-  "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz"
-  "version" "7.2.0"
+supports-color@^7.0.0, supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
-    "has-flag" "^4.0.0"
+    has-flag "^4.0.0"
 
-"supports-color@^7.1.0":
-  "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
-  "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz"
-  "version" "7.2.0"
+supports-color@^9.2.2:
+  version "9.4.0"
+  resolved "https://registry.npmmirror.com/supports-color/-/supports-color-9.4.0.tgz"
+  integrity sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==
+
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
+svg-baker-runtime@^1.4.7:
+  version "1.4.7"
+  resolved "https://registry.npmmirror.com/svg-baker-runtime/-/svg-baker-runtime-1.4.7.tgz"
+  integrity sha512-Zorfwwj5+lWjk/oxwSMsRdS2sPQQdTmmsvaSpzU+i9ZWi3zugHLt6VckWfnswphQP0LmOel3nggpF5nETbt6xw==
   dependencies:
-    "has-flag" "^4.0.0"
+    deepmerge "1.3.2"
+    mitt "1.1.2"
+    svg-baker "^1.7.0"
 
-"supports-color@^9.2.2":
-  "integrity" "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw=="
-  "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-9.4.0.tgz"
-  "version" "9.4.0"
-
-"supports-preserve-symlinks-flag@^1.0.0":
-  "integrity" "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
-  "resolved" "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
-  "version" "1.0.0"
-
-"svg-baker-runtime@^1.4.7":
-  "integrity" "sha512-Zorfwwj5+lWjk/oxwSMsRdS2sPQQdTmmsvaSpzU+i9ZWi3zugHLt6VckWfnswphQP0LmOel3nggpF5nETbt6xw=="
-  "resolved" "https://registry.npmmirror.com/svg-baker-runtime/-/svg-baker-runtime-1.4.7.tgz"
-  "version" "1.4.7"
+svg-baker@^1.5.0, svg-baker@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.npmmirror.com/svg-baker/-/svg-baker-1.7.0.tgz"
+  integrity sha512-nibslMbkXOIkqKVrfcncwha45f97fGuAOn1G99YwnwTj8kF9YiM6XexPcUso97NxOm6GsP0SIvYVIosBis1xLg==
   dependencies:
-    "deepmerge" "1.3.2"
-    "mitt" "1.1.2"
-    "svg-baker" "^1.7.0"
+    bluebird "^3.5.0"
+    clone "^2.1.1"
+    he "^1.1.1"
+    image-size "^0.5.1"
+    loader-utils "^1.1.0"
+    merge-options "1.0.1"
+    micromatch "3.1.0"
+    postcss "^5.2.17"
+    postcss-prefix-selector "^1.6.0"
+    posthtml-rename-id "^1.0"
+    posthtml-svg-mode "^1.0.3"
+    query-string "^4.3.2"
+    traverse "^0.6.6"
 
-"svg-baker@^1.5.0", "svg-baker@^1.7.0":
-  "integrity" "sha512-nibslMbkXOIkqKVrfcncwha45f97fGuAOn1G99YwnwTj8kF9YiM6XexPcUso97NxOm6GsP0SIvYVIosBis1xLg=="
-  "resolved" "https://registry.npmmirror.com/svg-baker/-/svg-baker-1.7.0.tgz"
-  "version" "1.7.0"
+svg-pathdata@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.npmmirror.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz"
+  integrity sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==
+
+svg-sprite-loader@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmmirror.com/svg-sprite-loader/-/svg-sprite-loader-5.1.1.tgz"
+  integrity sha512-oRjDBw3AtZOb+XTx7XE3HcVju9RdnfdXttT3ZJB/vmWGJ+SM+xfXzh3yuVPIpySO8FjGhH5BtU63lGMI9WgYzA==
   dependencies:
-    "bluebird" "^3.5.0"
-    "clone" "^2.1.1"
-    "he" "^1.1.1"
-    "image-size" "^0.5.1"
-    "loader-utils" "^1.1.0"
-    "merge-options" "1.0.1"
-    "micromatch" "3.1.0"
-    "postcss" "^5.2.17"
-    "postcss-prefix-selector" "^1.6.0"
-    "posthtml-rename-id" "^1.0"
-    "posthtml-svg-mode" "^1.0.3"
-    "query-string" "^4.3.2"
-    "traverse" "^0.6.6"
+    bluebird "^3.5.0"
+    deepmerge "1.3.2"
+    domready "1.0.8"
+    escape-string-regexp "1.0.5"
+    html-webpack-plugin "^3.2.0"
+    loader-utils "^1.1.0"
+    svg-baker "^1.5.0"
+    svg-baker-runtime "^1.4.7"
+    url-slug "2.0.0"
 
-"svg-pathdata@^6.0.3":
-  "integrity" "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw=="
-  "resolved" "https://registry.npmmirror.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz"
-  "version" "6.0.3"
+svg-tags@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/svg-tags/-/svg-tags-1.0.0.tgz"
+  integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==
 
-"svg-sprite-loader@5.1.1":
-  "integrity" "sha512-oRjDBw3AtZOb+XTx7XE3HcVju9RdnfdXttT3ZJB/vmWGJ+SM+xfXzh3yuVPIpySO8FjGhH5BtU63lGMI9WgYzA=="
-  "resolved" "https://registry.npmmirror.com/svg-sprite-loader/-/svg-sprite-loader-5.1.1.tgz"
-  "version" "5.1.1"
+svg.js@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.npmmirror.com/svg.js/-/svg.js-2.7.1.tgz"
+  integrity sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA==
+
+svgo@^1.0.0:
+  version "1.3.2"
+  resolved "https://registry.npmmirror.com/svgo/-/svgo-1.3.2.tgz"
+  integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==
   dependencies:
-    "bluebird" "^3.5.0"
-    "deepmerge" "1.3.2"
-    "domready" "1.0.8"
-    "escape-string-regexp" "1.0.5"
-    "html-webpack-plugin" "^3.2.0"
-    "loader-utils" "^1.1.0"
-    "svg-baker" "^1.5.0"
-    "svg-baker-runtime" "^1.4.7"
-    "url-slug" "2.0.0"
+    chalk "^2.4.1"
+    coa "^2.0.2"
+    css-select "^2.0.0"
+    css-select-base-adapter "^0.1.1"
+    css-tree "1.0.0-alpha.37"
+    csso "^4.0.2"
+    js-yaml "^3.13.1"
+    mkdirp "~0.5.1"
+    object.values "^1.1.0"
+    sax "~1.2.4"
+    stable "^0.1.8"
+    unquote "~1.1.1"
+    util.promisify "~1.0.0"
 
-"svg-tags@^1.0.0":
-  "integrity" "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA=="
-  "resolved" "https://registry.npmmirror.com/svg-tags/-/svg-tags-1.0.0.tgz"
-  "version" "1.0.0"
-
-"svg.js@^2.6.3":
-  "integrity" "sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA=="
-  "resolved" "https://registry.npmmirror.com/svg.js/-/svg.js-2.7.1.tgz"
-  "version" "2.7.1"
-
-"svgo@^1.0.0":
-  "integrity" "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="
-  "resolved" "https://registry.npmmirror.com/svgo/-/svgo-1.3.2.tgz"
-  "version" "1.3.2"
+table@^5.2.3:
+  version "5.4.6"
+  resolved "https://registry.npmmirror.com/table/-/table-5.4.6.tgz"
+  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
   dependencies:
-    "chalk" "^2.4.1"
-    "coa" "^2.0.2"
-    "css-select" "^2.0.0"
-    "css-select-base-adapter" "^0.1.1"
-    "css-tree" "1.0.0-alpha.37"
-    "csso" "^4.0.2"
-    "js-yaml" "^3.13.1"
-    "mkdirp" "~0.5.1"
-    "object.values" "^1.1.0"
-    "sax" "~1.2.4"
-    "stable" "^0.1.8"
-    "unquote" "~1.1.1"
-    "util.promisify" "~1.0.0"
+    ajv "^6.10.2"
+    lodash "^4.17.14"
+    slice-ansi "^2.1.0"
+    string-width "^3.0.0"
 
-"table@^5.2.3":
-  "integrity" "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="
-  "resolved" "https://registry.npmmirror.com/table/-/table-5.4.6.tgz"
-  "version" "5.4.6"
+tapable@^1.0.0, tapable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmmirror.com/tapable/-/tapable-1.1.3.tgz"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+
+tar@^6.0.2:
+  version "6.1.15"
+  resolved "https://registry.npmmirror.com/tar/-/tar-6.1.15.tgz"
+  integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==
   dependencies:
-    "ajv" "^6.10.2"
-    "lodash" "^4.17.14"
-    "slice-ansi" "^2.1.0"
-    "string-width" "^3.0.0"
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^5.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
 
-"tapable@^1.0.0", "tapable@^1.1.3":
-  "integrity" "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
-  "resolved" "https://registry.npmmirror.com/tapable/-/tapable-1.1.3.tgz"
-  "version" "1.1.3"
-
-"tar@^6.0.2":
-  "integrity" "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ=="
-  "resolved" "https://registry.npmmirror.com/tar/-/tar-6.2.0.tgz"
-  "version" "6.2.0"
+terser-webpack-plugin@^1.4.3:
+  version "1.4.5"
+  resolved "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"
+  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
   dependencies:
-    "chownr" "^2.0.0"
-    "fs-minipass" "^2.0.0"
-    "minipass" "^5.0.0"
-    "minizlib" "^2.1.1"
-    "mkdirp" "^1.0.3"
-    "yallist" "^4.0.0"
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
+    is-wsl "^1.1.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^4.0.0"
+    source-map "^0.6.1"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
+    worker-farm "^1.7.0"
 
-"terser-webpack-plugin@^1.4.3":
-  "integrity" "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="
-  "resolved" "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"
-  "version" "1.4.5"
+terser-webpack-plugin@^1.4.4:
+  version "1.4.5"
+  resolved "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"
+  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
   dependencies:
-    "cacache" "^12.0.2"
-    "find-cache-dir" "^2.1.0"
-    "is-wsl" "^1.1.0"
-    "schema-utils" "^1.0.0"
-    "serialize-javascript" "^4.0.0"
-    "source-map" "^0.6.1"
-    "terser" "^4.1.2"
-    "webpack-sources" "^1.4.0"
-    "worker-farm" "^1.7.0"
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
+    is-wsl "^1.1.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^4.0.0"
+    source-map "^0.6.1"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
+    worker-farm "^1.7.0"
 
-"terser-webpack-plugin@^1.4.4":
-  "integrity" "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="
-  "resolved" "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"
-  "version" "1.4.5"
+terser-webpack-plugin@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz"
+  integrity sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==
   dependencies:
-    "cacache" "^12.0.2"
-    "find-cache-dir" "^2.1.0"
-    "is-wsl" "^1.1.0"
-    "schema-utils" "^1.0.0"
-    "serialize-javascript" "^4.0.0"
-    "source-map" "^0.6.1"
-    "terser" "^4.1.2"
-    "webpack-sources" "^1.4.0"
-    "worker-farm" "^1.7.0"
+    cacache "^15.0.5"
+    find-cache-dir "^3.3.1"
+    jest-worker "^26.5.0"
+    p-limit "^3.0.2"
+    schema-utils "^3.0.0"
+    serialize-javascript "^5.0.1"
+    source-map "^0.6.1"
+    terser "^5.3.4"
+    webpack-sources "^1.4.3"
 
-"terser-webpack-plugin@^4.2.3":
-  "integrity" "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ=="
-  "resolved" "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz"
-  "version" "4.2.3"
+terser@^4.1.2:
+  version "4.8.1"
+  resolved "https://registry.npmmirror.com/terser/-/terser-4.8.1.tgz"
+  integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
   dependencies:
-    "cacache" "^15.0.5"
-    "find-cache-dir" "^3.3.1"
-    "jest-worker" "^26.5.0"
-    "p-limit" "^3.0.2"
-    "schema-utils" "^3.0.0"
-    "serialize-javascript" "^5.0.1"
-    "source-map" "^0.6.1"
-    "terser" "^5.3.4"
-    "webpack-sources" "^1.4.3"
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
 
-"terser@^4.1.2":
-  "integrity" "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="
-  "resolved" "https://registry.npmmirror.com/terser/-/terser-4.8.1.tgz"
-  "version" "4.8.1"
-  dependencies:
-    "commander" "^2.20.0"
-    "source-map" "~0.6.1"
-    "source-map-support" "~0.5.12"
-
-"terser@^5.3.4":
-  "integrity" "sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw=="
-  "resolved" "https://registry.npmmirror.com/terser/-/terser-5.22.0.tgz"
-  "version" "5.22.0"
+terser@^5.3.4:
+  version "5.19.2"
+  resolved "https://registry.npmmirror.com/terser/-/terser-5.19.2.tgz"
+  integrity sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
-    "acorn" "^8.8.2"
-    "commander" "^2.20.0"
-    "source-map-support" "~0.5.20"
+    acorn "^8.8.2"
+    commander "^2.20.0"
+    source-map-support "~0.5.20"
 
-"text-segmentation@^1.0.3":
-  "integrity" "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw=="
-  "resolved" "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz"
-  "version" "1.0.3"
+text-segmentation@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz"
+  integrity sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==
   dependencies:
-    "utrie" "^1.0.2"
+    utrie "^1.0.2"
 
-"text-table@^0.2.0":
-  "integrity" "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
-  "resolved" "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz"
-  "version" "0.2.0"
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz"
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
-"thenify-all@^1.0.0":
-  "integrity" "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="
-  "resolved" "https://registry.npmmirror.com/thenify-all/-/thenify-all-1.6.0.tgz"
-  "version" "1.6.0"
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.npmmirror.com/thenify-all/-/thenify-all-1.6.0.tgz"
+  integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==
   dependencies:
-    "thenify" ">= 3.1.0 < 4"
+    thenify ">= 3.1.0 < 4"
 
 "thenify@>= 3.1.0 < 4":
-  "integrity" "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="
-  "resolved" "https://registry.npmmirror.com/thenify/-/thenify-3.3.1.tgz"
-  "version" "3.3.1"
+  version "3.3.1"
+  resolved "https://registry.npmmirror.com/thenify/-/thenify-3.3.1.tgz"
+  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
   dependencies:
-    "any-promise" "^1.0.0"
+    any-promise "^1.0.0"
 
-"thread-loader@^2.1.3":
-  "integrity" "sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg=="
-  "resolved" "https://registry.npmmirror.com/thread-loader/-/thread-loader-2.1.3.tgz"
-  "version" "2.1.3"
+thread-loader@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.npmmirror.com/thread-loader/-/thread-loader-2.1.3.tgz"
+  integrity sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg==
   dependencies:
-    "loader-runner" "^2.3.1"
-    "loader-utils" "^1.1.0"
-    "neo-async" "^2.6.0"
+    loader-runner "^2.3.1"
+    loader-utils "^1.1.0"
+    neo-async "^2.6.0"
 
-"throttle-debounce@^1.0.1":
-  "integrity" "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
-  "resolved" "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz"
-  "version" "1.1.0"
+throttle-debounce@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz"
+  integrity sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==
 
-"throttle-debounce@2.1.0":
-  "integrity" "sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg=="
-  "resolved" "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-2.1.0.tgz"
-  "version" "2.1.0"
+throttle-debounce@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-2.1.0.tgz"
+  integrity sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg==
 
-"through@^2.3.6", "through@^2.3.8":
-  "integrity" "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
-  "resolved" "https://registry.npmmirror.com/through/-/through-2.3.8.tgz"
-  "version" "2.3.8"
+through@^2.3.6, through@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.npmmirror.com/through/-/through-2.3.8.tgz"
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
-"through2@^2.0.0":
-  "integrity" "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="
-  "resolved" "https://registry.npmmirror.com/through2/-/through2-2.0.5.tgz"
-  "version" "2.0.5"
+through2@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.npmmirror.com/through2/-/through2-2.0.5.tgz"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
-    "readable-stream" "~2.3.6"
-    "xtend" "~4.0.1"
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
 
-"thunky@^1.0.2":
-  "integrity" "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
-  "resolved" "https://registry.npmmirror.com/thunky/-/thunky-1.1.0.tgz"
-  "version" "1.1.0"
+thunky@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/thunky/-/thunky-1.1.0.tgz"
+  integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
-"timers-browserify@^2.0.4":
-  "integrity" "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ=="
-  "resolved" "https://registry.npmmirror.com/timers-browserify/-/timers-browserify-2.0.12.tgz"
-  "version" "2.0.12"
+timers-browserify@^2.0.4:
+  version "2.0.12"
+  resolved "https://registry.npmmirror.com/timers-browserify/-/timers-browserify-2.0.12.tgz"
+  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
   dependencies:
-    "setimmediate" "^1.0.4"
+    setimmediate "^1.0.4"
 
-"timsort@^0.3.0":
-  "integrity" "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="
-  "resolved" "https://registry.npmmirror.com/timsort/-/timsort-0.3.0.tgz"
-  "version" "0.3.0"
+timsort@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmmirror.com/timsort/-/timsort-0.3.0.tgz"
+  integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==
 
-"tiny-emitter@^2.0.0":
-  "integrity" "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
-  "resolved" "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz"
-  "version" "2.1.0"
+tiny-emitter@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz"
+  integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
 
-"tiny-svg@^2.2.2":
-  "integrity" "sha512-NOi39lBknf4UdDEahNkbEAJnzhu1ZcN2j75IS2vLRmIhsfxdZpTChfLKBcN1ShplVmPIXJAIafk6YY5/Aa80lQ=="
-  "resolved" "https://registry.npmmirror.com/tiny-svg/-/tiny-svg-2.2.4.tgz"
-  "version" "2.2.4"
+tiny-svg@^2.2.2:
+  version "2.2.4"
+  resolved "https://registry.npmmirror.com/tiny-svg/-/tiny-svg-2.2.4.tgz"
+  integrity sha512-NOi39lBknf4UdDEahNkbEAJnzhu1ZcN2j75IS2vLRmIhsfxdZpTChfLKBcN1ShplVmPIXJAIafk6YY5/Aa80lQ==
 
-"tiny-svg@^3.0.1":
-  "integrity" "sha512-P8T4iwiW1t95vpHVHqrD36Brn7TqFYCPSHIWk9WLJtYK1X4aDd+5cgqcAADIWSjf1/i5idKnpCh9mim8hEdRBg=="
-  "resolved" "https://registry.npmmirror.com/tiny-svg/-/tiny-svg-3.0.1.tgz"
-  "version" "3.0.1"
+tiny-svg@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmmirror.com/tiny-svg/-/tiny-svg-3.0.1.tgz"
+  integrity sha512-P8T4iwiW1t95vpHVHqrD36Brn7TqFYCPSHIWk9WLJtYK1X4aDd+5cgqcAADIWSjf1/i5idKnpCh9mim8hEdRBg==
 
-"tmp@^0.0.33":
-  "integrity" "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="
-  "resolved" "https://registry.npmmirror.com/tmp/-/tmp-0.0.33.tgz"
-  "version" "0.0.33"
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.npmmirror.com/tmp/-/tmp-0.0.33.tgz"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
-    "os-tmpdir" "~1.0.2"
+    os-tmpdir "~1.0.2"
 
-"to-arraybuffer@^1.0.0":
-  "integrity" "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA=="
-  "resolved" "https://registry.npmmirror.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"
-  "version" "1.0.1"
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"
+  integrity sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==
 
-"to-fast-properties@^2.0.0":
-  "integrity" "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
-  "resolved" "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
-  "version" "2.0.0"
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
-"to-object-path@^0.3.0":
-  "integrity" "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg=="
-  "resolved" "https://registry.npmmirror.com/to-object-path/-/to-object-path-0.3.0.tgz"
-  "version" "0.3.0"
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmmirror.com/to-object-path/-/to-object-path-0.3.0.tgz"
+  integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==
   dependencies:
-    "kind-of" "^3.0.2"
+    kind-of "^3.0.2"
 
-"to-regex-range@^2.1.0":
-  "integrity" "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg=="
-  "resolved" "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-2.1.1.tgz"
-  "version" "2.1.1"
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-2.1.1.tgz"
+  integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==
   dependencies:
-    "is-number" "^3.0.0"
-    "repeat-string" "^1.6.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
 
-"to-regex-range@^5.0.1":
-  "integrity" "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="
-  "resolved" "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz"
-  "version" "5.0.1"
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
   dependencies:
-    "is-number" "^7.0.0"
+    is-number "^7.0.0"
 
-"to-regex@^3.0.1", "to-regex@^3.0.2":
-  "integrity" "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="
-  "resolved" "https://registry.npmmirror.com/to-regex/-/to-regex-3.0.2.tgz"
-  "version" "3.0.2"
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmmirror.com/to-regex/-/to-regex-3.0.2.tgz"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
-    "define-property" "^2.0.2"
-    "extend-shallow" "^3.0.2"
-    "regex-not" "^1.0.2"
-    "safe-regex" "^1.1.0"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
 
-"toidentifier@1.0.1":
-  "integrity" "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
-  "resolved" "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz"
-  "version" "1.0.1"
+toidentifier@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz"
+  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-"toposort@^1.0.0":
-  "integrity" "sha512-FclLrw8b9bMWf4QlCJuHBEVhSRsqDj6u3nIjAzPeJvgl//1hBlffdlk0MALceL14+koWEdU4ofRAXofbODxQzg=="
-  "resolved" "https://registry.npmmirror.com/toposort/-/toposort-1.0.7.tgz"
-  "version" "1.0.7"
+toposort@^1.0.0:
+  version "1.0.7"
+  resolved "https://registry.npmmirror.com/toposort/-/toposort-1.0.7.tgz"
+  integrity sha512-FclLrw8b9bMWf4QlCJuHBEVhSRsqDj6u3nIjAzPeJvgl//1hBlffdlk0MALceL14+koWEdU4ofRAXofbODxQzg==
 
-"tough-cookie@~2.5.0":
-  "integrity" "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="
-  "resolved" "https://registry.npmmirror.com/tough-cookie/-/tough-cookie-2.5.0.tgz"
-  "version" "2.5.0"
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.npmmirror.com/tough-cookie/-/tough-cookie-2.5.0.tgz"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
   dependencies:
-    "psl" "^1.1.28"
-    "punycode" "^2.1.1"
+    psl "^1.1.28"
+    punycode "^2.1.1"
 
-"traverse@^0.6.6":
-  "integrity" "sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg=="
-  "resolved" "https://registry.npmmirror.com/traverse/-/traverse-0.6.7.tgz"
-  "version" "0.6.7"
+traverse@^0.6.6:
+  version "0.6.7"
+  resolved "https://registry.npmmirror.com/traverse/-/traverse-0.6.7.tgz"
+  integrity sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==
 
-"tryer@^1.0.1":
-  "integrity" "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
-  "resolved" "https://registry.npmmirror.com/tryer/-/tryer-1.0.1.tgz"
-  "version" "1.0.1"
+tryer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/tryer/-/tryer-1.0.1.tgz"
+  integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
 
-"ts-pnp@^1.1.6":
-  "integrity" "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw=="
-  "resolved" "https://registry.npmmirror.com/ts-pnp/-/ts-pnp-1.2.0.tgz"
-  "version" "1.2.0"
+ts-pnp@^1.1.6:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/ts-pnp/-/ts-pnp-1.2.0.tgz"
+  integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
-"tsconfig-paths@^3.14.2":
-  "integrity" "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g=="
-  "resolved" "https://registry.npmmirror.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz"
-  "version" "3.14.2"
+tsconfig-paths@^3.14.1:
+  version "3.14.2"
+  resolved "https://registry.npmmirror.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz"
+  integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
   dependencies:
     "@types/json5" "^0.0.29"
-    "json5" "^1.0.2"
-    "minimist" "^1.2.6"
-    "strip-bom" "^3.0.0"
+    json5 "^1.0.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
 
-"tslib@^1.9.0":
-  "integrity" "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-  "resolved" "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz"
-  "version" "1.14.1"
+tslib@^1.9.0:
+  version "1.14.1"
+  resolved "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-"tslib@^2.1.0", "tslib@2.3.0":
-  "integrity" "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-  "resolved" "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz"
-  "version" "2.3.0"
+tslib@^2.1.0, tslib@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz"
+  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
 
-"tsml@1.0.1":
-  "integrity" "sha512-3KmepnH9SUsoOVtg013CRrL7c+AK7ECaquAsJdvu4288EDJuraqBlP4PDXT/rLEJ9YDn4jqLAzRJsnFPx+V6lg=="
-  "resolved" "https://registry.npmmirror.com/tsml/-/tsml-1.0.1.tgz"
-  "version" "1.0.1"
+tsml@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/tsml/-/tsml-1.0.1.tgz"
+  integrity sha512-3KmepnH9SUsoOVtg013CRrL7c+AK7ECaquAsJdvu4288EDJuraqBlP4PDXT/rLEJ9YDn4jqLAzRJsnFPx+V6lg==
 
-"tty-browserify@0.0.0":
-  "integrity" "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw=="
-  "resolved" "https://registry.npmmirror.com/tty-browserify/-/tty-browserify-0.0.0.tgz"
-  "version" "0.0.0"
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.npmmirror.com/tty-browserify/-/tty-browserify-0.0.0.tgz"
+  integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==
 
-"tunnel-agent@^0.6.0":
-  "integrity" "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="
-  "resolved" "https://registry.npmmirror.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
-  "version" "0.6.0"
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.npmmirror.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
+  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
   dependencies:
-    "safe-buffer" "^5.0.1"
+    safe-buffer "^5.0.1"
 
-"tweetnacl@^0.14.3", "tweetnacl@~0.14.0":
-  "integrity" "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
-  "resolved" "https://registry.npmmirror.com/tweetnacl/-/tweetnacl-0.14.5.tgz"
-  "version" "0.14.5"
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.npmmirror.com/tweetnacl/-/tweetnacl-0.14.5.tgz"
+  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
 
-"type-check@~0.3.2":
-  "integrity" "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="
-  "resolved" "https://registry.npmmirror.com/type-check/-/type-check-0.3.2.tgz"
-  "version" "0.3.2"
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.npmmirror.com/type-check/-/type-check-0.3.2.tgz"
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
   dependencies:
-    "prelude-ls" "~1.1.2"
+    prelude-ls "~1.1.2"
 
-"type-fest@^0.21.3":
-  "integrity" "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
-  "resolved" "https://registry.npmmirror.com/type-fest/-/type-fest-0.21.3.tgz"
-  "version" "0.21.3"
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.npmmirror.com/type-fest/-/type-fest-0.21.3.tgz"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
-"type-fest@^0.6.0":
-  "integrity" "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
-  "resolved" "https://registry.npmmirror.com/type-fest/-/type-fest-0.6.0.tgz"
-  "version" "0.6.0"
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.npmmirror.com/type-fest/-/type-fest-0.6.0.tgz"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
 
-"type-fest@^0.8.1":
-  "integrity" "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-  "resolved" "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz"
-  "version" "0.8.1"
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-"type-is@~1.6.18":
-  "integrity" "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="
-  "resolved" "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz"
-  "version" "1.6.18"
+type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
   dependencies:
-    "media-typer" "0.3.0"
-    "mime-types" "~2.1.24"
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
 
-"typed-array-buffer@^1.0.0":
-  "integrity" "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw=="
-  "resolved" "https://registry.npmmirror.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz"
-  "version" "1.0.0"
+typed-array-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz"
+  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
   dependencies:
-    "call-bind" "^1.0.2"
-    "get-intrinsic" "^1.2.1"
-    "is-typed-array" "^1.1.10"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    is-typed-array "^1.1.10"
 
-"typed-array-byte-length@^1.0.0":
-  "integrity" "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA=="
-  "resolved" "https://registry.npmmirror.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz"
-  "version" "1.0.0"
+typed-array-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz"
+  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
   dependencies:
-    "call-bind" "^1.0.2"
-    "for-each" "^0.3.3"
-    "has-proto" "^1.0.1"
-    "is-typed-array" "^1.1.10"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
 
-"typed-array-byte-offset@^1.0.0":
-  "integrity" "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg=="
-  "resolved" "https://registry.npmmirror.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz"
-  "version" "1.0.0"
+typed-array-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz"
+  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
   dependencies:
-    "available-typed-arrays" "^1.0.5"
-    "call-bind" "^1.0.2"
-    "for-each" "^0.3.3"
-    "has-proto" "^1.0.1"
-    "is-typed-array" "^1.1.10"
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
 
-"typed-array-length@^1.0.4":
-  "integrity" "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng=="
-  "resolved" "https://registry.npmmirror.com/typed-array-length/-/typed-array-length-1.0.4.tgz"
-  "version" "1.0.4"
+typed-array-length@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/typed-array-length/-/typed-array-length-1.0.4.tgz"
+  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
   dependencies:
-    "call-bind" "^1.0.2"
-    "for-each" "^0.3.3"
-    "is-typed-array" "^1.1.9"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    is-typed-array "^1.1.9"
 
-"typedarray@^0.0.6":
-  "integrity" "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
-  "resolved" "https://registry.npmmirror.com/typedarray/-/typedarray-0.0.6.tgz"
-  "version" "0.0.6"
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.npmmirror.com/typedarray/-/typedarray-0.0.6.tgz"
+  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-"uglify-js@3.4.x":
-  "integrity" "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="
-  "resolved" "https://registry.npmmirror.com/uglify-js/-/uglify-js-3.4.10.tgz"
-  "version" "3.4.10"
+uglify-js@3.4.x:
+  version "3.4.10"
+  resolved "https://registry.npmmirror.com/uglify-js/-/uglify-js-3.4.10.tgz"
+  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
   dependencies:
-    "commander" "~2.19.0"
-    "source-map" "~0.6.1"
+    commander "~2.19.0"
+    source-map "~0.6.1"
 
-"unbox-primitive@^1.0.2":
-  "integrity" "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="
-  "resolved" "https://registry.npmmirror.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz"
-  "version" "1.0.2"
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
   dependencies:
-    "call-bind" "^1.0.2"
-    "has-bigints" "^1.0.2"
-    "has-symbols" "^1.0.3"
-    "which-boxed-primitive" "^1.0.2"
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
+    which-boxed-primitive "^1.0.2"
 
-"undici-types@~5.26.4":
-  "integrity" "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
-  "resolved" "https://registry.npmmirror.com/undici-types/-/undici-types-5.26.5.tgz"
-  "version" "5.26.5"
+unicode-canonical-property-names-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"
+  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
-"unicode-canonical-property-names-ecmascript@^2.0.0":
-  "integrity" "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="
-  "resolved" "https://registry.npmmirror.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"
-  "version" "2.0.0"
-
-"unicode-match-property-ecmascript@^2.0.0":
-  "integrity" "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="
-  "resolved" "https://registry.npmmirror.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"
-  "version" "2.0.0"
+unicode-match-property-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"
+  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
-    "unicode-canonical-property-names-ecmascript" "^2.0.0"
-    "unicode-property-aliases-ecmascript" "^2.0.0"
+    unicode-canonical-property-names-ecmascript "^2.0.0"
+    unicode-property-aliases-ecmascript "^2.0.0"
 
-"unicode-match-property-value-ecmascript@^2.1.0":
-  "integrity" "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="
-  "resolved" "https://registry.npmmirror.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz"
-  "version" "2.1.0"
+unicode-match-property-value-ecmascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz"
+  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
 
-"unicode-property-aliases-ecmascript@^2.0.0":
-  "integrity" "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
-  "resolved" "https://registry.npmmirror.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz"
-  "version" "2.1.0"
+unicode-property-aliases-ecmascript@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz"
+  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
-"unidecode@0.1.8":
-  "integrity" "sha512-SdoZNxCWpN2tXTCrGkPF/0rL2HEq+i2gwRG1ReBvx8/0yTzC3enHfugOf8A9JBShVwwrRIkLX0YcDUGbzjbVCA=="
-  "resolved" "https://registry.npmmirror.com/unidecode/-/unidecode-0.1.8.tgz"
-  "version" "0.1.8"
+unidecode@0.1.8:
+  version "0.1.8"
+  resolved "https://registry.npmmirror.com/unidecode/-/unidecode-0.1.8.tgz"
+  integrity sha512-SdoZNxCWpN2tXTCrGkPF/0rL2HEq+i2gwRG1ReBvx8/0yTzC3enHfugOf8A9JBShVwwrRIkLX0YcDUGbzjbVCA==
 
-"union-value@^1.0.0":
-  "integrity" "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="
-  "resolved" "https://registry.npmmirror.com/union-value/-/union-value-1.0.1.tgz"
-  "version" "1.0.1"
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/union-value/-/union-value-1.0.1.tgz"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
-    "arr-union" "^3.1.0"
-    "get-value" "^2.0.6"
-    "is-extendable" "^0.1.1"
-    "set-value" "^2.0.1"
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
 
-"uniq@^1.0.1":
-  "integrity" "sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA=="
-  "resolved" "https://registry.npmmirror.com/uniq/-/uniq-1.0.1.tgz"
-  "version" "1.0.1"
+uniq@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/uniq/-/uniq-1.0.1.tgz"
+  integrity sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==
 
-"uniqs@^2.0.0":
-  "integrity" "sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ=="
-  "resolved" "https://registry.npmmirror.com/uniqs/-/uniqs-2.0.0.tgz"
-  "version" "2.0.0"
+uniqs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/uniqs/-/uniqs-2.0.0.tgz"
+  integrity sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ==
 
-"unique-filename@^1.1.1":
-  "integrity" "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="
-  "resolved" "https://registry.npmmirror.com/unique-filename/-/unique-filename-1.1.1.tgz"
-  "version" "1.1.1"
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/unique-filename/-/unique-filename-1.1.1.tgz"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
   dependencies:
-    "unique-slug" "^2.0.0"
+    unique-slug "^2.0.0"
 
-"unique-slug@^2.0.0":
-  "integrity" "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="
-  "resolved" "https://registry.npmmirror.com/unique-slug/-/unique-slug-2.0.2.tgz"
-  "version" "2.0.2"
+unique-slug@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/unique-slug/-/unique-slug-2.0.2.tgz"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
   dependencies:
-    "imurmurhash" "^0.1.4"
+    imurmurhash "^0.1.4"
 
-"universalify@^0.1.0":
-  "integrity" "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-  "resolved" "https://registry.npmmirror.com/universalify/-/universalify-0.1.2.tgz"
-  "version" "0.1.2"
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.npmmirror.com/universalify/-/universalify-0.1.2.tgz"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
-"unpipe@~1.0.0", "unpipe@1.0.0":
-  "integrity" "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
-  "resolved" "https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz"
-  "version" "1.0.0"
+unpipe@~1.0.0, unpipe@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz"
+  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-"unquote@~1.1.1":
-  "integrity" "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
-  "resolved" "https://registry.npmmirror.com/unquote/-/unquote-1.1.1.tgz"
-  "version" "1.1.1"
+unquote@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/unquote/-/unquote-1.1.1.tgz"
+  integrity sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==
 
-"unset-value@^1.0.0":
-  "integrity" "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ=="
-  "resolved" "https://registry.npmmirror.com/unset-value/-/unset-value-1.0.0.tgz"
-  "version" "1.0.0"
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/unset-value/-/unset-value-1.0.0.tgz"
+  integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==
   dependencies:
-    "has-value" "^0.3.1"
-    "isobject" "^3.0.0"
+    has-value "^0.3.1"
+    isobject "^3.0.0"
 
-"upath@^1.1.1":
-  "integrity" "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
-  "resolved" "https://registry.npmmirror.com/upath/-/upath-1.2.0.tgz"
-  "version" "1.2.0"
+upath@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/upath/-/upath-1.2.0.tgz"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-"update-browserslist-db@^1.0.13":
-  "integrity" "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg=="
-  "resolved" "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz"
-  "version" "1.0.13"
+update-browserslist-db@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz"
+  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
   dependencies:
-    "escalade" "^3.1.1"
-    "picocolors" "^1.0.0"
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
 
-"upper-case@^1.1.1":
-  "integrity" "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA=="
-  "resolved" "https://registry.npmmirror.com/upper-case/-/upper-case-1.1.3.tgz"
-  "version" "1.1.3"
+upper-case@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.npmmirror.com/upper-case/-/upper-case-1.1.3.tgz"
+  integrity sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==
 
-"uri-js@^4.2.2":
-  "integrity" "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="
-  "resolved" "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz"
-  "version" "4.4.1"
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
-    "punycode" "^2.1.0"
+    punycode "^2.1.0"
 
-"urix@^0.1.0":
-  "integrity" "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="
-  "resolved" "https://registry.npmmirror.com/urix/-/urix-0.1.0.tgz"
-  "version" "0.1.0"
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.npmmirror.com/urix/-/urix-0.1.0.tgz"
+  integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
 
-"url-loader@^2.2.0":
-  "integrity" "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog=="
-  "resolved" "https://registry.npmmirror.com/url-loader/-/url-loader-2.3.0.tgz"
-  "version" "2.3.0"
+url-loader@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/url-loader/-/url-loader-2.3.0.tgz"
+  integrity sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==
   dependencies:
-    "loader-utils" "^1.2.3"
-    "mime" "^2.4.4"
-    "schema-utils" "^2.5.0"
+    loader-utils "^1.2.3"
+    mime "^2.4.4"
+    schema-utils "^2.5.0"
 
-"url-parse@^1.5.10":
-  "integrity" "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="
-  "resolved" "https://registry.npmmirror.com/url-parse/-/url-parse-1.5.10.tgz"
-  "version" "1.5.10"
+url-parse@^1.5.10:
+  version "1.5.10"
+  resolved "https://registry.npmmirror.com/url-parse/-/url-parse-1.5.10.tgz"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
-    "querystringify" "^2.1.1"
-    "requires-port" "^1.0.0"
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
 
-"url-slug@2.0.0":
-  "integrity" "sha512-aiNmSsVgrjCiJ2+KWPferjT46YFKoE8i0YX04BlMVDue022Xwhg/zYlnZ6V9/mP3p8Wj7LEp0myiTkC/p6sxew=="
-  "resolved" "https://registry.npmmirror.com/url-slug/-/url-slug-2.0.0.tgz"
-  "version" "2.0.0"
+url-slug@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/url-slug/-/url-slug-2.0.0.tgz"
+  integrity sha512-aiNmSsVgrjCiJ2+KWPferjT46YFKoE8i0YX04BlMVDue022Xwhg/zYlnZ6V9/mP3p8Wj7LEp0myiTkC/p6sxew==
   dependencies:
-    "unidecode" "0.1.8"
+    unidecode "0.1.8"
 
-"url-toolkit@^2.1.3", "url-toolkit@^2.2.1":
-  "integrity" "sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg=="
-  "resolved" "https://registry.npmmirror.com/url-toolkit/-/url-toolkit-2.2.5.tgz"
-  "version" "2.2.5"
+url-toolkit@^2.1.3, url-toolkit@^2.2.1:
+  version "2.2.5"
+  resolved "https://registry.npmmirror.com/url-toolkit/-/url-toolkit-2.2.5.tgz"
+  integrity sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==
 
-"url@^0.11.0":
-  "integrity" "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw=="
-  "resolved" "https://registry.npmmirror.com/url/-/url-0.11.3.tgz"
-  "version" "0.11.3"
+url@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.npmmirror.com/url/-/url-0.11.1.tgz"
+  integrity sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==
   dependencies:
-    "punycode" "^1.4.1"
-    "qs" "^6.11.2"
+    punycode "^1.4.1"
+    qs "^6.11.0"
 
-"use@^3.1.0":
-  "integrity" "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
-  "resolved" "https://registry.npmmirror.com/use/-/use-3.1.1.tgz"
-  "version" "3.1.1"
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.npmmirror.com/use/-/use-3.1.1.tgz"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-"util-deprecate@^1.0.1", "util-deprecate@^1.0.2", "util-deprecate@~1.0.1":
-  "integrity" "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-  "resolved" "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz"
-  "version" "1.0.2"
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz"
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-"util.promisify@~1.0.0":
-  "integrity" "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="
-  "resolved" "https://registry.npmmirror.com/util.promisify/-/util.promisify-1.0.1.tgz"
-  "version" "1.0.1"
+util.promisify@~1.0.0, util.promisify@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/util.promisify/-/util.promisify-1.0.0.tgz"
+  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
   dependencies:
-    "define-properties" "^1.1.3"
-    "es-abstract" "^1.17.2"
-    "has-symbols" "^1.0.1"
-    "object.getownpropertydescriptors" "^2.1.0"
+    define-properties "^1.1.2"
+    object.getownpropertydescriptors "^2.0.3"
 
-"util.promisify@1.0.0":
-  "integrity" "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="
-  "resolved" "https://registry.npmmirror.com/util.promisify/-/util.promisify-1.0.0.tgz"
-  "version" "1.0.0"
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.npmmirror.com/util/-/util-0.11.1.tgz"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
   dependencies:
-    "define-properties" "^1.1.2"
-    "object.getownpropertydescriptors" "^2.0.3"
+    inherits "2.0.3"
 
-"util@^0.10.4":
-  "integrity" "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="
-  "resolved" "https://registry.npmmirror.com/util/-/util-0.10.4.tgz"
-  "version" "0.10.4"
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.npmmirror.com/util/-/util-0.10.3.tgz"
+  integrity sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==
   dependencies:
-    "inherits" "2.0.3"
+    inherits "2.0.1"
 
-"util@^0.11.0":
-  "integrity" "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="
-  "resolved" "https://registry.npmmirror.com/util/-/util-0.11.1.tgz"
-  "version" "0.11.1"
+utila@~0.4:
+  version "0.4.0"
+  resolved "https://registry.npmmirror.com/utila/-/utila-0.4.0.tgz"
+  integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz"
+  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
+
+utrie@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz"
+  integrity sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==
   dependencies:
-    "inherits" "2.0.3"
+    base64-arraybuffer "^1.0.2"
 
-"utila@~0.4":
-  "integrity" "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
-  "resolved" "https://registry.npmmirror.com/utila/-/utila-0.4.0.tgz"
-  "version" "0.4.0"
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-"utils-merge@1.0.1":
-  "integrity" "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
-  "resolved" "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz"
-  "version" "1.0.1"
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-"utrie@^1.0.2":
-  "integrity" "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw=="
-  "resolved" "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz"
-  "version" "1.0.2"
+v8-compile-cache@^2.0.3:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
-    "base64-arraybuffer" "^1.0.2"
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
 
-"uuid@^3.3.2":
-  "integrity" "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-  "resolved" "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz"
-  "version" "3.4.0"
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz"
+  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
-"uuid@^8.3.2":
-  "integrity" "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-  "resolved" "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz"
-  "version" "8.3.2"
+vendors@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/vendors/-/vendors-1.0.4.tgz"
+  integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
-"v8-compile-cache@^2.0.3":
-  "integrity" "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw=="
-  "resolved" "https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz"
-  "version" "2.4.0"
-
-"validate-npm-package-license@^3.0.1":
-  "integrity" "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="
-  "resolved" "https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
-  "version" "3.0.4"
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.npmmirror.com/verror/-/verror-1.10.0.tgz"
+  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
   dependencies:
-    "spdx-correct" "^3.0.0"
-    "spdx-expression-parse" "^3.0.0"
-
-"vary@~1.1.2":
-  "integrity" "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
-  "resolved" "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz"
-  "version" "1.1.2"
-
-"vendors@^1.0.0":
-  "integrity" "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="
-  "resolved" "https://registry.npmmirror.com/vendors/-/vendors-1.0.4.tgz"
-  "version" "1.0.4"
-
-"verror@1.10.0":
-  "integrity" "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="
-  "resolved" "https://registry.npmmirror.com/verror/-/verror-1.10.0.tgz"
-  "version" "1.10.0"
-  dependencies:
-    "assert-plus" "^1.0.0"
-    "core-util-is" "1.0.2"
-    "extsprintf" "^1.2.0"
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
 
 "video.js@^5.17.0 || ^6.2.0":
-  "integrity" "sha512-36/JR/GhPQSZj0o+GNbhcEYv/b0SkV9SQsjlodAnzMQYN0TA7VhmqrKPYMCi1NGRYu7S9W3OaFCFoUxkYfSVlg=="
-  "resolved" "https://registry.npmmirror.com/video.js/-/video.js-6.13.0.tgz"
-  "version" "6.13.0"
+  version "6.13.0"
+  resolved "https://registry.npmmirror.com/video.js/-/video.js-6.13.0.tgz"
+  integrity sha512-36/JR/GhPQSZj0o+GNbhcEYv/b0SkV9SQsjlodAnzMQYN0TA7VhmqrKPYMCi1NGRYu7S9W3OaFCFoUxkYfSVlg==
   dependencies:
-    "babel-runtime" "^6.9.2"
-    "global" "4.3.2"
-    "safe-json-parse" "4.0.0"
-    "tsml" "1.0.1"
-    "videojs-font" "2.1.0"
-    "videojs-ie8" "1.1.2"
-    "videojs-vtt.js" "0.12.6"
-    "xhr" "2.4.0"
+    babel-runtime "^6.9.2"
+    global "4.3.2"
+    safe-json-parse "4.0.0"
+    tsml "1.0.1"
+    videojs-font "2.1.0"
+    videojs-ie8 "1.1.2"
+    videojs-vtt.js "0.12.6"
+    xhr "2.4.0"
 
 "video.js@^5.19.1 || ^6.2.0":
-  "integrity" "sha512-36/JR/GhPQSZj0o+GNbhcEYv/b0SkV9SQsjlodAnzMQYN0TA7VhmqrKPYMCi1NGRYu7S9W3OaFCFoUxkYfSVlg=="
-  "resolved" "https://registry.npmmirror.com/video.js/-/video.js-6.13.0.tgz"
-  "version" "6.13.0"
+  version "6.13.0"
+  resolved "https://registry.npmmirror.com/video.js/-/video.js-6.13.0.tgz"
+  integrity sha512-36/JR/GhPQSZj0o+GNbhcEYv/b0SkV9SQsjlodAnzMQYN0TA7VhmqrKPYMCi1NGRYu7S9W3OaFCFoUxkYfSVlg==
   dependencies:
-    "babel-runtime" "^6.9.2"
-    "global" "4.3.2"
-    "safe-json-parse" "4.0.0"
-    "tsml" "1.0.1"
-    "videojs-font" "2.1.0"
-    "videojs-ie8" "1.1.2"
-    "videojs-vtt.js" "0.12.6"
-    "xhr" "2.4.0"
+    babel-runtime "^6.9.2"
+    global "4.3.2"
+    safe-json-parse "4.0.0"
+    tsml "1.0.1"
+    videojs-font "2.1.0"
+    videojs-ie8 "1.1.2"
+    videojs-vtt.js "0.12.6"
+    xhr "2.4.0"
 
 "video.js@^6 || ^7":
-  "integrity" "sha512-WRq86tXZKrThA9mK+IR+v4tIQVVvnb5LhvL71fD2AX7TxVOPdaeK1X/wyuUruBqWaOG3w2sZXoMY6HF2Jlo9qA=="
-  "resolved" "https://registry.npmmirror.com/video.js/-/video.js-7.21.5.tgz"
-  "version" "7.21.5"
+  version "7.21.5"
+  resolved "https://registry.npmmirror.com/video.js/-/video.js-7.21.5.tgz"
+  integrity sha512-WRq86tXZKrThA9mK+IR+v4tIQVVvnb5LhvL71fD2AX7TxVOPdaeK1X/wyuUruBqWaOG3w2sZXoMY6HF2Jlo9qA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@videojs/http-streaming" "2.16.2"
     "@videojs/vhs-utils" "^3.0.4"
     "@videojs/xhr" "2.6.0"
-    "aes-decrypter" "3.1.3"
-    "global" "^4.4.0"
-    "keycode" "^2.2.0"
-    "m3u8-parser" "4.8.0"
-    "mpd-parser" "0.22.1"
-    "mux.js" "6.0.1"
-    "safe-json-parse" "4.0.0"
-    "videojs-font" "3.2.0"
-    "videojs-vtt.js" "^0.15.5"
+    aes-decrypter "3.1.3"
+    global "^4.4.0"
+    keycode "^2.2.0"
+    m3u8-parser "4.8.0"
+    mpd-parser "0.22.1"
+    mux.js "6.0.1"
+    safe-json-parse "4.0.0"
+    videojs-font "3.2.0"
+    videojs-vtt.js "^0.15.5"
 
-"video.js@^6.6.0":
-  "integrity" "sha512-36/JR/GhPQSZj0o+GNbhcEYv/b0SkV9SQsjlodAnzMQYN0TA7VhmqrKPYMCi1NGRYu7S9W3OaFCFoUxkYfSVlg=="
-  "resolved" "https://registry.npmmirror.com/video.js/-/video.js-6.13.0.tgz"
-  "version" "6.13.0"
+video.js@^6.6.0:
+  version "6.13.0"
+  resolved "https://registry.npmmirror.com/video.js/-/video.js-6.13.0.tgz"
+  integrity sha512-36/JR/GhPQSZj0o+GNbhcEYv/b0SkV9SQsjlodAnzMQYN0TA7VhmqrKPYMCi1NGRYu7S9W3OaFCFoUxkYfSVlg==
   dependencies:
-    "babel-runtime" "^6.9.2"
-    "global" "4.3.2"
-    "safe-json-parse" "4.0.0"
-    "tsml" "1.0.1"
-    "videojs-font" "2.1.0"
-    "videojs-ie8" "1.1.2"
-    "videojs-vtt.js" "0.12.6"
-    "xhr" "2.4.0"
+    babel-runtime "^6.9.2"
+    global "4.3.2"
+    safe-json-parse "4.0.0"
+    tsml "1.0.1"
+    videojs-font "2.1.0"
+    videojs-ie8 "1.1.2"
+    videojs-vtt.js "0.12.6"
+    xhr "2.4.0"
 
-"video.js@^7 || ^8", "video.js@^8", "video.js@^8.5.2":
-  "integrity" "sha512-CNYVJ5WWIZ7bOhbkkfcKqLGoc6WsE3Ft2RfS1lXdQTWk8UiSsPW2Ssk2JzPCA8qnIlUG9os/faCFsYWjyu4JcA=="
-  "resolved" "https://registry.npmmirror.com/video.js/-/video.js-8.6.1.tgz"
-  "version" "8.6.1"
+"video.js@^7 || ^8", video.js@^8, video.js@^8.5.2:
+  version "8.5.2"
+  resolved "https://registry.npmmirror.com/video.js/-/video.js-8.5.2.tgz"
+  integrity sha512-6/uNXQV3xSaKLpaPf/bVvr7omd+82sKUp0RMBgIt4PxHIe28GtX+O+GcNfI2fuwBvcDRDqk5Ei5AG9bJJOpulA==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@videojs/http-streaming" "3.7.0"
+    "@videojs/http-streaming" "3.5.3"
     "@videojs/vhs-utils" "^4.0.0"
     "@videojs/xhr" "2.6.0"
-    "aes-decrypter" "^4.0.1"
-    "global" "4.4.0"
-    "keycode" "2.2.0"
-    "m3u8-parser" "^6.0.0"
-    "mpd-parser" "^1.0.1"
-    "mux.js" "^7.0.1"
-    "safe-json-parse" "4.0.0"
-    "videojs-contrib-quality-levels" "4.0.0"
-    "videojs-font" "4.1.0"
-    "videojs-vtt.js" "0.15.5"
+    aes-decrypter "^4.0.1"
+    global "4.4.0"
+    keycode "2.2.0"
+    m3u8-parser "^6.0.0"
+    mpd-parser "^1.0.1"
+    mux.js "^6.2.0"
+    safe-json-parse "4.0.0"
+    videojs-contrib-quality-levels "4.0.0"
+    videojs-font "4.1.0"
+    videojs-vtt.js "0.15.5"
 
-"videojs-contrib-hls@^5.12.2":
-  "integrity" "sha512-18zbMYZ0XRBKTPEayA9bFTWWrqhT9b4G8+zf0czJLD7Epe5PcK1I/3dflTHQeQ5rwlWir+/XnFU3sMg/B2MMcw=="
-  "resolved" "https://registry.npmmirror.com/videojs-contrib-hls/-/videojs-contrib-hls-5.15.0.tgz"
-  "version" "5.15.0"
+videojs-contrib-hls@^5.12.2:
+  version "5.15.0"
+  resolved "https://registry.npmmirror.com/videojs-contrib-hls/-/videojs-contrib-hls-5.15.0.tgz"
+  integrity sha512-18zbMYZ0XRBKTPEayA9bFTWWrqhT9b4G8+zf0czJLD7Epe5PcK1I/3dflTHQeQ5rwlWir+/XnFU3sMg/B2MMcw==
   dependencies:
-    "aes-decrypter" "1.0.3"
-    "global" "^4.3.0"
-    "m3u8-parser" "2.1.0"
-    "mux.js" "4.3.2"
-    "url-toolkit" "^2.1.3"
-    "video.js" "^5.19.1 || ^6.2.0"
-    "videojs-contrib-media-sources" "4.7.2"
-    "webwackify" "0.1.6"
+    aes-decrypter "1.0.3"
+    global "^4.3.0"
+    m3u8-parser "2.1.0"
+    mux.js "4.3.2"
+    url-toolkit "^2.1.3"
+    video.js "^5.19.1 || ^6.2.0"
+    videojs-contrib-media-sources "4.7.2"
+    webwackify "0.1.6"
 
-"videojs-contrib-media-sources@4.7.2":
-  "integrity" "sha512-e6iCHWBFuV05EGo7v+pS9iepObXnJ9joms467gzi8ZjpKVb3ifha9M0Ja24Rd8JfvYpzjltsgDVtGFDvIg4hQQ=="
-  "resolved" "https://registry.npmmirror.com/videojs-contrib-media-sources/-/videojs-contrib-media-sources-4.7.2.tgz"
-  "version" "4.7.2"
+videojs-contrib-media-sources@4.7.2:
+  version "4.7.2"
+  resolved "https://registry.npmmirror.com/videojs-contrib-media-sources/-/videojs-contrib-media-sources-4.7.2.tgz"
+  integrity sha512-e6iCHWBFuV05EGo7v+pS9iepObXnJ9joms467gzi8ZjpKVb3ifha9M0Ja24Rd8JfvYpzjltsgDVtGFDvIg4hQQ==
   dependencies:
-    "global" "^4.3.0"
-    "mux.js" "4.3.2"
-    "video.js" "^5.17.0 || ^6.2.0"
-    "webwackify" "0.1.6"
+    global "^4.3.0"
+    mux.js "4.3.2"
+    video.js "^5.17.0 || ^6.2.0"
+    webwackify "0.1.6"
 
-"videojs-contrib-quality-levels@4.0.0":
-  "integrity" "sha512-u5rmd8BjLwANp7XwuQ0Q/me34bMe6zg9PQdHfTS7aXgiVRbNTb4djcmfG7aeSrkpZjg+XCLezFNenlJaCjBHKw=="
-  "resolved" "https://registry.npmmirror.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-4.0.0.tgz"
-  "version" "4.0.0"
+videojs-contrib-quality-levels@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-4.0.0.tgz"
+  integrity sha512-u5rmd8BjLwANp7XwuQ0Q/me34bMe6zg9PQdHfTS7aXgiVRbNTb4djcmfG7aeSrkpZjg+XCLezFNenlJaCjBHKw==
   dependencies:
-    "global" "^4.4.0"
+    global "^4.4.0"
 
-"videojs-flash@^2.1.0":
-  "integrity" "sha512-mHu6TD12EKkxMvr8tg4AcfV/DuVLff427nneoZom3N9Dd2bv0sJOWwdLPQH1v5BCuAuXAVuAOba56ovTl+G3tQ=="
-  "resolved" "https://registry.npmmirror.com/videojs-flash/-/videojs-flash-2.2.1.tgz"
-  "version" "2.2.1"
+videojs-flash@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.npmmirror.com/videojs-flash/-/videojs-flash-2.2.1.tgz"
+  integrity sha512-mHu6TD12EKkxMvr8tg4AcfV/DuVLff427nneoZom3N9Dd2bv0sJOWwdLPQH1v5BCuAuXAVuAOba56ovTl+G3tQ==
   dependencies:
-    "global" "^4.4.0"
-    "video.js" "^6 || ^7"
-    "videojs-swf" "5.4.2"
+    global "^4.4.0"
+    video.js "^6 || ^7"
+    videojs-swf "5.4.2"
 
-"videojs-font@2.1.0":
-  "integrity" "sha512-zFqWpLrXf1q8NtYx5qtZhMC6SLUFScDmR6j+UGPogobxR21lvXShhnzcNNMdOxJUuFLiToJ/BPpFUQwX4xhpvA=="
-  "resolved" "https://registry.npmmirror.com/videojs-font/-/videojs-font-2.1.0.tgz"
-  "version" "2.1.0"
+videojs-font@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/videojs-font/-/videojs-font-2.1.0.tgz"
+  integrity sha512-zFqWpLrXf1q8NtYx5qtZhMC6SLUFScDmR6j+UGPogobxR21lvXShhnzcNNMdOxJUuFLiToJ/BPpFUQwX4xhpvA==
 
-"videojs-font@3.2.0":
-  "integrity" "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA=="
-  "resolved" "https://registry.npmmirror.com/videojs-font/-/videojs-font-3.2.0.tgz"
-  "version" "3.2.0"
+videojs-font@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.npmmirror.com/videojs-font/-/videojs-font-3.2.0.tgz"
+  integrity sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==
 
-"videojs-font@4.1.0":
-  "integrity" "sha512-X1LuPfLZPisPLrANIAKCknZbZu5obVM/ylfd1CN+SsCmPZQ3UMDPcvLTpPBJxcBuTpHQq2MO1QCFt7p8spnZ/w=="
-  "resolved" "https://registry.npmmirror.com/videojs-font/-/videojs-font-4.1.0.tgz"
-  "version" "4.1.0"
+videojs-font@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmmirror.com/videojs-font/-/videojs-font-4.1.0.tgz"
+  integrity sha512-X1LuPfLZPisPLrANIAKCknZbZu5obVM/ylfd1CN+SsCmPZQ3UMDPcvLTpPBJxcBuTpHQq2MO1QCFt7p8spnZ/w==
 
-"videojs-hotkeys@^0.2.20":
-  "integrity" "sha512-M8rlD5OSB3EDRdbS4MRNlGKFpA2sSIStmUPvy5zfl/NigzWaN6r4wnb32rEN0v97GiQwmUfXSmqrPNrXhiFQmQ=="
-  "resolved" "https://registry.npmmirror.com/videojs-hotkeys/-/videojs-hotkeys-0.2.28.tgz"
-  "version" "0.2.28"
+videojs-hotkeys@^0.2.20:
+  version "0.2.28"
+  resolved "https://registry.npmmirror.com/videojs-hotkeys/-/videojs-hotkeys-0.2.28.tgz"
+  integrity sha512-M8rlD5OSB3EDRdbS4MRNlGKFpA2sSIStmUPvy5zfl/NigzWaN6r4wnb32rEN0v97GiQwmUfXSmqrPNrXhiFQmQ==
 
-"videojs-ie8@1.1.2":
-  "integrity" "sha512-0Zb2T4MLkpfZbeGMK/Z93b8Lrepr+rLFoHgQV1CoDeFqXvH7b+Vsd/VHoILGxQrgCSHFQ7mAODR6oyMjuiD4/g=="
-  "resolved" "https://registry.npmmirror.com/videojs-ie8/-/videojs-ie8-1.1.2.tgz"
-  "version" "1.1.2"
+videojs-ie8@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/videojs-ie8/-/videojs-ie8-1.1.2.tgz"
+  integrity sha512-0Zb2T4MLkpfZbeGMK/Z93b8Lrepr+rLFoHgQV1CoDeFqXvH7b+Vsd/VHoILGxQrgCSHFQ7mAODR6oyMjuiD4/g==
   dependencies:
-    "es5-shim" "^4.5.1"
+    es5-shim "^4.5.1"
 
-"videojs-swf@5.4.2":
-  "integrity" "sha512-FGg+Csioa8/A/EacvFefBdb9Z0rSiMlheHDunZnN3xXfUF43jvjawcWFQnZvrv1Cs1nE1LBrHyUZjF7j2mKOLw=="
-  "resolved" "https://registry.npmmirror.com/videojs-swf/-/videojs-swf-5.4.2.tgz"
-  "version" "5.4.2"
+videojs-swf@5.4.2:
+  version "5.4.2"
+  resolved "https://registry.npmmirror.com/videojs-swf/-/videojs-swf-5.4.2.tgz"
+  integrity sha512-FGg+Csioa8/A/EacvFefBdb9Z0rSiMlheHDunZnN3xXfUF43jvjawcWFQnZvrv1Cs1nE1LBrHyUZjF7j2mKOLw==
 
-"videojs-vtt.js@^0.15.5", "videojs-vtt.js@0.15.5":
-  "integrity" "sha512-yZbBxvA7QMYn15Lr/ZfhhLPrNpI/RmCSCqgIff57GC2gIrV5YfyzLfLyZMj0NnZSAz8syB4N0nHXpZg9MyrMOQ=="
-  "resolved" "https://registry.npmmirror.com/videojs-vtt.js/-/videojs-vtt.js-0.15.5.tgz"
-  "version" "0.15.5"
+videojs-vtt.js@^0.15.5, videojs-vtt.js@0.15.5:
+  version "0.15.5"
+  resolved "https://registry.npmmirror.com/videojs-vtt.js/-/videojs-vtt.js-0.15.5.tgz"
+  integrity sha512-yZbBxvA7QMYn15Lr/ZfhhLPrNpI/RmCSCqgIff57GC2gIrV5YfyzLfLyZMj0NnZSAz8syB4N0nHXpZg9MyrMOQ==
   dependencies:
-    "global" "^4.3.1"
+    global "^4.3.1"
 
-"videojs-vtt.js@0.12.6":
-  "integrity" "sha512-XFXeGBQiljnElMhwCcZst0RDbZn2n8LU7ZScXryd3a00OaZsHAjdZu/7/RdSr7Z1jHphd45FnOvOQkGK4YrWCQ=="
-  "resolved" "https://registry.npmmirror.com/videojs-vtt.js/-/videojs-vtt.js-0.12.6.tgz"
-  "version" "0.12.6"
+videojs-vtt.js@0.12.6:
+  version "0.12.6"
+  resolved "https://registry.npmmirror.com/videojs-vtt.js/-/videojs-vtt.js-0.12.6.tgz"
+  integrity sha512-XFXeGBQiljnElMhwCcZst0RDbZn2n8LU7ZScXryd3a00OaZsHAjdZu/7/RdSr7Z1jHphd45FnOvOQkGK4YrWCQ==
   dependencies:
-    "global" "^4.3.1"
+    global "^4.3.1"
 
-"vm-browserify@^1.0.1":
-  "integrity" "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
-  "resolved" "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz"
-  "version" "1.1.2"
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-"vue-count-to@1.0.13":
-  "integrity" "sha512-6R4OVBVNtQTlcbXu6SJ8ENR35M2/CdWt3Jmv57jOUM+1ojiFmjVGvZPH8DfHpMDSA+ITs+EW5V6qthADxeyYOQ=="
-  "resolved" "https://registry.npmmirror.com/vue-count-to/-/vue-count-to-1.0.13.tgz"
-  "version" "1.0.13"
+vue-count-to@1.0.13:
+  version "1.0.13"
+  resolved "https://registry.npmmirror.com/vue-count-to/-/vue-count-to-1.0.13.tgz"
+  integrity sha512-6R4OVBVNtQTlcbXu6SJ8ENR35M2/CdWt3Jmv57jOUM+1ojiFmjVGvZPH8DfHpMDSA+ITs+EW5V6qthADxeyYOQ==
 
-"vue-cropper@0.5.8":
-  "integrity" "sha512-Xgi/aLQCcNCiBTUdovy/i4LWx0G7fQnAENBpDWA3J4i87Zlk9DJRksXrClsQ6nnaFRfQVkMimij5GEvAMaXdYw=="
-  "resolved" "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-0.5.8.tgz"
-  "version" "0.5.8"
+vue-cropper@0.5.8:
+  version "0.5.8"
+  resolved "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-0.5.8.tgz"
+  integrity sha512-Xgi/aLQCcNCiBTUdovy/i4LWx0G7fQnAENBpDWA3J4i87Zlk9DJRksXrClsQ6nnaFRfQVkMimij5GEvAMaXdYw==
 
-"vue-eslint-parser@^9.0.1":
-  "integrity" "sha512-q7tWyCVaV9f8iQyIA5Mkj/S6AoJ9KBN8IeUSf3XEmBrOtxOZnfTg5s4KClbZBCK3GtnT/+RyCLZyDHuZwTuBjg=="
-  "resolved" "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-9.3.2.tgz"
-  "version" "9.3.2"
+vue-eslint-parser@^9.0.1:
+  version "9.3.1"
+  resolved "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-9.3.1.tgz"
+  integrity sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==
   dependencies:
-    "debug" "^4.3.4"
-    "eslint-scope" "^7.1.1"
-    "eslint-visitor-keys" "^3.3.0"
-    "espree" "^9.3.1"
-    "esquery" "^1.4.0"
-    "lodash" "^4.17.21"
-    "semver" "^7.3.6"
+    debug "^4.3.4"
+    eslint-scope "^7.1.1"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.3.1"
+    esquery "^1.4.0"
+    lodash "^4.17.21"
+    semver "^7.3.6"
 
-"vue-hot-reload-api@^2.3.0":
-  "integrity" "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="
-  "resolved" "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"
-  "version" "2.3.4"
+vue-hot-reload-api@^2.3.0:
+  version "2.3.4"
+  resolved "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"
+  integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
 "vue-loader-v16@npm:vue-loader@^16.1.0":
-  "integrity" "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA=="
-  "resolved" "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz"
-  "version" "16.8.3"
+  version "16.8.3"
+  resolved "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz"
+  integrity sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==
   dependencies:
-    "chalk" "^4.1.0"
-    "hash-sum" "^2.0.0"
-    "loader-utils" "^2.0.0"
+    chalk "^4.1.0"
+    hash-sum "^2.0.0"
+    loader-utils "^2.0.0"
 
-"vue-loader@^15.9.2":
-  "integrity" "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q=="
-  "resolved" "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz"
-  "version" "15.11.1"
+vue-loader@^15.9.2:
+  version "15.10.1"
+  resolved "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz"
+  integrity sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==
   dependencies:
     "@vue/component-compiler-utils" "^3.1.0"
-    "hash-sum" "^1.0.2"
-    "loader-utils" "^1.1.0"
-    "vue-hot-reload-api" "^2.3.0"
-    "vue-style-loader" "^4.1.0"
+    hash-sum "^1.0.2"
+    loader-utils "^1.1.0"
+    vue-hot-reload-api "^2.3.0"
+    vue-style-loader "^4.1.0"
 
-"vue-meta@^2.4.0":
-  "integrity" "sha512-XEeZUmlVeODclAjCNpWDnjgw+t3WA6gdzs6ENoIAgwO1J1d5p1tezDhtteLUFwcaQaTtayRrsx7GL6oXp/m2Jw=="
-  "resolved" "https://registry.npmmirror.com/vue-meta/-/vue-meta-2.4.0.tgz"
-  "version" "2.4.0"
+vue-meta@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.npmmirror.com/vue-meta/-/vue-meta-2.4.0.tgz"
+  integrity sha512-XEeZUmlVeODclAjCNpWDnjgw+t3WA6gdzs6ENoIAgwO1J1d5p1tezDhtteLUFwcaQaTtayRrsx7GL6oXp/m2Jw==
   dependencies:
-    "deepmerge" "^4.2.2"
+    deepmerge "^4.2.2"
 
-"vue-plugin-hiprint@0.0.54-fix":
-  "integrity" "sha512-WVUQdTIsxixS1VFr5nNIa0Hztrb9szJgS3z4MPUvu9gdqdu32lU3Jhux8QBTeVYrjIfNGuiNKNn5WUb+A5RK5Q=="
-  "resolved" "https://registry.npmmirror.com/vue-plugin-hiprint/-/vue-plugin-hiprint-0.0.54-fix.tgz"
-  "version" "0.0.54-fix"
+vue-plugin-hiprint@0.0.54-fix:
+  version "0.0.54-fix"
+  resolved "https://registry.npmmirror.com/vue-plugin-hiprint/-/vue-plugin-hiprint-0.0.54-fix.tgz"
+  integrity sha512-WVUQdTIsxixS1VFr5nNIa0Hztrb9szJgS3z4MPUvu9gdqdu32lU3Jhux8QBTeVYrjIfNGuiNKNn5WUb+A5RK5Q==
   dependencies:
     "@claviska/jquery-minicolors" "^2.3.6"
-    "canvg" "^3.0.10"
-    "html2canvas" "^1.4.1"
-    "jquery" "^3.6.0"
-    "jsbarcode" "^3.11.5"
-    "jspdf" "^2.5.1"
-    "nzh" "^1.0.8"
-    "socket.io-client" "^4.5.1"
+    canvg "^3.0.10"
+    html2canvas "^1.4.1"
+    jquery "^3.6.0"
+    jsbarcode "^3.11.5"
+    jspdf "^2.5.1"
+    nzh "^1.0.8"
+    socket.io-client "^4.5.1"
 
-"vue-quill-editor@^3.0.6":
-  "integrity" "sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ=="
-  "resolved" "https://registry.npmmirror.com/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz"
-  "version" "3.0.6"
+vue-quill-editor@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.npmmirror.com/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz"
+  integrity sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ==
   dependencies:
-    "object-assign" "^4.1.1"
-    "quill" "^1.3.4"
+    object-assign "^4.1.1"
+    quill "^1.3.4"
 
-"vue-router@3.4.9":
-  "integrity" "sha512-CGAKWN44RqXW06oC+u4mPgHLQQi2t6vLD/JbGRDAXm0YpMv0bgpKuU5bBd7AvMgfTz9kXVRIWKHqRwGEb8xFkA=="
-  "resolved" "https://registry.npmmirror.com/vue-router/-/vue-router-3.4.9.tgz"
-  "version" "3.4.9"
+vue-router@3.4.9:
+  version "3.4.9"
+  resolved "https://registry.npmmirror.com/vue-router/-/vue-router-3.4.9.tgz"
+  integrity sha512-CGAKWN44RqXW06oC+u4mPgHLQQi2t6vLD/JbGRDAXm0YpMv0bgpKuU5bBd7AvMgfTz9kXVRIWKHqRwGEb8xFkA==
 
-"vue-style-loader@^4.1.0", "vue-style-loader@^4.1.2":
-  "integrity" "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="
-  "resolved" "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz"
-  "version" "4.1.3"
+vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz"
+  integrity sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==
   dependencies:
-    "hash-sum" "^1.0.2"
-    "loader-utils" "^1.0.2"
+    hash-sum "^1.0.2"
+    loader-utils "^1.0.2"
 
-"vue-template-es2015-compiler@^1.9.0":
-  "integrity" "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="
-  "resolved" "https://registry.npmmirror.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"
-  "version" "1.9.1"
+vue-template-es2015-compiler@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.npmmirror.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"
+  integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
-"vue-video-player@^5.0.2":
-  "integrity" "sha512-IZXeRGGSX4YIp54G0Q5cB7iqh6Ok6Dpa2jRkjdyvMWw7MShJuh54/d5QNb1CZ+CvZUzX/TH7osnpir7mBNcFvQ=="
-  "resolved" "https://registry.npmmirror.com/vue-video-player/-/vue-video-player-5.0.2.tgz"
-  "version" "5.0.2"
+vue-video-player@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.npmmirror.com/vue-video-player/-/vue-video-player-5.0.2.tgz"
+  integrity sha512-IZXeRGGSX4YIp54G0Q5cB7iqh6Ok6Dpa2jRkjdyvMWw7MShJuh54/d5QNb1CZ+CvZUzX/TH7osnpir7mBNcFvQ==
   dependencies:
-    "object-assign" "^4.1.1"
-    "video.js" "^6.6.0"
-    "videojs-contrib-hls" "^5.12.2"
-    "videojs-flash" "^2.1.0"
-    "videojs-hotkeys" "^0.2.20"
+    object-assign "^4.1.1"
+    video.js "^6.6.0"
+    videojs-contrib-hls "^5.12.2"
+    videojs-flash "^2.1.0"
+    videojs-hotkeys "^0.2.20"
 
-"vue@*", "vue@^2 || ^3.0.0-0", "vue@^2.0.0", "vue@^2.2.0", "vue@^2.5.17", "vue@2.7.14":
-  "integrity" "sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ=="
-  "resolved" "https://registry.npmmirror.com/vue/-/vue-2.7.14.tgz"
-  "version" "2.7.14"
+vue@*, "vue@^2 || ^3.0.0-0", vue@^2.0.0, vue@^2.2.0, vue@^2.5.17, vue@2.7.14:
+  version "2.7.14"
+  resolved "https://registry.npmmirror.com/vue/-/vue-2.7.14.tgz"
+  integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==
   dependencies:
     "@vue/compiler-sfc" "2.7.14"
-    "csstype" "^3.1.0"
+    csstype "^3.1.0"
 
-"vuedraggable@2.24.3":
-  "integrity" "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g=="
-  "resolved" "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-2.24.3.tgz"
-  "version" "2.24.3"
+vuedraggable@2.24.3:
+  version "2.24.3"
+  resolved "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-2.24.3.tgz"
+  integrity sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==
   dependencies:
-    "sortablejs" "1.10.2"
+    sortablejs "1.10.2"
 
-"vuex@3.6.2":
-  "integrity" "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
-  "resolved" "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz"
-  "version" "3.6.2"
+vuex@3.6.2:
+  version "3.6.2"
+  resolved "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz"
+  integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==
 
-"watch-size@^2.0.0":
-  "integrity" "sha512-M92R89dNoTPWyCD+HuUEDdhaDnh9jxPGOwlDc0u51jAgmjUvzqaEMynXSr3BaWs+QdHYk4KzibPy1TFtjLmOZQ=="
-  "resolved" "https://registry.npmmirror.com/watch-size/-/watch-size-2.0.0.tgz"
-  "version" "2.0.0"
+watch-size@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/watch-size/-/watch-size-2.0.0.tgz"
+  integrity sha512-M92R89dNoTPWyCD+HuUEDdhaDnh9jxPGOwlDc0u51jAgmjUvzqaEMynXSr3BaWs+QdHYk4KzibPy1TFtjLmOZQ==
 
-"watchpack-chokidar2@^2.0.1":
-  "integrity" "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww=="
-  "resolved" "https://registry.npmmirror.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz"
-  "version" "2.0.1"
+watchpack-chokidar2@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz"
+  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
   dependencies:
-    "chokidar" "^2.1.8"
+    chokidar "^2.1.8"
 
-"watchpack@^1.7.4":
-  "integrity" "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ=="
-  "resolved" "https://registry.npmmirror.com/watchpack/-/watchpack-1.7.5.tgz"
-  "version" "1.7.5"
+watchpack@^1.7.4:
+  version "1.7.5"
+  resolved "https://registry.npmmirror.com/watchpack/-/watchpack-1.7.5.tgz"
+  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
-    "graceful-fs" "^4.1.2"
-    "neo-async" "^2.5.0"
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
   optionalDependencies:
-    "chokidar" "^3.4.1"
-    "watchpack-chokidar2" "^2.0.1"
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.1"
 
-"wbuf@^1.1.0", "wbuf@^1.7.3":
-  "integrity" "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="
-  "resolved" "https://registry.npmmirror.com/wbuf/-/wbuf-1.7.3.tgz"
-  "version" "1.7.3"
+wbuf@^1.1.0, wbuf@^1.7.3:
+  version "1.7.3"
+  resolved "https://registry.npmmirror.com/wbuf/-/wbuf-1.7.3.tgz"
+  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
   dependencies:
-    "minimalistic-assert" "^1.0.0"
+    minimalistic-assert "^1.0.0"
 
-"wcwidth@^1.0.1":
-  "integrity" "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="
-  "resolved" "https://registry.npmmirror.com/wcwidth/-/wcwidth-1.0.1.tgz"
-  "version" "1.0.1"
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/wcwidth/-/wcwidth-1.0.1.tgz"
+  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
   dependencies:
-    "defaults" "^1.0.3"
+    defaults "^1.0.3"
 
-"webpack-bundle-analyzer@^3.8.0", "webpack-bundle-analyzer@^3.9.0":
-  "integrity" "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA=="
-  "resolved" "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz"
-  "version" "3.9.0"
+webpack-bundle-analyzer@^3.8.0, webpack-bundle-analyzer@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz"
+  integrity sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==
   dependencies:
-    "acorn" "^7.1.1"
-    "acorn-walk" "^7.1.1"
-    "bfj" "^6.1.1"
-    "chalk" "^2.4.1"
-    "commander" "^2.18.0"
-    "ejs" "^2.6.1"
-    "express" "^4.16.3"
-    "filesize" "^3.6.1"
-    "gzip-size" "^5.0.0"
-    "lodash" "^4.17.19"
-    "mkdirp" "^0.5.1"
-    "opener" "^1.5.1"
-    "ws" "^6.0.0"
+    acorn "^7.1.1"
+    acorn-walk "^7.1.1"
+    bfj "^6.1.1"
+    chalk "^2.4.1"
+    commander "^2.18.0"
+    ejs "^2.6.1"
+    express "^4.16.3"
+    filesize "^3.6.1"
+    gzip-size "^5.0.0"
+    lodash "^4.17.19"
+    mkdirp "^0.5.1"
+    opener "^1.5.1"
+    ws "^6.0.0"
 
-"webpack-chain@^6.4.0":
-  "integrity" "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA=="
-  "resolved" "https://registry.npmmirror.com/webpack-chain/-/webpack-chain-6.5.1.tgz"
-  "version" "6.5.1"
+webpack-chain@^6.4.0:
+  version "6.5.1"
+  resolved "https://registry.npmmirror.com/webpack-chain/-/webpack-chain-6.5.1.tgz"
+  integrity sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==
   dependencies:
-    "deepmerge" "^1.5.2"
-    "javascript-stringify" "^2.0.1"
+    deepmerge "^1.5.2"
+    javascript-stringify "^2.0.1"
 
-"webpack-dev-middleware@^3.7.2":
-  "integrity" "sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ=="
-  "resolved" "https://registry.npmmirror.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz"
-  "version" "3.7.3"
+webpack-dev-middleware@^3.7.2:
+  version "3.7.3"
+  resolved "https://registry.npmmirror.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz"
+  integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
   dependencies:
-    "memory-fs" "^0.4.1"
-    "mime" "^2.4.4"
-    "mkdirp" "^0.5.1"
-    "range-parser" "^1.2.1"
-    "webpack-log" "^2.0.0"
+    memory-fs "^0.4.1"
+    mime "^2.4.4"
+    mkdirp "^0.5.1"
+    range-parser "^1.2.1"
+    webpack-log "^2.0.0"
 
-"webpack-dev-server@^3.11.0":
-  "integrity" "sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA=="
-  "resolved" "https://registry.npmmirror.com/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz"
-  "version" "3.11.3"
+webpack-dev-server@^3.11.0:
+  version "3.11.3"
+  resolved "https://registry.npmmirror.com/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz"
+  integrity sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==
   dependencies:
-    "ansi-html-community" "0.0.8"
-    "bonjour" "^3.5.0"
-    "chokidar" "^2.1.8"
-    "compression" "^1.7.4"
-    "connect-history-api-fallback" "^1.6.0"
-    "debug" "^4.1.1"
-    "del" "^4.1.1"
-    "express" "^4.17.1"
-    "html-entities" "^1.3.1"
-    "http-proxy-middleware" "0.19.1"
-    "import-local" "^2.0.0"
-    "internal-ip" "^4.3.0"
-    "ip" "^1.1.5"
-    "is-absolute-url" "^3.0.3"
-    "killable" "^1.0.1"
-    "loglevel" "^1.6.8"
-    "opn" "^5.5.0"
-    "p-retry" "^3.0.1"
-    "portfinder" "^1.0.26"
-    "schema-utils" "^1.0.0"
-    "selfsigned" "^1.10.8"
-    "semver" "^6.3.0"
-    "serve-index" "^1.9.1"
-    "sockjs" "^0.3.21"
-    "sockjs-client" "^1.5.0"
-    "spdy" "^4.0.2"
-    "strip-ansi" "^3.0.1"
-    "supports-color" "^6.1.0"
-    "url" "^0.11.0"
-    "webpack-dev-middleware" "^3.7.2"
-    "webpack-log" "^2.0.0"
-    "ws" "^6.2.1"
-    "yargs" "^13.3.2"
+    ansi-html-community "0.0.8"
+    bonjour "^3.5.0"
+    chokidar "^2.1.8"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
+    debug "^4.1.1"
+    del "^4.1.1"
+    express "^4.17.1"
+    html-entities "^1.3.1"
+    http-proxy-middleware "0.19.1"
+    import-local "^2.0.0"
+    internal-ip "^4.3.0"
+    ip "^1.1.5"
+    is-absolute-url "^3.0.3"
+    killable "^1.0.1"
+    loglevel "^1.6.8"
+    opn "^5.5.0"
+    p-retry "^3.0.1"
+    portfinder "^1.0.26"
+    schema-utils "^1.0.0"
+    selfsigned "^1.10.8"
+    semver "^6.3.0"
+    serve-index "^1.9.1"
+    sockjs "^0.3.21"
+    sockjs-client "^1.5.0"
+    spdy "^4.0.2"
+    strip-ansi "^3.0.1"
+    supports-color "^6.1.0"
+    url "^0.11.0"
+    webpack-dev-middleware "^3.7.2"
+    webpack-log "^2.0.0"
+    ws "^6.2.1"
+    yargs "^13.3.2"
 
-"webpack-log@^2.0.0":
-  "integrity" "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="
-  "resolved" "https://registry.npmmirror.com/webpack-log/-/webpack-log-2.0.0.tgz"
-  "version" "2.0.0"
+webpack-log@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/webpack-log/-/webpack-log-2.0.0.tgz"
+  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
   dependencies:
-    "ansi-colors" "^3.0.0"
-    "uuid" "^3.3.2"
+    ansi-colors "^3.0.0"
+    uuid "^3.3.2"
 
-"webpack-merge@^4.2.2":
-  "integrity" "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="
-  "resolved" "https://registry.npmmirror.com/webpack-merge/-/webpack-merge-4.2.2.tgz"
-  "version" "4.2.2"
+webpack-merge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.npmmirror.com/webpack-merge/-/webpack-merge-4.2.2.tgz"
+  integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
   dependencies:
-    "lodash" "^4.17.15"
+    lodash "^4.17.15"
 
-"webpack-sources@^1.1.0", "webpack-sources@^1.4.0", "webpack-sources@^1.4.1", "webpack-sources@^1.4.3":
-  "integrity" "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="
-  "resolved" "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-1.4.3.tgz"
-  "version" "1.4.3"
+webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-1.4.3.tgz"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
   dependencies:
-    "source-list-map" "^2.0.0"
-    "source-map" "~0.6.1"
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
 
-"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.36.0 || ^5.0.0", "webpack@^4.4.0", "webpack@>=2", "webpack@>=2.0.0 <5.0.0", "webpack@>=4.0.0":
-  "integrity" "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ=="
-  "resolved" "https://registry.npmmirror.com/webpack/-/webpack-4.47.0.tgz"
-  "version" "4.47.0"
+"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", webpack@^4.0.0, "webpack@^4.0.0 || ^5.0.0", "webpack@^4.1.0 || ^5.0.0-0", "webpack@^4.36.0 || ^5.0.0", webpack@^4.4.0, webpack@>=2, "webpack@>=2.0.0 <5.0.0", webpack@>=4.0.0:
+  version "4.46.0"
+  resolved "https://registry.npmmirror.com/webpack/-/webpack-4.46.0.tgz"
+  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
     "@webassemblyjs/wasm-edit" "1.9.0"
     "@webassemblyjs/wasm-parser" "1.9.0"
-    "acorn" "^6.4.1"
-    "ajv" "^6.10.2"
-    "ajv-keywords" "^3.4.1"
-    "chrome-trace-event" "^1.0.2"
-    "enhanced-resolve" "^4.5.0"
-    "eslint-scope" "^4.0.3"
-    "json-parse-better-errors" "^1.0.2"
-    "loader-runner" "^2.4.0"
-    "loader-utils" "^1.2.3"
-    "memory-fs" "^0.4.1"
-    "micromatch" "^3.1.10"
-    "mkdirp" "^0.5.3"
-    "neo-async" "^2.6.1"
-    "node-libs-browser" "^2.2.1"
-    "schema-utils" "^1.0.0"
-    "tapable" "^1.1.3"
-    "terser-webpack-plugin" "^1.4.3"
-    "watchpack" "^1.7.4"
-    "webpack-sources" "^1.4.1"
+    acorn "^6.4.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^4.5.0"
+    eslint-scope "^4.0.3"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.3"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.3"
+    watchpack "^1.7.4"
+    webpack-sources "^1.4.1"
 
-"websocket-driver@^0.7.4", "websocket-driver@>=0.5.1":
-  "integrity" "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="
-  "resolved" "https://registry.npmmirror.com/websocket-driver/-/websocket-driver-0.7.4.tgz"
-  "version" "0.7.4"
+websocket-driver@^0.7.4, websocket-driver@>=0.5.1:
+  version "0.7.4"
+  resolved "https://registry.npmmirror.com/websocket-driver/-/websocket-driver-0.7.4.tgz"
+  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
   dependencies:
-    "http-parser-js" ">=0.5.1"
-    "safe-buffer" ">=5.1.0"
-    "websocket-extensions" ">=0.1.1"
+    http-parser-js ">=0.5.1"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
 
-"websocket-extensions@>=0.1.1":
-  "integrity" "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
-  "resolved" "https://registry.npmmirror.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"
-  "version" "0.1.4"
+websocket-extensions@>=0.1.1:
+  version "0.1.4"
+  resolved "https://registry.npmmirror.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
-"webwackify@0.1.6":
-  "integrity" "sha512-pGcw1T3HpNnM/UTRQqqRkkkzythSLts05mB+7Gr00B+0VbL0m39dFL5g20rSIEUt9Wrpw+/8k+snxRlUFHhcqA=="
-  "resolved" "https://registry.npmmirror.com/webwackify/-/webwackify-0.1.6.tgz"
-  "version" "0.1.6"
+webwackify@0.1.6:
+  version "0.1.6"
+  resolved "https://registry.npmmirror.com/webwackify/-/webwackify-0.1.6.tgz"
+  integrity sha512-pGcw1T3HpNnM/UTRQqqRkkkzythSLts05mB+7Gr00B+0VbL0m39dFL5g20rSIEUt9Wrpw+/8k+snxRlUFHhcqA==
 
-"which-boxed-primitive@^1.0.2":
-  "integrity" "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="
-  "resolved" "https://registry.npmmirror.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"
-  "version" "1.0.2"
+which-boxed-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
   dependencies:
-    "is-bigint" "^1.0.1"
-    "is-boolean-object" "^1.1.0"
-    "is-number-object" "^1.0.4"
-    "is-string" "^1.0.5"
-    "is-symbol" "^1.0.3"
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
 
-"which-module@^2.0.0":
-  "integrity" "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
-  "resolved" "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz"
-  "version" "2.0.1"
+which-module@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz"
+  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
 
-"which-typed-array@^1.1.11", "which-typed-array@^1.1.13":
-  "integrity" "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow=="
-  "resolved" "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.13.tgz"
-  "version" "1.1.13"
+which-typed-array@^1.1.10, which-typed-array@^1.1.11:
+  version "1.1.11"
+  resolved "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.11.tgz"
+  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
   dependencies:
-    "available-typed-arrays" "^1.0.5"
-    "call-bind" "^1.0.4"
-    "for-each" "^0.3.3"
-    "gopd" "^1.0.1"
-    "has-tostringtag" "^1.0.0"
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
 
-"which@^1.2.9":
-  "integrity" "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="
-  "resolved" "https://registry.npmmirror.com/which/-/which-1.3.1.tgz"
-  "version" "1.3.1"
+which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/which/-/which-1.3.1.tgz"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
-    "isexe" "^2.0.0"
+    isexe "^2.0.0"
 
-"which@^2.0.1":
-  "integrity" "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="
-  "resolved" "https://registry.npmmirror.com/which/-/which-2.0.2.tgz"
-  "version" "2.0.2"
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/which/-/which-2.0.2.tgz"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
-    "isexe" "^2.0.0"
+    isexe "^2.0.0"
 
-"wl-core@^1.1.4":
-  "integrity" "sha512-7L83qEnrVW3YmPVqSwnlagoWJyVq/uSXkCFzND64nwtSdDm7o1RZQWiVgQcEilZxE0qLrRQKmjuAihNT6fWCjA=="
-  "resolved" "https://registry.npmmirror.com/wl-core/-/wl-core-1.1.9.tgz"
-  "version" "1.1.9"
+wl-core@^1.1.4:
+  version "1.1.9"
+  resolved "https://registry.npmmirror.com/wl-core/-/wl-core-1.1.9.tgz"
+  integrity sha512-7L83qEnrVW3YmPVqSwnlagoWJyVq/uSXkCFzND64nwtSdDm7o1RZQWiVgQcEilZxE0qLrRQKmjuAihNT6fWCjA==
   dependencies:
-    "big.js" "^5.2.2"
-    "dayjs" "^1.8.25"
+    big.js "^5.2.2"
+    dayjs "^1.8.25"
 
-"wmf@~1.0.1":
-  "integrity" "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="
-  "resolved" "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz"
-  "version" "1.0.2"
+wmf@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz"
+  integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
 
-"word-wrap@~1.2.3":
-  "integrity" "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="
-  "resolved" "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz"
-  "version" "1.2.5"
+word-wrap@~1.2.3:
+  version "1.2.5"
+  resolved "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"word@~0.3.0":
-  "integrity" "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA=="
-  "resolved" "https://registry.npmmirror.com/word/-/word-0.3.0.tgz"
-  "version" "0.3.0"
+word@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmmirror.com/word/-/word-0.3.0.tgz"
+  integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
 
-"worker-farm@^1.7.0":
-  "integrity" "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="
-  "resolved" "https://registry.npmmirror.com/worker-farm/-/worker-farm-1.7.0.tgz"
-  "version" "1.7.0"
+worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.npmmirror.com/worker-farm/-/worker-farm-1.7.0.tgz"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
   dependencies:
-    "errno" "~0.1.7"
+    errno "~0.1.7"
 
-"wrap-ansi@^5.1.0":
-  "integrity" "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="
-  "resolved" "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"
-  "version" "5.1.0"
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
   dependencies:
-    "ansi-styles" "^3.2.0"
-    "string-width" "^3.0.0"
-    "strip-ansi" "^5.0.0"
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
 
-"wrap-ansi@^6.2.0":
-  "integrity" "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="
-  "resolved" "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
-  "version" "6.2.0"
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
   dependencies:
-    "ansi-styles" "^4.0.0"
-    "string-width" "^4.1.0"
-    "strip-ansi" "^6.0.0"
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
 
-"wrap-ansi@^7.0.0":
-  "integrity" "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="
-  "resolved" "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
-  "version" "7.0.0"
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
-    "ansi-styles" "^4.0.0"
-    "string-width" "^4.1.0"
-    "strip-ansi" "^6.0.0"
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
 
-"wrappy@1":
-  "integrity" "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-  "resolved" "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz"
-  "version" "1.0.2"
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-"write@1.0.3":
-  "integrity" "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="
-  "resolved" "https://registry.npmmirror.com/write/-/write-1.0.3.tgz"
-  "version" "1.0.3"
+write@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/write/-/write-1.0.3.tgz"
+  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
   dependencies:
-    "mkdirp" "^0.5.1"
+    mkdirp "^0.5.1"
 
-"ws@^6.0.0":
-  "integrity" "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="
-  "resolved" "https://registry.npmmirror.com/ws/-/ws-6.2.2.tgz"
-  "version" "6.2.2"
+ws@^6.0.0:
+  version "6.2.2"
+  resolved "https://registry.npmmirror.com/ws/-/ws-6.2.2.tgz"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
-    "async-limiter" "~1.0.0"
+    async-limiter "~1.0.0"
 
-"ws@^6.2.1":
-  "integrity" "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="
-  "resolved" "https://registry.npmmirror.com/ws/-/ws-6.2.2.tgz"
-  "version" "6.2.2"
+ws@^6.2.1:
+  version "6.2.2"
+  resolved "https://registry.npmmirror.com/ws/-/ws-6.2.2.tgz"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
-    "async-limiter" "~1.0.0"
+    async-limiter "~1.0.0"
 
-"ws@~8.11.0":
-  "integrity" "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg=="
-  "resolved" "https://registry.npmmirror.com/ws/-/ws-8.11.0.tgz"
-  "version" "8.11.0"
+ws@~8.11.0:
+  version "8.11.0"
+  resolved "https://registry.npmmirror.com/ws/-/ws-8.11.0.tgz"
+  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
-"xhr@2.4.0":
-  "integrity" "sha512-TUbBsdAuJbX8olk9hsDwGK8P1ri1XlV+PdEWkYw+HQQbpkiBR8PLgD1F3kQDPBs9l4Px34hP9rCYAZOCCAENbw=="
-  "resolved" "https://registry.npmmirror.com/xhr/-/xhr-2.4.0.tgz"
-  "version" "2.4.0"
+xhr@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.npmmirror.com/xhr/-/xhr-2.4.0.tgz"
+  integrity sha512-TUbBsdAuJbX8olk9hsDwGK8P1ri1XlV+PdEWkYw+HQQbpkiBR8PLgD1F3kQDPBs9l4Px34hP9rCYAZOCCAENbw==
   dependencies:
-    "global" "~4.3.0"
-    "is-function" "^1.0.1"
-    "parse-headers" "^2.0.0"
-    "xtend" "^4.0.0"
+    global "~4.3.0"
+    is-function "^1.0.1"
+    parse-headers "^2.0.0"
+    xtend "^4.0.0"
 
-"xlsx@^0.18.5":
-  "integrity" "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ=="
-  "resolved" "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz"
-  "version" "0.18.5"
+xlsx@^0.18.5:
+  version "0.18.5"
+  resolved "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz"
+  integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==
   dependencies:
-    "adler-32" "~1.3.0"
-    "cfb" "~1.2.1"
-    "codepage" "~1.15.0"
-    "crc-32" "~1.2.1"
-    "ssf" "~0.11.2"
-    "wmf" "~1.0.1"
-    "word" "~0.3.0"
+    adler-32 "~1.3.0"
+    cfb "~1.2.1"
+    codepage "~1.15.0"
+    crc-32 "~1.2.1"
+    ssf "~0.11.2"
+    wmf "~1.0.1"
+    word "~0.3.0"
 
-"xml-js@1.6.11":
-  "integrity" "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g=="
-  "resolved" "https://registry.npmmirror.com/xml-js/-/xml-js-1.6.11.tgz"
-  "version" "1.6.11"
+xml-js@1.6.11:
+  version "1.6.11"
+  resolved "https://registry.npmmirror.com/xml-js/-/xml-js-1.6.11.tgz"
+  integrity sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==
   dependencies:
-    "sax" "^1.2.4"
+    sax "^1.2.4"
 
-"xml-name-validator@^4.0.0":
-  "integrity" "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw=="
-  "resolved" "https://registry.npmmirror.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz"
-  "version" "4.0.0"
+xml-name-validator@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz"
+  integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
-"xmlhttprequest-ssl@~2.0.0":
-  "integrity" "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A=="
-  "resolved" "https://registry.npmmirror.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz"
-  "version" "2.0.0"
+xmlhttprequest-ssl@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz"
+  integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
 
-"xtend@^4.0.0", "xtend@~4.0.1":
-  "integrity" "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
-  "resolved" "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz"
-  "version" "4.0.2"
+xtend@^4.0.0, xtend@~4.0.1:
+  version "4.0.2"
+  resolved "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-"y18n@^4.0.0":
-  "integrity" "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
-  "resolved" "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz"
-  "version" "4.0.3"
+y18n@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
-"y18n@^5.0.5":
-  "integrity" "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
-  "resolved" "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz"
-  "version" "5.0.8"
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-"yallist@^2.1.2":
-  "integrity" "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
-  "resolved" "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz"
-  "version" "2.1.2"
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz"
+  integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
 
-"yallist@^3.0.2":
-  "integrity" "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-  "resolved" "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz"
-  "version" "3.1.1"
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-"yallist@^4.0.0":
-  "integrity" "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-  "resolved" "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz"
-  "version" "4.0.0"
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-"yaml@^1.10.2":
-  "integrity" "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
-  "resolved" "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz"
-  "version" "1.10.2"
+yaml@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-"yargs-parser@^13.1.2":
-  "integrity" "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="
-  "resolved" "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-13.1.2.tgz"
-  "version" "13.1.2"
+yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-13.1.2.tgz"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
   dependencies:
-    "camelcase" "^5.0.0"
-    "decamelize" "^1.2.0"
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
 
-"yargs-parser@^20.2.2":
-  "integrity" "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
-  "resolved" "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz"
-  "version" "20.2.9"
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-"yargs@^13.3.2":
-  "integrity" "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="
-  "resolved" "https://registry.npmmirror.com/yargs/-/yargs-13.3.2.tgz"
-  "version" "13.3.2"
+yargs@^13.3.2:
+  version "13.3.2"
+  resolved "https://registry.npmmirror.com/yargs/-/yargs-13.3.2.tgz"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
   dependencies:
-    "cliui" "^5.0.0"
-    "find-up" "^3.0.0"
-    "get-caller-file" "^2.0.1"
-    "require-directory" "^2.1.1"
-    "require-main-filename" "^2.0.0"
-    "set-blocking" "^2.0.0"
-    "string-width" "^3.0.0"
-    "which-module" "^2.0.0"
-    "y18n" "^4.0.0"
-    "yargs-parser" "^13.1.2"
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
 
-"yargs@^16.0.0":
-  "integrity" "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="
-  "resolved" "https://registry.npmmirror.com/yargs/-/yargs-16.2.0.tgz"
-  "version" "16.2.0"
+yargs@^16.0.0:
+  version "16.2.0"
+  resolved "https://registry.npmmirror.com/yargs/-/yargs-16.2.0.tgz"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
   dependencies:
-    "cliui" "^7.0.2"
-    "escalade" "^3.1.1"
-    "get-caller-file" "^2.0.5"
-    "require-directory" "^2.1.1"
-    "string-width" "^4.2.0"
-    "y18n" "^5.0.5"
-    "yargs-parser" "^20.2.2"
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
 
-"yocto-queue@^0.1.0":
-  "integrity" "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
-  "resolved" "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz"
-  "version" "0.1.0"
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-"yorkie@^2.0.0":
-  "integrity" "sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw=="
-  "resolved" "https://registry.npmmirror.com/yorkie/-/yorkie-2.0.0.tgz"
-  "version" "2.0.0"
+yorkie@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/yorkie/-/yorkie-2.0.0.tgz"
+  integrity sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw==
   dependencies:
-    "execa" "^0.8.0"
-    "is-ci" "^1.0.10"
-    "normalize-path" "^1.0.0"
-    "strip-indent" "^2.0.0"
+    execa "^0.8.0"
+    is-ci "^1.0.10"
+    normalize-path "^1.0.0"
+    strip-indent "^2.0.0"
 
-"zrender@5.4.0":
-  "integrity" "sha512-rOS09Z2HSVGFs2dn/TuYk5BlCaZcVe8UDLLjj1ySYF828LATKKdxuakSZMvrDz54yiKPDYVfjdKqcX8Jky3BIA=="
-  "resolved" "https://registry.npmmirror.com/zrender/-/zrender-5.4.0.tgz"
-  "version" "5.4.0"
+zrender@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.npmmirror.com/zrender/-/zrender-5.4.0.tgz"
+  integrity sha512-rOS09Z2HSVGFs2dn/TuYk5BlCaZcVe8UDLLjj1ySYF828LATKKdxuakSZMvrDz54yiKPDYVfjdKqcX8Jky3BIA==
   dependencies:
-    "tslib" "2.3.0"
+    tslib "2.3.0"