diff --git a/.env.dev b/.env.dev
index 79172cc5..1e5dfdbb 100644
--- a/.env.dev
+++ b/.env.dev
@@ -9,11 +9,13 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 智能监控分析系统
+VUE_APP_TITLE = 上上电缆
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://172.16.32.76:48080'
-VUE_APP_BASE_API = 'http://line.kszny.picaiba.com'
+
+# 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'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
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/lane.js b/src/api/areavisual/lane.js
new file mode 100644
index 00000000..4c83633c
--- /dev/null
+++ b/src/api/areavisual/lane.js
@@ -0,0 +1,49 @@
+/*
+ * @Author: zwq
+ * @Date: 2025-11-17 09:25:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-14 13:53:22
+ * @Description:
+ */
+import request from '@/utils/request'
+
+
+// 获得巷道分页
+export function getLanePage(query) {
+  return request({
+    url: '/wms/lane/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得巷道
+export function getLane(id) {
+  return request({
+    url: '/wms/lane/get?id=' + id,
+    method: 'get'
+  })
+}
+// 删除巷道
+export function deleteLane(id) {
+  return request({
+    url: '/wms/lane/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 更新
+export function updateLane(data) {
+  return request({
+    url: '/wms/lane/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createLane(data) {
+  return request({
+    url: '/wms/lane/create',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/api/areavisual/lineEdgeLibrary.js b/src/api/areavisual/lineEdgeLibrary.js
new file mode 100644
index 00000000..5426b544
--- /dev/null
+++ b/src/api/areavisual/lineEdgeLibrary.js
@@ -0,0 +1,74 @@
+/*
+ * @Author: zwq
+ * @Date: 2025-11-17 09:25:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-23 13:42:52
+ * @Description:
+ */
+import request from '@/utils/request'
+
+
+// 获得线边库分页
+export function getLineEdgeLibraryPage(query) {
+  return request({
+    url: '/wms/line-edge-library/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得线边库
+export function getLineEdgeLibrary(id) {
+  return request({
+    url: '/wms/line-edge-library/get?id=' + id,
+    method: 'get'
+  })
+}
+// 删除线边库
+export function deleteLineEdgeLibrary(id) {
+  return request({
+    url: '/wms/line-edge-library/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 更新
+export function updateLineEdgeLibrary(data) {
+  return request({
+    url: '/wms/line-edge-library/update',
+    method: 'put',
+    data: 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({
+    url: '/wms/line-edge-library/update/pc',
+    method: 'put',
+    data: data
+  })
+}
+// 创建
+export function createLineEdgeLibrary(data) {
+  return request({
+    url: '/wms/line-edge-library/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得设备分页
+export function getEquipmentPage(query) {
+  return request({
+    url: '/wms/equipment/page',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/areavisual/overview.js b/src/api/areavisual/overview.js
new file mode 100644
index 00000000..feb083b8
--- /dev/null
+++ b/src/api/areavisual/overview.js
@@ -0,0 +1,79 @@
+/*
+ * @Author: zwq
+ * @Date: 2026-01-06 15:18:38
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-15 15:02:04
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 获取区域列表
+export function getAreaList(params) {
+    return request({
+        url: '/wms/region/page',
+        method: 'get',
+        params
+    })
+}
+
+// 获取区域空满数量
+export function postAllAreaInfo(data) {
+    return request({
+        url: '/wms/region/lsit/count',
+        method: 'post',
+        data
+    })
+}
+
+// 获取指定库区库位信息
+export function postAreaInfo(params) {
+    return request({
+        url: '/wms/line-edge-library/list/region',
+        method: 'get',
+        params
+    })
+}
+
+// 获取区域总览
+export function postAllAreaOverview(data) {
+    return request({
+        url: '/wms/line-edge-library/line/count',
+        method: 'post',
+        data
+    })
+}
+
+// 删除能源实时数据库plc相关
+export function deleteEnergyPlc(id) {
+  return request({
+    url: '/base/energy-plc/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获取关联表编码
+export function getCode() {
+  return request({
+    url: '/base/energy-plc/getCode',
+    method: 'get'
+  })
+}
+
+// 获得能源实时数据库plc相关分页
+export function getEnergyPlcPage(data) {
+  return request({
+    url: '/base/energy-plc/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能源实时数据库plc相关 Excel
+export function exportEnergyPlcExcel(query) {
+  return request({
+    url: '/base/energy-plc/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
diff --git a/src/api/areavisual/record.js b/src/api/areavisual/record.js
new file mode 100644
index 00000000..127965e8
--- /dev/null
+++ b/src/api/areavisual/record.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 获取出入库历史任务分页
+export function getRecordPage(params) {
+  return request({
+    url: '/wms/job-main-task-history/page',
+    method: 'get',
+    params
+  })
+}
+
+// 获取巷道列表
+export function getLaneList(params) {
+  return request({
+    url: '/wms/lane/page',
+    method: 'get',
+    params
+  })
+}
+
+// 更新能源实时数据库plc相关
+export function updateEnergyPlc(data) {
+  return request({
+    url: '/base/energy-plc/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源实时数据库plc相关
+export function deleteEnergyPlc(id) {
+  return request({
+    url: '/base/energy-plc/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获取关联表编码
+export function getCode() {
+  return request({
+    url: '/base/energy-plc/getCode',
+    method: 'get'
+  })
+}
+
+// 获得能源实时数据库plc相关分页
+export function getEnergyPlcPage(data) {
+  return request({
+    url: '/base/energy-plc/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能源实时数据库plc相关 Excel
+export function exportEnergyPlcExcel(query) {
+  return request({
+    url: '/base/energy-plc/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
diff --git a/src/api/areavisual/region.js b/src/api/areavisual/region.js
new file mode 100644
index 00000000..a574a608
--- /dev/null
+++ b/src/api/areavisual/region.js
@@ -0,0 +1,49 @@
+/*
+ * @Author: zwq
+ * @Date: 2025-11-17 09:25:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-14 13:35:11
+ * @Description:
+ */
+import request from '@/utils/request'
+
+
+// 获得区域分页
+export function getRegionPage(query) {
+  return request({
+    url: '/wms/region/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得区域
+export function getRegion(id) {
+  return request({
+    url: '/wms/region/get?id=' + id,
+    method: 'get'
+  })
+}
+// 删除区域
+export function deleteRegion(id) {
+  return request({
+    url: '/wms/region/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 更新
+export function updateRegion(data) {
+  return request({
+    url: '/wms/region/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createRegion(data) {
+  return request({
+    url: '/wms/region/create',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/api/ssdl/product&recipe.js b/src/api/ssdl/product&recipe.js
new file mode 100644
index 00000000..a1fe477c
--- /dev/null
+++ b/src/api/ssdl/product&recipe.js
@@ -0,0 +1,162 @@
+/*
+ * @Author: zwq
+ * @Date: 2025-11-17 09:25:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-13 16:13:53
+ * @Description:
+ */
+import request from '@/utils/request'
+
+
+// 获得原料分页
+export function getProductPage(query) {
+  return request({
+    url: '/wms/material/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得所有原料
+export function getAllProductPage(query) {
+  return request({
+    url: '/wms/material/list/all/code',
+    method: 'get',
+    params: query
+  })
+}
+// 获得原料
+export function getProduct(id) {
+  return request({
+    url: '/wms/material/get?id=' + id,
+    method: 'get'
+  })
+}
+// 删除原料
+export function deleteProduct(id) {
+  return request({
+    url: '/wms/material/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 更新
+export function updateProduct(data) {
+  return request({
+    url: '/wms/material/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createProduct(data) {
+  return request({
+    url: '/wms/material/create',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 获得工艺分页
+export function getProcessPage(query) {
+  return request({
+    url: '/wms/process/page/group/by',
+    method: 'get',
+    params: query
+  })
+}
+// 获得工艺点击展开表格
+export function getProcessDetailPage(query) {
+  return request({
+    url: '/wms/process/page/group/by/detail',
+    method: 'get',
+    params: query
+  })
+}
+// 删除工艺
+export function deleteProcess(id) {
+  return request({
+    url: '/wms/process/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 批量删除工艺
+export function deleteProcessList(ids) {
+  return request({
+    url: '/wms/process/delete-list?ids=' + ids,
+    method: 'delete'
+  })
+}
+// 更新
+export function updateProcess(data) {
+  return request({
+    url: '/wms/process/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createProcess(data) {
+  return request({
+    url: '/wms/process/create',
+    method: 'post',
+    data: data
+  })
+}
+// 获得工艺
+export function getProcess(id) {
+  return request({
+    url: '/wms/process/get?id=' + id,
+    method: 'get'
+  })
+}
+// 工艺设备原料分页
+export function getProcessMaterialPage(query) {
+  return request({
+    url: '/wms/process-equipment-material/page',
+    method: 'get',
+    params: query
+  })
+}
+// 删除工艺设备原料
+export function deleteProcessMaterial(id) {
+  return request({
+    url: '/wms/process-equipment-material/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 更新
+export function updateProcessMaterial(data) {
+  return request({
+    url: '/wms/process-equipment-material/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createProcessMaterial(data) {
+  return request({
+    url: '/wms/process-equipment-material/create',
+    method: 'post',
+    data: data
+  })
+}
+// 获得工艺
+export function getProcessMaterial(id) {
+  return request({
+    url: '/wms/process-equipment-material/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得设备分页
+export function getEquipmentPage(query) {
+  return request({
+    url: '/wms/equipment/page',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/ssdl/taskList.js b/src/api/ssdl/taskList.js
new file mode 100644
index 00000000..b1092fca
--- /dev/null
+++ b/src/api/ssdl/taskList.js
@@ -0,0 +1,60 @@
+/*
+ * @Author: zwq
+ * @Date: 2025-11-17 09:25:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-18 15:42:19
+ * @Description:
+ */
+import request from '@/utils/request'
+
+
+// 获得任务分页
+export function getTaskPage(query) {
+  return request({
+    url: '/wms/job-main-task/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得任务
+export function getTask(id) {
+  return request({
+    url: '/wms/job-main-task/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得任务日志分页
+export function getTaskLogPage(query) {
+  return request({
+    url: '/wms/job-main-task-log/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 更新
+export function updateTask(data) {
+  return request({
+    url: '/wms/job-main-task/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 根据区域id获取该区域下的库位信息
+export function getRegion(id) {
+  return request({
+    url: '/wms/line-edge-library/get-by-region-id?regionId=' + id,
+    method: 'get'
+  })
+}
+
+// 创建
+export function createPCTask(data) {
+  return request({
+    url: '/wms/job-main-task/pc-create-task',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/assets/img/threeDimensionalChartBg.png b/src/assets/img/threeDimensionalChartBg.png
index 29733ced..1db16755 100644
Binary files a/src/assets/img/threeDimensionalChartBg.png and b/src/assets/img/threeDimensionalChartBg.png differ
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 1e58cd7f..812f693d 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -14,7 +14,12 @@
 				v-if="collapse"
 				key="collapse"
 				class="sidebar-logo-link"
-				to="/">
+				:to="{
+					path: '/',
+					query: {
+						keyword: 'home',
+					},
+				}">
 				<img v-if="logo" :src="logo" class="sidebar-logo" />
 				<h1
 					v-else
@@ -28,7 +33,16 @@
 					{{ title }}
 				</h1>
 			</router-link>
-			<router-link v-else key="expand" class="sidebar-logo-link" to="/">
+			<router-link
+				v-else
+				key="expand"
+				class="sidebar-logo-link"
+				:to="{
+					path: '/',
+					query: {
+						keyword: 'home',
+					},
+				}">
 				<img v-if="logo" :src="logo" class="sidebar-logo" />
 				<h1
 					class="sidebar-title"
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 7880cbba..d6bccf87 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,3 +1,10 @@
+<!--
+ * @Author: zwq
+ * @Date: 2026-01-06 15:18:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-15 09:52:23
+ * @Description:
+-->
 <template>
   <div v-if="!item.hidden">
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
diff --git a/src/mixins/basic-page.js b/src/mixins/basic-page.js
index 549a15a6..1ac38a03 100644
--- a/src/mixins/basic-page.js
+++ b/src/mixins/basic-page.js
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
  * @LastEditors: zwq
- * @LastEditTime: 2024-04-02 09:33:29
+ * @LastEditTime: 2025-11-28 09:35:03
  * @Description:
  */
 export default {
@@ -16,7 +16,7 @@ export default {
       },
       tableData: [], //table数据
       listQuery: { //分页
-        pageSize: 10,
+        pageSize: 20,
         pageNo: 1,
         total: 1,
       },
@@ -69,7 +69,7 @@ export default {
           this.$refs.addOrUpdate.init(val.data.id);
         });
       } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data)
       } else {
         this.otherMethods(val)
       }
diff --git a/src/permission.js b/src/permission.js
index 2c942eec..c6e0d077 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2026-01-06 15:18:38
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-15 09:54:44
+ * @Description:
+ */
 import router from './router'
 import store from './store'
 import { Message } from 'element-ui'
@@ -9,7 +16,7 @@ import { isRelogin } from '@/utils/request'
 NProgress.configure({ showSpinner: false })
 
 // 增加三方登陆 update by 芋艿
-const whiteList = ['/login', '/social-login','screenbg',  '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee']
+const whiteList = ['/login', '/social-login', 'screenbg', '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
@@ -17,7 +24,12 @@ router.beforeEach((to, from, next) => {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
     /* has token*/
     if (to.path === '/login') {
-      next({ path: '/' })
+      next({
+        path: '/',
+        query: {
+          keyword: 'home',
+        },
+      })
       NProgress.done()
     } else {
       if (store.getters.roles.length === 0) {
@@ -35,7 +47,12 @@ router.beforeEach((to, from, next) => {
         }).catch(err => {
           store.dispatch('LogOut').then(() => {
             Message.error(err)
-            next({ path: '/' })
+            next({
+              path: '/',
+              query: {
+                keyword: 'home',
+              },
+            })
           })
         })
       } else {
diff --git a/src/router/index.js b/src/router/index.js
index 602116c3..08206b4e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -77,12 +77,15 @@ export const constantRoutes = [
 		children: [
 			{
 				path: 'index',
-				component: (resolve) => require(['@/views/home/index'], resolve),
+				component: (resolve) => require(['@/views/productionVisualization/equipmentBoard'], resolve),
 				name: '首页',
 				meta: { title: '首页', icon: 'dashboard', affix: true },
 				hidden: true,
 			},
 		],
+    props: (route) => ({
+      keyword: 'home',
+    })
 	},
 	{
 		path: '/screenbg',
diff --git a/src/views/areavisual/lane/add-or-updata.vue b/src/views/areavisual/lane/add-or-updata.vue
new file mode 100644
index 00000000..eef8a936
--- /dev/null
+++ b/src/views/areavisual/lane/add-or-updata.vue
@@ -0,0 +1,81 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-28 14:38:31
+ * @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="materialCode">
+					<el-input
+						v-model="dataForm.materialCode"
+						clearable
+						placeholder="请输入物料编码" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="物料型号" prop="materialName">
+					<el-input
+						v-model="dataForm.materialName"
+						clearable
+						placeholder="请输入物料型号" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="物料规格" prop="material">
+					<el-input
+						v-model="dataForm.material"
+						clearable
+						placeholder="请输入物料规格" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '@/mixins/basic-add';
+import { createProduct, updateProduct,getProduct } from '@/api/ssdl/product&recipe';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				createURL: createProduct,
+				updateURL: updateProduct,
+				infoURL: getProduct,
+			},
+			dataForm: {
+				id: undefined,
+				material: undefined,
+				materialName: undefined,
+				materialCode: undefined,
+			},
+      typeArr: [],
+			dataRule: {
+				materialCode: [
+					{ required: true, message: '物料编码不能为空', trigger: 'blur' },
+				],
+				materialName: [
+					{ required: true, message: '物料型号不能为空', trigger: 'blur' },
+				],
+				material: [
+					{ required: true, message: '规格不能为空', trigger: 'blur' },
+				],
+			},
+		};
+	},
+	methods: {},
+};
+</script>
diff --git a/src/views/areavisual/lane/changeStatus.vue b/src/views/areavisual/lane/changeStatus.vue
new file mode 100644
index 00000000..361bd89d
--- /dev/null
+++ b/src/views/areavisual/lane/changeStatus.vue
@@ -0,0 +1,62 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-11 14:41:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-14 14:15:47
+ * @Description:
+-->
+<template>
+	<el-switch
+		@change="changeStatus"
+		size="small"
+		v-model="injectData.laneState"
+		:active-value="1"
+		:inactive-value="2"></el-switch>
+</template>
+
+<script>
+import { updateLane } from '@/api/areavisual/lane';
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {
+		changeStatus(val) {
+			const pdata = { ...this.injectData, laneState: val };
+			this.$confirm(
+				`是否确认修改${'巷道  [ ' + this.injectData.laneName + ' ]  '}的状态?`,
+				'更新状态',
+				{
+					confirmButtonText: '确认修改',
+					cancelButtonText: '取消',
+					type: 'warning',
+				}
+			)
+				.then(() => {
+					updateLane(pdata).then((res) => {
+						if (res.code === 0 || res.code === 200) {
+							this.$modal.msgSuccess('修改成功');
+							this.$emit('emitData');
+						} else {
+							this.$modal.msg(res.msg);
+						}
+					});
+				})
+				.catch((res) => {
+					this.$emit('emitData');
+					this.$message({
+						type: 'info',
+						message: '已取消',
+					});
+				});
+		},
+	},
+};
+</script>
diff --git a/src/views/core/base/factory/index.vue b/src/views/areavisual/lane/index.vue
similarity index 51%
rename from src/views/core/base/factory/index.vue
rename to src/views/areavisual/lane/index.vue
index d03a3b4e..0cf20282 100644
--- a/src/views/core/base/factory/index.vue
+++ b/src/views/areavisual/lane/index.vue
@@ -9,14 +9,8 @@
 			: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" />
+			:table-data="tableData"
+			@emitFun="getDataList">
 		</base-table>
 		<pagination
 			:limit.sync="listQuery.pageSize"
@@ -39,35 +33,71 @@
 
 <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';
+import basicPage from '@/mixins/basic-page';
+import { parseTime } from '@/filter/code-filter';
+import { deleteLane, getLanePage } from '@/api/areavisual/lane';
+import changeStatus from './changeStatus.vue';
 
+const lane = [
+	{
+		id: '1',
+		name: 'A巷道',
+	},
+	{
+		id: '2',
+		name: 'B巷道',
+	},
+	{
+		id: '3',
+		name: 'C巷道',
+	},
+	{
+		id: '4',
+		name: 'D巷道',
+	},
+	{
+		id: '5',
+		name: 'E巷道',
+	},
+	{
+		id: '6',
+		name: 'F巷道',
+	},
+];
 const tableProps = [
 	{
-		prop: 'code',
-		label: '工厂编码'
+		prop: 'laneCode',
+		label: '巷道编码',
 	},
 	{
-		prop: 'name',
-		label: '工厂名称'
+		prop: 'laneName',
+		label: '巷道名称',
 	},
 	{
-		prop: 'address',
-		label: '地址'
+		prop: 'lane',
+		label: '巷道',
+		filter: (val) => {
+			return lane.find((i) => i.id == val)
+				? lane.find((i) => i.id == val).name
+				: '-';
+		},
 	},
 	{
-		prop: 'remark',
-		label: '备注'
+		prop: 'laneSort',
+		label: '巷道排序',
+    width:90,
+	},
+	{
+		prop: 'laneState',
+		label: '巷道状态',
+    width:90,
+		subcomponent: changeStatus,
 	},
 	{
 		prop: 'createTime',
 		label: '创建时间',
-		filter: parseTime
+		filter: parseTime,
+		width: 150,
 	},
 ];
 
@@ -76,38 +106,40 @@ export default {
 	data() {
 		return {
 			urlOptions: {
-				getDataListURL: getFactoryPage,
-				deleteURL: deleteFactory,
-				exportURL: exportFactoryExcel,
+				getDataListURL: getLanePage,
+				deleteURL: deleteLane,
 			},
 			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),
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			].filter((v) => v),
 			tableData: [],
 			formConfig: [
 				{
 					type: 'input',
-					label: '工厂编码',
-					placeholder: '工厂编码',
-					param: 'code',
+					label: '名称',
+					placeholder: '名称',
+					param: 'name',
 				},
 				{
 					type: 'input',
-					label: '工厂名称',
-					placeholder: '工厂名称',
-					param: 'name',
+					label: '编码',
+					placeholder: '编码',
+					param: 'code',
+				},
+				{
+					type: 'select',
+					label: '巷道',
+					selectOptions: lane,
+					placeholder: '请选择巷道',
+					param: 'lane',
 				},
 				{
 					type: 'button',
@@ -115,33 +147,6 @@ export default {
 					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',
-				// },
 			],
 		};
 	},
@@ -154,15 +159,16 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name;
-					this.listQuery.code = val.code;
+					this.listQuery.pageSize = 20;
+					this.listQuery.laneName = val.name;
+					this.listQuery.laneCode = val.code;
+					this.listQuery.lane = val.lane;
 					this.getDataList();
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 10,
+						pageSize: 20,
 						pageNo: 1,
 						total: 1,
 					};
diff --git a/src/views/areavisual/lineEdgeLibrary/add-or-updata.vue b/src/views/areavisual/lineEdgeLibrary/add-or-updata.vue
new file mode 100644
index 00000000..2b1c198a
--- /dev/null
+++ b/src/views/areavisual/lineEdgeLibrary/add-or-updata.vue
@@ -0,0 +1,324 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-15 09:16:36
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<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">{{ lineInfo.lineEdgeLibraryCode }}</div>
+				<div class="stat-label">{{ lineInfo.lineEdgeLibraryName }}</div>
+			</div>
+		</div>
+		<el-row :gutter="20">
+			<el-col :span="24">
+				<el-form-item label="物料" prop="materialId">
+					<el-select
+						style="width: 100%"
+						v-model="dataForm.materialId"
+						filterable
+						@change="setMaterial"
+						placeholder="请选择物料">
+						<el-option
+							v-for="item in productArr"
+							:key="item.id"
+							:label="
+								item.materialCode +
+								'-' +
+								item.materialName +
+								'-' +
+								item.material
+							"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="本盘长度" prop="cableLength">
+					<el-input-number
+						v-model="dataForm.cableLength"
+						:min="0"
+						:precision="2"></el-input-number>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="设备" prop="equipmentId">
+					<el-select
+						v-model="dataForm.equipmentId"
+						@change="setEquipment"
+						placeholder="请选择绞体">
+						<el-option
+							v-for="item in options1"
+							:key="item.id"
+							:label="item.equipmentName"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="应用套号" prop="suite">
+					<el-select v-model="dataForm.suite" 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>
+			<span v-if="dataForm.suite == 2">
+				<el-col :span="8">
+					<el-form-item label="选择套号" prop="time">
+						<el-date-picker
+							v-model="dataForm.time"
+							value-format="yyyy-MM-dd"
+							type="date"></el-date-picker>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="" prop="productionLine">
+						<el-select v-model="dataForm.productionLine">
+							<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="8">
+					<el-form-item label="" prop="numb">
+						<el-select v-model="dataForm.numb">
+							<el-option
+								v-for="item in options4"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</span>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '@/mixins/basic-add';
+import { getAllProductPage } from '@/api/ssdl/product&recipe';
+import {
+	QKLineEdgeLibrary,
+	getEquipmentPage,
+} from '@/api/areavisual/lineEdgeLibrary';
+import { parseTime } from '@/filter/code-filter';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				createURL: QKLineEdgeLibrary,
+			},
+			dataForm: {
+				id: undefined,
+				materialId: undefined,
+				materialName: undefined,
+				materialCode: undefined,
+				material: undefined,
+				cableLength: undefined,
+				equipmentId: undefined,
+				equipmentName: undefined,
+				suite: undefined, //是否成套
+				suiteCode: undefined, //套号
+				time: this.parseTime(new Date(), '{y}-{m}-{d}'),
+				productionLine: undefined,
+				numb: undefined,
+			},
+			lineInfo: {},
+			productArr: [],
+			options1: [],
+			options2: [
+				{
+					value: 2,
+					label: '是',
+				},
+				{
+					value: 1,
+					label: '否',
+				},
+			],
+			options3: [
+				{
+					value: '6#',
+					label: '6#',
+				},
+				{
+					value: '7#',
+					label: '7#',
+				},
+				{
+					value: '8#',
+					label: '8#',
+				},
+			],
+			options4: [
+				{
+					value: 0,
+					label: '0',
+				},
+				{
+					value: 1,
+					label: '1',
+				},
+				{
+					value: 2,
+					label: '2',
+				},
+				{
+					value: 3,
+					label: '3',
+				},
+				{
+					value: 4,
+					label: '4',
+				},
+				{
+					value: 5,
+					label: '5',
+				},
+				{
+					value: 6,
+					label: '6',
+				},
+			],
+			dataRule: {
+				materialId: [
+					{ required: true, message: '物料不能为空', trigger: 'change' },
+				],
+				time: [{ required: true, message: '不能为空', trigger: 'change' }],
+				productionLine: [
+					{ required: true, message: '不能为空', trigger: 'change' },
+				],
+				numb: [{ required: true, message: '不能为空', trigger: 'change' }],
+			},
+		};
+	},
+	methods: {
+		showLine(val) {
+			getAllProductPage().then((res) => {
+				this.productArr = res.data;
+			});
+			getEquipmentPage({ pageNo: 1, pageSize: 100, equipmentType: 2 }).then(
+				(res) => {
+					this.options1 = res.data.list;
+				}
+			);
+			this.lineInfo = { ...val };
+		},
+		setMaterial() {
+			const data = this.productArr.find(
+				(i) => i.id === this.dataForm.materialId
+			);
+			this.dataForm.materialName = data.materialName;
+			this.dataForm.material = data.material;
+			this.dataForm.materialCode = data.materialCode;
+		},
+		setEquipment() {
+			const data = this.options1.find(
+				(i) => i.id === this.dataForm.equipmentId
+			);
+			this.dataForm.equipmentName = data.equipmentName;
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				if (this.dataForm.suite == 2) {
+					this.dataForm.suiteCode =
+						this.dataForm.time +
+						'-' +
+						this.dataForm.productionLine +
+						'-' +
+						this.dataForm.numb;
+				}
+				QKLineEdgeLibrary({
+					...this.lineInfo,
+					...this.dataForm,
+					lineEdgeLibraryState: 1,
+					id: this.lineInfo.id,
+				}).then((response) => {
+					this.$modal.msgSuccess('操作成功');
+					this.visible = false;
+					this.$emit('refreshDataList');
+				});
+				return;
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.stat-card {
+	display: flex;
+	align-items: center;
+	padding: 10px;
+	background: white;
+	border-radius: 12px;
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+	transition: all 0.3s ease;
+	border-left: 4px solid;
+	border-color: #1a56db;
+	margin-bottom: 30px;
+}
+
+/* .stat-card:hover {
+	transform: translateY(-5px);
+	box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
+} */
+.stat-title {
+	margin: 0 10px;
+	color: #0051ff;
+	font-size: 20px;
+}
+.stat-icon {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 60px;
+	height: 60px;
+	border-radius: 12px;
+	margin-right: 15px;
+	background: linear-gradient(to right, #1a56db, #0d47a1);
+}
+
+.stat-content {
+	display: flex;
+	flex-direction: column;
+}
+
+.stat-value {
+	font-size: 28px;
+	font-weight: 700;
+	line-height: 1.2;
+	color: #1a56db;
+}
+
+.stat-label {
+	font-size: 14px;
+	color: #64748b;
+}
+</style>
diff --git a/src/views/areavisual/lineEdgeLibrary/index.vue b/src/views/areavisual/lineEdgeLibrary/index.vue
new file mode 100644
index 00000000..50059d38
--- /dev/null
+++ b/src/views/areavisual/lineEdgeLibrary/index.vue
@@ -0,0 +1,318 @@
+<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="getDataList">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="110"
+				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
+			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 {
+	deleteLineEdgeLibrary,
+	getLineEdgeLibraryPage,
+	QKLineEdgeLibrary,
+} from '@/api/areavisual/lineEdgeLibrary';
+
+const laneRow = [
+	{
+		id: '1',
+		name: '第一排',
+	},
+	{
+		id: '2',
+		name: '第二排',
+	},
+	{
+		id: '3',
+		name: '第三排',
+	},
+	{
+		id: '4',
+		name: '第四排',
+	},
+	{
+		id: '5',
+		name: '第五排',
+	},
+	{
+		id: '6',
+		name: '第六排',
+	},
+];
+const tableProps = [
+	{
+		prop: 'lineEdgeLibraryCode',
+		label: '线边库编码',
+	},
+	{
+		prop: 'lineEdgeLibraryName',
+		label: '线边库名称',
+	},
+	{
+		prop: 'agvGroundCode',
+		label: 'agv码',
+	},
+	{
+		prop: 'lineEdgeLibraryState',
+		label: '线边库状态',
+		width: 90,
+		filter: (val) => {
+			return val ? '满位' : '空闲';
+		},
+	},
+	{
+		prop: 'usableState',
+		label: '是否可用',
+		width: 90,
+		filter: (val) => {
+			return ['', '可用', '不可用', '锁定'][val];
+		},
+	},
+	{
+		prop: 'trayType',
+		label: '托盘类型',
+		width: 90,
+		filter: (val) => {
+			return val ? '笼式' : '盘式';
+		},
+	},
+	{
+		prop: 'productionLine',
+		label: '产线',
+	},
+	{
+		prop: 'equipmentName',
+		label: '设备',
+	},
+	{
+		prop: 'suiteCode',
+		label: '套号',
+	},
+	{
+		prop: 'laneRow',
+		label: '巷道排',
+		filter: (val) => {
+			return laneRow.find((i) => i.id == val)
+				? laneRow.find((i) => i.id == val).name
+				: '-';
+		},
+	},
+	{
+		prop: 'materialCode',
+		label: '物料',
+	},
+	{
+		prop: 'batch',
+		label: '批次',
+	},
+	{
+		prop: 'cableLength',
+		label: '线缆长度',
+	},
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime,
+		width: 150,
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getLineEdgeLibraryPage,
+				deleteURL: deleteLineEdgeLibrary,
+			},
+			tableProps,
+			tableData: [],
+			tableBtn: [
+				{
+					type: 'clear',
+					btnName: '清空',
+				},
+				{
+					type: 'add',
+					btnName: '添加',
+				},
+			].filter((v) => v),
+			formConfig: [
+				{
+					type: 'input',
+					label: '线边库名称',
+					placeholder: '线边库名称',
+					param: 'name',
+				},
+				{
+					type: 'input',
+					label: '线边库编码',
+					placeholder: '线边库编码',
+					param: 'code',
+				},
+				{
+					type: 'select',
+					label: '巷道排',
+					selectOptions: laneRow,
+					placeholder: '请选择巷道排',
+					param: 'laneRow',
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: '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 = 20;
+					this.listQuery.lineEdgeLibraryName = val.name;
+					this.listQuery.lineEdgeLibraryCode = val.code;
+					this.listQuery.laneRow = val.laneRow;
+					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);
+			}
+		},
+		otherMethods(val) {
+			if (val.type == 'clear') {
+				if (val.data.usableState == 3) {
+					this.$confirm(
+						`当前库位为锁定状态，代表该库位有未完成的任务关联，是否确认清空${
+							'线边库名称为  ' + val.data.lineEdgeLibraryName + '  '
+						}的数据项?`,
+						'锁定库位清空提示',
+						{
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							type: 'warning',
+						}
+					)
+						.then(() => {
+							QKLineEdgeLibrary({...val.data,lineEdgeLibraryState:0,usableState:1 }).then(({ data }) => {
+								this.$message({
+									message: data,
+									type: 'success',
+									duration: 1500,
+									onClose: () => {
+										this.getDataList();
+									},
+								});
+							});
+						})
+						.catch(() => {});
+				} else {
+					QKLineEdgeLibrary({...val.data,lineEdgeLibraryState:0,usableState:1 }).then(({ data }) => {
+						this.$message({
+							message: data,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList();
+							},
+						});
+					});
+				}
+			} else if (val.type === 'add') {
+				this.addOrEditTitle = '添加货物';
+				this.addOrUpdateVisible = true;
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init();
+					this.$refs.addOrUpdate.showLine(val.data);
+				});
+			}
+		},
+	},
+};
+</script>
diff --git a/src/views/areavisual/overview/components/add-or-updata.vue b/src/views/areavisual/overview/components/add-or-updata.vue
new file mode 100644
index 00000000..231eab39
--- /dev/null
+++ b/src/views/areavisual/overview/components/add-or-updata.vue
@@ -0,0 +1,326 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-02-03 13:30:54
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<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">{{ lineInfo.lineEdgeLibraryCode }}</div>
+				<div class="stat-label">{{ lineInfo.lineEdgeLibraryName }}</div>
+			</div>
+		</div>
+		<el-row :gutter="20">
+			<el-col :span="24">
+				<el-form-item label="物料" prop="materialId">
+					<el-select
+						style="width: 100%"
+						v-model="dataForm.materialId"
+						filterable
+						@change="setMaterial"
+						placeholder="请选择物料">
+						<el-option
+							v-for="item in productArr"
+							:key="item.id"
+							:label="
+								item.materialCode +
+								'-' +
+								item.materialName +
+								'-' +
+								item.material
+							"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="本盘长度" prop="cableLength">
+					<el-input-number
+						v-model="dataForm.cableLength"
+						:min="0"
+						:precision="2"></el-input-number>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="设备" prop="equipmentId">
+					<el-select
+						v-model="dataForm.equipmentId"
+						@change="setEquipment"
+						placeholder="请选择绞体">
+						<el-option
+							v-for="item in options1"
+							:key="item.id"
+							:label="item.equipmentName"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="应用套号" prop="suite">
+					<el-select v-model="dataForm.suite" 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>
+			<span v-if="dataForm.suite == 2">
+				<el-col :span="8">
+					<el-form-item label="选择套号" prop="time">
+						<el-date-picker
+							v-model="dataForm.time"
+							value-format="yyyy-MM-dd"
+							type="date"></el-date-picker>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="" prop="productionLine">
+						<el-select v-model="dataForm.productionLine">
+							<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="8">
+					<el-form-item label="" prop="numb">
+						<el-select v-model="dataForm.numb">
+							<el-option
+								v-for="item in options4"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</span>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '@/mixins/basic-add';
+import { getAllProductPage } from '@/api/ssdl/product&recipe';
+import {
+	QKLineEdgeLibrary,
+	getEquipmentPage,
+} from '@/api/areavisual/lineEdgeLibrary';
+import { parseTime } from '@/filter/code-filter';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				createURL: QKLineEdgeLibrary,
+			},
+			dataForm: {
+				id: undefined,
+				materialId: undefined,
+				materialName: undefined,
+				materialCode: undefined,
+				material: undefined,
+				cableLength: undefined,
+				equipmentId: undefined,
+				equipmentName: undefined,
+				suite: undefined, //是否成套
+				suiteCode: undefined, //套号
+				time: this.parseTime(new Date(), '{y}-{m}-{d}'),
+				productionLine: undefined,
+				numb: undefined,
+			},
+			lineInfo: {},
+			productArr: [],
+			options1: [],
+			options2: [
+				{
+					value: 2,
+					label: '是',
+				},
+				{
+					value: 1,
+					label: '否',
+				},
+			],
+			options3: [
+				{
+					value: '6#',
+					label: '6#',
+				},
+				{
+					value: '7#',
+					label: '7#',
+				},
+				{
+					value: '8#',
+					label: '8#',
+				},
+			],
+			options4: [
+				{
+					value: 0,
+					label: '0',
+				},
+				{
+					value: 1,
+					label: '1',
+				},
+				{
+					value: 2,
+					label: '2',
+				},
+				{
+					value: 3,
+					label: '3',
+				},
+				{
+					value: 4,
+					label: '4',
+				},
+				{
+					value: 5,
+					label: '5',
+				},
+				{
+					value: 6,
+					label: '6',
+				},
+			],
+			dataRule: {
+				materialId: [
+					{ required: true, message: '物料不能为空', trigger: 'change' },
+				],
+				time: [{ required: true, message: '不能为空', trigger: 'change' }],
+				productionLine: [
+					{ required: true, message: '不能为空', trigger: 'change' },
+				],
+				numb: [{ required: true, message: '不能为空', trigger: 'change' }],
+				equipmentId: [{ required: true, message: '不能为空', trigger: 'change' }],
+				suite: [{ required: true, message: '不能为空', trigger: 'change' }],
+			},
+		};
+	},
+	methods: {
+		showLine(val) {
+			getAllProductPage().then((res) => {
+				this.productArr = res.data;
+			});
+			getEquipmentPage({ pageNo: 1, pageSize: 100, equipmentType: 2 }).then(
+				(res) => {
+					this.options1 = res.data.list;
+				}
+			);
+			this.lineInfo = { ...val };
+		},
+		setMaterial() {
+			const data = this.productArr.find(
+				(i) => i.id === this.dataForm.materialId
+			);
+			this.dataForm.materialName = data.materialName;
+			this.dataForm.material = data.material;
+			this.dataForm.materialCode = data.materialCode;
+		},
+		setEquipment() {
+			const data = this.options1.find(
+				(i) => i.id === this.dataForm.equipmentId
+			);
+			this.dataForm.equipmentName = data.equipmentName;
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				if (this.dataForm.suite == 2) {
+					this.dataForm.suiteCode =
+						this.dataForm.time +
+						'-' +
+						this.dataForm.productionLine +
+						'-' +
+						this.dataForm.numb;
+				}
+				QKLineEdgeLibrary({
+					...this.lineInfo,
+					...this.dataForm,
+					lineEdgeLibraryState: 1,
+					id: this.lineInfo.id,
+				}).then((response) => {
+					this.$modal.msgSuccess('操作成功');
+					this.visible = false;
+					this.$emit('refreshDataList');
+				});
+				return;
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.stat-card {
+	display: flex;
+	align-items: center;
+	padding: 10px;
+	background: white;
+	border-radius: 12px;
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+	transition: all 0.3s ease;
+	border-left: 4px solid;
+	border-color: #1a56db;
+	margin-bottom: 30px;
+}
+
+/* .stat-card:hover {
+	transform: translateY(-5px);
+	box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
+} */
+.stat-title {
+	margin: 0 10px;
+	color: #0051ff;
+	font-size: 20px;
+}
+.stat-icon {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 60px;
+	height: 60px;
+	border-radius: 12px;
+	margin-right: 15px;
+	background: linear-gradient(to right, #1a56db, #0d47a1);
+}
+
+.stat-content {
+	display: flex;
+	flex-direction: column;
+}
+
+.stat-value {
+	font-size: 28px;
+	font-weight: 700;
+	line-height: 1.2;
+	color: #1a56db;
+}
+
+.stat-label {
+	font-size: 14px;
+	color: #64748b;
+}
+</style>
diff --git a/src/views/core/monitoring/data/BarChart.vue b/src/views/areavisual/overview/components/ringChart.vue
similarity index 51%
rename from src/views/core/monitoring/data/BarChart.vue
rename to src/views/areavisual/overview/components/ringChart.vue
index c7eab889..fefeddae 100644
--- a/src/views/core/monitoring/data/BarChart.vue
+++ b/src/views/areavisual/overview/components/ringChart.vue
@@ -1,169 +1,125 @@
-<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>
+<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',
+		},
+		ringData: {
+			type: Object,
+			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: ['#33B36B', '#3A8DFF', '#F59A23'],
+				tooltip: {
+					trigger: 'axis',
+					axisPointer: {
+						type: 'cross',
+						crossStyle: {
+							color: '#999',
+						},
+					},
+				},
+				legend: {
+					data: ['当前满位', '当前空位', '在途'],
+				},
+				grid: {
+					containLabel: true,
+				},
+				series: [
+					{
+						// name: '投入',
+						type: 'pie',
+						radius: '50%',
+						data: [
+							{
+								name: '当前满位',
+								value: this.ringData.occupiedQuantity
+							},
+							{
+								name: '当前空位',
+								value: this.ringData.idleQuantity
+							},
+							{
+								name: '在途',
+								value: this.ringData.transitQuantity
+							},
+						],
+						emphasis: {
+							itemStyle: {
+								shadowBlur: 10,
+								shadowOffsetX: 0,
+								shadowColor: 'rgba(0, 0, 0, 0.5)'
+							}
+						}
+					}
+				],
+			});
+		},
+	},
+};
+</script>
diff --git a/src/views/areavisual/overview/index.vue b/src/views/areavisual/overview/index.vue
new file mode 100644
index 00000000..cc35c458
--- /dev/null
+++ b/src/views/areavisual/overview/index.vue
@@ -0,0 +1,687 @@
+<template>
+	<div class="app-container">
+		<el-row class="overview-container">
+			<el-col :span="4" class="overview-container-left">
+				<el-row style="font-size: 18px; font-weight: bold; line-height: 36px">
+					库区选择
+				</el-row>
+				<el-input
+					v-model="areaSearchForm.regionName"
+					placeholder="库区名称"
+					@blur="getArea"
+					clearable />
+				<el-tree
+					:data="areaList"
+					:node-key="'id'"
+					:props="{ label: 'regionName' }"
+					@node-click="nodeClick" />
+			</el-col>
+			<el-col
+				:span="16"
+				v-if="changeType === 0"
+				class="overview-container-main">
+				<el-row>
+					<el-col
+						:span="8"
+						class="allarea-box"
+						v-for="item in allAreaList"
+						:key="item.id">
+						<div class="areainfo-box">
+							<div class="areainfo-box-header">
+								{{ item.regionName }}
+							</div>
+							<div class="areainfo-box-line">
+								<div
+									class="areainfo-box-line-item"
+									:style="{
+										width: `${(
+											(item.occupiedQuantity /
+												(item.totalInventory + item.transitQuantity)) *
+											100
+										).toFixed(2)}%`,
+										backgroundColor: '#33B36B',
+									}"></div>
+								<div
+									class="areainfo-box-line-item"
+									:style="{
+										width: `${(
+											(item.idleQuantity /
+												(item.totalInventory + item.transitQuantity)) *
+											100
+										).toFixed(2)}%`,
+										backgroundColor: '#3A8DFF',
+									}"></div>
+								<div
+									class="areainfo-box-line-item"
+									:style="{
+										width: `${(
+											(item.transitQuantity /
+												(item.totalInventory + item.transitQuantity)) *
+											100
+										).toFixed(2)}%`,
+										backgroundColor: '#F59A23',
+									}"></div>
+							</div>
+							<el-row class="areainfo-box-info">
+								<el-col class="areainfo-box-info-item" :span="6">
+									<p class="areainfo-box-info-item-count">
+										{{ item.totalInventory }}
+									</p>
+									<p class="areainfo-box-info-item-title">库位总数</p>
+								</el-col>
+								<el-col class="areainfo-box-info-item" :span="6">
+									<p
+										class="areainfo-box-info-item-count"
+										style="color: #33b36b">
+										{{ item.occupiedQuantity }}
+									</p>
+									<p class="areainfo-box-info-item-title">占</p>
+								</el-col>
+								<el-col class="areainfo-box-info-item" :span="6">
+									<p
+										class="areainfo-box-info-item-count"
+										style="color: #3a8dff">
+										{{ item.idleQuantity }}
+									</p>
+									<p class="areainfo-box-info-item-title">空</p>
+								</el-col>
+								<el-col class="areainfo-box-info-item" :span="6">
+									<p
+										class="areainfo-box-info-item-count"
+										style="color: #f59a23">
+										{{ item.transitQuantity }}
+									</p>
+									<p class="areainfo-box-info-item-title">在途</p>
+								</el-col>
+							</el-row>
+						</div>
+					</el-col>
+				</el-row>
+			</el-col>
+			<el-col
+				:span="4"
+				v-if="changeType === 0"
+				class="overview-container-right">
+				<el-tabs v-model="activeName" @tab-click="handleClickRight">
+					<el-tab-pane label="概览" name="first">
+						<el-row class="overview-container-right-alloverview">
+							<el-col
+								class="overview-container-right-alloverview-item"
+								:span="8">
+								<p class="overview-container-right-alloverview-item-count">
+									{{ allAreaInfo.totalInventory }}
+								</p>
+								<p class="overview-container-right-alloverview-item-title">
+									库位总数
+								</p>
+							</el-col>
+							<el-col
+								class="overview-container-right-alloverview-item"
+								:span="8">
+								<p class="overview-container-right-alloverview-item-count">
+									{{ allAreaInfo.occupiedQuantity }}
+								</p>
+								<p class="overview-container-right-alloverview-item-title">
+									当前满位
+								</p>
+							</el-col>
+							<el-col
+								class="overview-container-right-alloverview-item"
+								:span="8">
+								<p class="overview-container-right-alloverview-item-count">
+									{{ allAreaInfo.idleQuantity }}
+								</p>
+								<p class="overview-container-right-alloverview-item-title">
+									当前空位
+								</p>
+							</el-col>
+							<el-col
+								class="overview-container-right-alloverview-item"
+								:span="8">
+								<p class="overview-container-right-alloverview-item-count">
+									{{ allAreaInfo.transitQuantity }}
+								</p>
+								<p class="overview-container-right-alloverview-item-title">
+									在途
+								</p>
+							</el-col>
+						</el-row>
+						<ringChart :ring-data="allAreaInfo" ref="ringChart" />
+					</el-tab-pane>
+					<el-tab-pane label="在途任务" name="second">在途任务</el-tab-pane>
+				</el-tabs>
+			</el-col>
+			<el-col
+				: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>
+				<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">
+								<div v-if="sitem.empty" class="area-div-empty" />
+								<div v-else class="area-div" :title="sitem.lineEdgeLibraryName">
+									<el-popover
+										placement="top-start"
+										:title="sitem.lineEdgeLibraryCode"
+										width="200"
+										trigger="hover">
+										<div class="point" />
+										<span style="font-weight: 600">名称:</span>
+										{{ sitem.lineEdgeLibraryName }}
+										<br />
+										<div class="point" />
+										<span style="font-weight: 600">状态:</span>
+										{{
+											sitem.usableState == 3
+												? '锁定'
+												: sitem.usableState == 2
+												? '不可用'
+												: sitem.lineEdgeLibraryState == 1
+												? '满位'
+												: '空闲'
+										}}
+										<br />
+										<span
+											v-if="sitem.usableState == 3 ||
+												(sitem.usableState == 1 &&
+												sitem.lineEdgeLibraryState == 1)
+											">
+											<span style="font-weight: 600">物料:</span>
+											{{ sitem.materialCode || '' }}
+											<br />
+											<span style="font-weight: 600">设备:</span>
+											{{ sitem.equipmentName || '' }}
+											<br />
+											<span style="font-weight: 600">套号:</span>
+											{{ sitem.suiteCode || '' }}
+											<br />
+										</span>
+										<el-button type="text" @click="clearLine(sitem)">
+											清空
+										</el-button>
+										<el-button type="text" @click="addLine(sitem)">
+											添加
+										</el-button>
+										<div
+											class="area-icon"
+											:style="{
+												backgroundColor:
+													sitem.usableState == 3
+														? '#E6A23C'
+														: sitem.usableState == 2
+														? 'gray'
+														: sitem.lineEdgeLibraryState == 1
+														? '#67C23A'
+														: '',
+											}"
+											slot="reference">
+											<i
+												:class="
+													sitem.usableState == 3
+														? 'el-icon-lock'
+														: 'el-icon-s-grid'
+												"
+												style="color: #fff"></i>
+										</div>
+									</el-popover>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</el-col>
+		</el-row>
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			destroy-on-close
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+// import basicPage from '@/mixins/basic-page';
+import ringChart from './components/ringChart.vue';
+import AddOrUpdate from './components/add-or-updata';
+import basicPage from '@/mixins/basic-page';
+import {
+	getAreaList,
+	postAllAreaInfo,
+	postAllAreaOverview,
+	postAreaInfo,
+} from '@/api/areavisual/overview';
+import { QKLineEdgeLibrary,AllQKLineEdgeLibrary } from '@/api/areavisual/lineEdgeLibrary';
+
+export default {
+	name: 'overview',
+	mixins: [basicPage],
+	data() {
+		return {
+			areaList: [
+				{
+					id: 0,
+					regionName: '全部库区',
+				},
+			],
+			areaSearchForm: {
+				pageNo: 1,
+				pageSize: 100,
+				regionName: '',
+			},
+			changeType: 0,
+			allAreaList: [],
+			allAreaInfo: {
+				totalInventory: 0,
+				occupiedQuantity: 0,
+				idleQuantity: 0,
+				transitQuantity: 0,
+			},
+			areaInfo: {},
+			activeName: 'first',
+			getAreaInfoInfo: {},
+		};
+	},
+	components: {
+		ringChart,
+		AddOrUpdate,
+	},
+	async created() {
+		this.getArea();
+		this.getAllAreaInfo();
+		this.getAllAreaOverview();
+	},
+	watch: {
+		activeName: (val) => {
+			if (val === 'first') {
+				this.getAllAreaOverview();
+			} else if (val === 'second') {
+				this.getNowTaskList();
+			}
+		},
+	},
+	methods: {
+		// 获取库区列表
+		async getArea() {
+			const res = await getAreaList(this.areaSearchForm);
+			if (res.code === 0 && res.data) {
+				(this.areaList = [
+					{
+						id: 0,
+						regionName: '全部库区',
+					},
+				]),
+					this.areaList.push(...res.data.list);
+			}
+		},
+		// 库区选择
+		nodeClick(data, node, components) {
+			if (data.id === 0) {
+				this.changeType = 0;
+				this.activeName = 'first';
+				this.getAllAreaInfo();
+			} else {
+				this.getAreaInfoInfo = data; //把库区存下，方便刷新
+				this.changeType = 1;
+				this.getAreaInfo(data.id);
+			}
+		},
+		// 获取全部库区概览信息
+		async getAllAreaInfo() {
+			const res = await postAllAreaInfo([]);
+			console.log(res);
+			if (res.code === 0 && res.data) {
+				this.allAreaList = res.data;
+			}
+		},
+		// 获取库区概览
+		async getAllAreaOverview() {
+			const res = await postAllAreaOverview([]);
+			console.log(res);
+			if (res.code === 0 && res.data) {
+				this.allAreaInfo = res.data;
+				this.$refs.ringChart.initChart();
+			}
+		},
+		// 获取在途任务
+		async getNowTaskList() {},
+		// 获取单库区信息
+		async getAreaInfo(id) {
+			const res = await postAreaInfo({ id });
+			if (res.code === 0 && res.data) {
+				// 按巷道号分组
+				this.areaInfo = res.data.reduce((result, item) => {
+					// 提取巷道号
+					const laneNumber = item.lineEdgeLibraryCode.substring(3, 5) + ' 巷道';
+
+					// 如果该巷道还没有分组，创建一个空数组
+					if (!result[laneNumber]) {
+						result[laneNumber] = [];
+					}
+
+					// 将当前项添加到对应巷道的数组中
+					result[laneNumber].push(item);
+
+					return result;
+				}, {});
+				Object.keys(this.areaInfo).forEach((key) => {
+					const arr = this.areaInfo[key];
+					let emptyNum = 0;
+					let insetEmpty = [];
+					arr.forEach((item, index) => {
+						if (
+							!item.empty &&
+							item.lineEdgeLibraryCode.substring(5, 7) !=
+								Math.floor(index / 2) + 1 + emptyNum &&
+							item.lineEdgeLibraryCode[item.lineEdgeLibraryCode.length - 1] ==
+								'L'
+						) {
+							let num =
+								Number(item.lineEdgeLibraryCode.substring(5, 7)) -
+								(Math.floor(index / 2) + 1 + emptyNum);
+							insetEmpty.push({
+								index,
+								num,
+							});
+							emptyNum += num;
+						}
+					});
+					insetEmpty.forEach((item) => {
+						const arrEmpty = Array.from({ length: item.num * 2 }, () => ({
+							empty: true,
+						}));
+						arr.splice(item.index, 0, ...arrEmpty);
+					});
+				});
+			}
+		},
+		getDataList() {},
+		// 全部库区右侧分页点击
+		handleClickRight(tab, event) {
+			console.log(tab, event);
+		},
+		clearLine(val) {
+			if (val.usableState == 3) {
+				this.$confirm(
+					`当前库位为锁定状态，代表该库位有未完成的任务关联，是否确认清空${
+						'线边库名称为  ' + val.lineEdgeLibraryName + '  '
+					}的数据项?`,
+					'锁定库位清空提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						QKLineEdgeLibrary({
+							...val,
+							lineEdgeLibraryState: 0,
+							usableState: 1,
+						}).then(({ data }) => {
+							this.$message({
+								message: data,
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getAreaInfo(this.getAreaInfoInfo.id);
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				QKLineEdgeLibrary({
+					...val,
+					lineEdgeLibraryState: 0,
+					usableState: 1,
+				}).then(({ data }) => {
+					this.$message({
+						message: data,
+						type: 'success',
+						duration: 1500,
+						onClose: () => {
+							this.getAreaInfo(this.getAreaInfoInfo.id);
+						},
+					});
+				});
+			}
+		},
+		addLine(val) {
+			this.addOrEditTitle = '添加货物';
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init();
+				this.$refs.addOrUpdate.showLine(val);
+			});
+		},
+		// dialog的父组件方法this.$emit("refreshDataList");
+		successSubmit() {
+			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>
+
+<style lang="scss" scoped>
+.overview-container {
+	max-height: calc(100vh - 120px - 8px);
+	overflow: scroll;
+	.overview-container-left {
+		padding-right: 12px;
+	}
+	.overview-container-main {
+		.allarea-box {
+			padding: 10px;
+			.areainfo-box {
+				border: 1px solid #bbb;
+				border-radius: 5px;
+				padding: 10px;
+				.areainfo-box-header {
+					font-size: 16px;
+					font-weight: bold;
+					white-space: nowrap; /* 禁止换行 */
+					overflow: hidden; /* 隐藏溢出内容 */
+					text-overflow: ellipsis; /* 溢出部分显示省略号 */
+				}
+				.areainfo-box-line {
+					width: 100%;
+					.areainfo-box-line-item {
+						height: 5px;
+						display: inline-block;
+					}
+				}
+				.areainfo-box-info {
+					.areainfo-box-info-item {
+						text-align: center;
+						font-size: 12px;
+						.areainfo-box-info-item-count {
+							font-weight: bold;
+							font-size: 14px;
+						}
+					}
+				}
+			}
+		}
+	}
+	.overview-container-right {
+		.overview-container-right-alloverview {
+			.overview-container-right-alloverview-item {
+				text-align: center;
+				.overview-container-right-alloverview-item-count {
+					font-size: 14px;
+					font-weight: bold;
+				}
+			}
+		}
+	}
+}
+</style>
+
+<style lang="scss">
+.el-tree-node__content {
+	height: 40px;
+	line-height: 40px;
+}
+.el-tree-node__label {
+	display: block;
+	width: calc(100% - 24px);
+	text-align: center;
+	white-space: nowrap; /* 禁止换行 */
+	overflow: hidden; /* 隐藏溢出内容 */
+	text-overflow: ellipsis; /* 溢出部分显示省略号 */
+}
+</style>
+
+<style scoped>
+.area-body {
+	margin-top: 10px;
+	margin-left: 10px;
+	overflow-x: auto;
+	display: flex;
+}
+.potTitle {
+	width: 190px;
+	background-color: rgb(169, 235, 249);
+	border-radius: 3px;
+	margin-right: 5px;
+	text-align: center;
+	color: #000000;
+	letter-spacing: 1px;
+	margin-bottom: 10px;
+	font-size: 16px;
+  padding: 5px;
+}
+.potList {
+	width: 190px;
+	display: grid;
+	grid-template-columns: 90px 90px;
+	gap: 8px;
+}
+.area-div {
+	padding: 10px;
+	background: white;
+	border-radius: 12px;
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+	transition: all 0.3s ease;
+	border: 4px solid #1a56db;
+	margin-bottom: 30px;
+}
+.area-div-empty {
+	background: white;
+	width: 90px;
+	height: 88px;
+	margin-bottom: 30px;
+}
+.point {
+	width: 5px;
+	height: 5px;
+	border-radius: 50%;
+	background-color: #409eff;
+	float: left;
+	margin-top: 7px;
+	margin-right: 5px;
+}
+.area-icon {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin: auto;
+	width: 60px;
+	height: 60px;
+	border-radius: 12px;
+}
+</style>
+
+<style scoped>
+.stat-card {
+	margin-top: 10px;
+	display: flex;
+	align-items: center;
+	padding: 10px;
+	background: white;
+	border-radius: 12px;
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+	transition: all 0.3s ease;
+	border-left: 4px solid;
+	border-color: #1a56db;
+	margin-bottom: 30px;
+}
+
+/* .stat-card:hover {
+	transform: translateY(-5px);
+	box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
+} */
+.stat-title {
+	margin: 0 10px;
+	color: #0051ff;
+	font-size: 20px;
+}
+.stat-icon {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 60px;
+	height: 60px;
+	border-radius: 12px;
+	margin-right: 15px;
+	background: linear-gradient(to right, #1a56db, #0d47a1);
+}
+
+.stat-content {
+	display: flex;
+	flex-direction: column;
+}
+
+.stat-value {
+	font-size: 28px;
+	font-weight: 700;
+	line-height: 1.2;
+	color: #1a56db;
+}
+
+.stat-label {
+	font-size: 14px;
+	color: #64748b;
+}
+</style>
diff --git a/src/views/core/base/equipment/components/EquipmentDrawer.vue b/src/views/areavisual/record/components/RecordDrawer.vue
similarity index 95%
rename from src/views/core/base/equipment/components/EquipmentDrawer.vue
rename to src/views/areavisual/record/components/RecordDrawer.vue
index 3c064771..4b58689b 100644
--- a/src/views/core/base/equipment/components/EquipmentDrawer.vue
+++ b/src/views/areavisual/record/components/RecordDrawer.vue
@@ -34,12 +34,12 @@
 						v-if="section.key == 'base'"
 						style="margin-bottom: 32px">
 						<el-skeleton v-if="!showForm" animated />
-						<EquipmentInfoForm
+						<!-- <EquipmentInfoForm
 							key="drawer-dialog-form"
 							v-if="showForm"
 							:disabled="mode.includes('detail')"
 							:sync-filelist="syncFileListFlag"
-							v-model="form" />
+							v-model="form" /> -->
 					</div>
 
 					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
@@ -86,30 +86,10 @@
 					</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',
@@ -138,7 +118,7 @@ const SmallTitle = {
 };
 
 export default {
-	components: { SmallTitle, DialogForm, EquipmentInfoForm },
+	components: { SmallTitle },
 	props: ['sections', 'mode', 'dataId'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {
diff --git a/src/views/areavisual/record/index.vue b/src/views/areavisual/record/index.vue
new file mode 100644
index 00000000..8cde8613
--- /dev/null
+++ b/src/views/areavisual/record/index.vue
@@ -0,0 +1,277 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+            isFold
+			@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" />
+
+		<!-- 设备 详情 - 编辑 -->
+		<RecordDrawer
+			v-if="open"
+			ref="drawer"
+			:mode="editMode"
+			@update-mode="editMode = $event"
+			:data-id="form.id"
+			@refreshDataList="getList"
+			@cancel="cancelEdit"
+			@destroy="cancelEdit" />
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import RecordDrawer from './components/RecordDrawer';
+import { getRecordPage, getLaneList } from '@/api/areavisual/record';
+
+export default {
+	name: 'Equipment',
+	components: {
+		RecordDrawer,
+	},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['name', 'code'],
+            // this.$auth.hasPermi(`base:equipment:update`)
+			tableBtn: [
+				{
+                    type: 'detail',
+                    btnName: '详情'
+				}
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'recordCode',
+					label: '出/入库单编号',
+					fixed: true,
+					width: 180,
+					// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+					// showOverflowtooltip: true,
+				},
+				{
+					prop: 'type',
+					label: '业务类型',
+					filter: (val) => val === 1 ? '出库' : '入库',
+				},
+				{
+                    width: 180,
+                    prop: 'recordTime',
+                    label: '出/入库时间',
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss')
+                },
+				{ prop: 'recordArea', label: '出/入库库区' },
+				{ prop: 'recordLane', label: '出/入库巷道' },
+				{ prop: 'recordRegion', label: '出/入库库位号' },
+				{ prop: 'target', label: '搬运对象' },
+				{ prop: 'productName', label: '产品名称' },
+				{ prop: 'specification', label: '型号规格' },
+				{ prop: 'recordMan', label: '出/入库人' },
+				{ prop: 'remark', label: '备注' }
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '关键字',
+					placeholder: '请输入出/入库编码、产品名称、规格型号、库位号',
+					param: 'query',
+                    width: 350
+				},
+				{
+					type: 'select',
+					label: '业务类型',
+					selectOptions: [
+                        {
+                            id: '1',
+                            name:'出库'
+                        },
+                        {
+                            id: '2',
+                            name:'入库'
+                        },
+                    ],
+					placeholder: '请选择业务类型',
+					param: 'type',
+				},
+				{
+					type: 'select',
+					label: '出/入库巷道',
+					selectOptions: [],
+					placeholder: '请选择出/入库巷道',
+					param: 'recordLane',
+				},
+				{
+					type: 'select',
+					label: '来源',
+					selectOptions: [
+                        {
+                            id: '1',
+                            name:'WMS'
+                        },
+                        {
+                            id: '2',
+                            name:'MES'
+                        },
+                    ],
+					placeholder: '请选择来源',
+					param: 'source',
+				},
+				{
+					type: 'select',
+					label: '出/入库人',
+					selectOptions: [],
+					placeholder: '请选择出/入库人',
+					param: 'recordMan',
+				},
+				{
+					type: 'datePicker',
+					label: '出/入库时间',
+					placeholder: '请选择出/入库时间',
+					param: 'recordTime',
+                    dateType: 'datetimerange',
+                    rangeSeparator: '至'
+				},
+				{
+					type: 'select',
+					label: '载具类型',
+					selectOptions: [
+                        {
+                            id: '1',
+                            name:'AGV'
+                        },
+                        {
+                            id: '2',
+                            name:'人工叉车'
+                        },
+                    ],
+					placeholder: '请选择载具类型',
+					param: 'vehicleType',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'button',
+					btnName: '重置',
+					name: 'reset',
+					color: 'info',
+				}
+			],
+			editVisible: false,
+			editMode: 'detail', // 'edit', 'detail'
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 20,
+                query: '',
+				type: '',
+                source: '',
+				recordLane: '',
+                recordMan: '',
+                recordTime: '',
+                vehicleType: ''
+			},
+            form: {}
+		};
+	},
+	created() {
+        this.getLane()
+		this.getList();
+	},
+	computed: {},
+	methods: {
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			getRecordPage(this.queryParams).then((response) => {
+                console.log(response)
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+        async getLane() {
+            const res = await getLaneList({
+                pageNo: 1,
+                pageSize: 100
+            })
+            if (res.code === 0 && res.data) {
+                console.log(res.data)
+                this.searchBarFormConfig[2].selectOptions = res.data.list.map(item => {
+                    return { id: item.id, name: item.lane }
+                })
+                console.log(this.searchBarFormConfig)
+            }
+        },
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+		},
+		// /** 导出按钮操作 */
+		// 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(() => {});
+		// },
+        handleTableBtnClick ({data, type}) {
+            switch (type) {
+                case 'detail':
+                    this.viewDetail(data.id)
+            }
+        },
+		// 查看详情
+		viewDetail(id) {
+			this.editMode = 'detail';
+			this.open = true;
+			this.form.id = id;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
+			});
+		},
+	},
+};
+</script>
diff --git a/src/views/areavisual/region/add-or-updata.vue b/src/views/areavisual/region/add-or-updata.vue
new file mode 100644
index 00000000..eef8a936
--- /dev/null
+++ b/src/views/areavisual/region/add-or-updata.vue
@@ -0,0 +1,81 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-28 14:38:31
+ * @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="materialCode">
+					<el-input
+						v-model="dataForm.materialCode"
+						clearable
+						placeholder="请输入物料编码" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="物料型号" prop="materialName">
+					<el-input
+						v-model="dataForm.materialName"
+						clearable
+						placeholder="请输入物料型号" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="物料规格" prop="material">
+					<el-input
+						v-model="dataForm.material"
+						clearable
+						placeholder="请输入物料规格" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '@/mixins/basic-add';
+import { createProduct, updateProduct,getProduct } from '@/api/ssdl/product&recipe';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				createURL: createProduct,
+				updateURL: updateProduct,
+				infoURL: getProduct,
+			},
+			dataForm: {
+				id: undefined,
+				material: undefined,
+				materialName: undefined,
+				materialCode: undefined,
+			},
+      typeArr: [],
+			dataRule: {
+				materialCode: [
+					{ required: true, message: '物料编码不能为空', trigger: 'blur' },
+				],
+				materialName: [
+					{ required: true, message: '物料型号不能为空', trigger: 'blur' },
+				],
+				material: [
+					{ required: true, message: '规格不能为空', trigger: 'blur' },
+				],
+			},
+		};
+	},
+	methods: {},
+};
+</script>
diff --git a/src/views/areavisual/region/changeStatus.vue b/src/views/areavisual/region/changeStatus.vue
new file mode 100644
index 00000000..25468c12
--- /dev/null
+++ b/src/views/areavisual/region/changeStatus.vue
@@ -0,0 +1,62 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-11 14:41:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-14 14:13:14
+ * @Description:
+-->
+<template>
+	<el-switch
+		@change="changeStatus"
+		size="small"
+		v-model="injectData.regionState"
+		:active-value="1"
+		:inactive-value="2"></el-switch>
+</template>
+
+<script>
+import { updateRegion } from '@/api/areavisual/region';
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {
+		changeStatus(val) {
+			const pdata = { ...this.injectData, regionState: val };
+			this.$confirm(
+				`是否确认修改${'区域  [ ' + this.injectData.regionName + ' ]  '}的状态?`,
+				'更新状态',
+				{
+					confirmButtonText: '确认修改',
+					cancelButtonText: '取消',
+					type: 'warning',
+				}
+			)
+				.then(() => {
+					updateRegion(pdata).then((res) => {
+						if (res.code === 0 || res.code === 200) {
+							this.$modal.msgSuccess('修改成功');
+							this.$emit('emitData');
+						} else {
+							this.$modal.msg(res.msg);
+						}
+					});
+				})
+				.catch((res) => {
+					this.$emit('emitData');
+					this.$message({
+						type: 'info',
+						message: '已取消',
+					});
+				});
+		},
+	},
+};
+</script>
diff --git a/src/views/areavisual/region/index.vue b/src/views/areavisual/region/index.vue
new file mode 100644
index 00000000..12335109
--- /dev/null
+++ b/src/views/areavisual/region/index.vue
@@ -0,0 +1,221 @@
+<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="getDataList">
+		</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 { deleteRegion, getRegionPage } from '@/api/areavisual/region';
+import changeStatus from './changeStatus.vue';
+
+const region = [
+	{
+		id: '1',
+		name: 'A区域',
+	},
+	{
+		id: '2',
+		name: 'B区域',
+	},
+	{
+		id: '3',
+		name: 'C区域',
+	},
+	{
+		id: '4',
+		name: 'D区域',
+	},
+	{
+		id: '5',
+		name: 'E区域',
+	},
+	{
+		id: '6',
+		name: 'F区域',
+	},
+	{
+		id: '7',
+		name: 'G区域',
+	},
+	{
+		id: '8',
+		name: 'H区域',
+	},
+];
+const regionType = [
+	{
+		id: '1',
+		name: '拉丝缓存区',
+	},
+	{
+		id: '2',
+		name: '满盘存储区',
+	},
+	{
+		id: '3',
+		name: '空盘存储区',
+	},
+	{
+		id: '4',
+		name: '复绕区',
+	},
+];
+const tableProps = [
+	{
+		prop: 'regionCode',
+		label: '区域编码',
+	},
+	{
+		prop: 'regionName',
+		label: '区域名称',
+	},
+	{
+		prop: 'region',
+		label: '区域',
+		filter: (val) => {
+			return region.find((i) => i.id == val)
+				? region.find((i) => i.id == val).name
+				: '-';
+		},
+	},
+	{
+		prop: 'regionType',
+		label: '区域类型',
+		filter: (val) => {
+			return regionType.find((i) => i.id == val)
+				? regionType.find((i) => i.id == val).name
+				: '-';
+		},
+	},
+	{
+		prop: 'rowNum',
+		label: '行数',
+    width:90,
+	},
+	{
+		prop: 'columnNum',
+		label: '列数',
+    width:90,
+	},
+	{
+		prop: 'regionState',
+		label: '区域状态',
+    width:90,
+		subcomponent: changeStatus,
+	},
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime,
+		width: 150,
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getRegionPage,
+				deleteURL: deleteRegion,
+			},
+			tableProps,
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '名称',
+					placeholder: '名称',
+					param: 'name',
+				},
+				{
+					type: 'input',
+					label: '编码',
+					placeholder: '编码',
+					param: 'code',
+				},
+				{
+					type: 'select',
+					label: '区域',
+					selectOptions: region,
+					placeholder: '请选择区域',
+					param: 'region',
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+					this.listQuery.regionName = val.name;
+					this.listQuery.regionCode = val.code;
+					this.listQuery.region = val.region;
+					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/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 e62db64c..00000000
Binary files a/src/views/core/base/equipment/assets/eq1.jpg and /dev/null differ
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 1f738260..00000000
Binary files a/src/views/core/base/equipment/assets/eq10.jpg and /dev/null differ
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 7ca5dcc1..00000000
Binary files a/src/views/core/base/equipment/assets/eq2.jpg and /dev/null differ
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 45f23067..00000000
Binary files a/src/views/core/base/equipment/assets/eq3.jpg and /dev/null differ
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 51476968..00000000
Binary files a/src/views/core/base/equipment/assets/eq4.jpg and /dev/null differ
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 8e536163..00000000
Binary files a/src/views/core/base/equipment/assets/eq5.jpg and /dev/null differ
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 256ec18e..00000000
Binary files a/src/views/core/base/equipment/assets/eq6.jpg and /dev/null differ
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 3fae2905..00000000
Binary files a/src/views/core/base/equipment/assets/eq7.jpg and /dev/null differ
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 ff3c2c39..00000000
Binary files a/src/views/core/base/equipment/assets/eq8.jpg and /dev/null differ
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 93754f39..00000000
Binary files a/src/views/core/base/equipment/assets/eq9.jpg and /dev/null differ
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/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/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/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/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/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 35aae8d9..00000000
--- a/src/views/cost/index.vue
+++ /dev/null
@@ -1,423 +0,0 @@
-<template>
-	<div class="home-page">
-		<div class="date-tabs">
-			<!-- @tab-click="handleClick" -->
-			<el-tabs v-model="activeName" @tab-click="timedayChange" :stretch="true">
-				<el-tab-pane
-					:label="'\u2002\u2002日\u2002\u2002'"
-					name="日"></el-tab-pane>
-				<el-tab-pane
-					:label="'\u2002\u2002周\u2002\u2002'"
-					name="周"></el-tab-pane>
-				<el-tab-pane
-					:label="'\u2002\u2002月\u2002\u2002'"
-					name="月"></el-tab-pane>
-				<el-tab-pane
-					:label="'\u2002\u2002年\u2002\u2002'"
-					name="年"></el-tab-pane>
-			</el-tabs>
-			<div class="detail">
-				<el-date-picker
-					v-model="timeday"
-					align="right"
-					type="date"
-					format="yyyy-MM-dd"
-					valueFormat="yyyy-MM-dd"
-					:clearable="false"
-					@change="timedayChange"
-					placeholder="选择日期"
-					:picker-options="pickerOptions"></el-date-picker>
-			</div>
-		</div>
-		<el-row class="main-top" :gutter="16">
-			<el-col :span="24" style="position: relative">
-				<div class="title">
-					<svg-icon icon-class="home-produce" />
-					<span class="title-inner">生产总成本</span>
-				</div>
-				<el-row class="box">
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.priceS }}万元</div>
-						<div class="unit-style">总计成本</div>
-					</el-col>
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.matPriceS }}万元</div>
-						<div class="unit-style">原料成本</div>
-					</el-col>
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.energyPriceS }}万元</div>
-						<div class="unit-style">能源成本</div>
-					</el-col>
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.otherPriceS }}万元</div>
-						<div class="unit-style">其他成本</div>
-					</el-col>
-					<!-- <el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.ratioS }}</div>
-						<div class="unit-style">综合良品率/%</div>
-					</el-col> -->
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.areaPriceS }}元</div>
-						<div class="unit-style">综合每平米成本</div>
-					</el-col>
-				</el-row>
-			</el-col>
-			<el-col :span="24" style="position: relative">
-				<div class="title">
-					<svg-icon icon-class="home-produce" />
-					<span class="title-inner">原片成本</span>
-				</div>
-				<el-row class="box">
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.priceO }}万元</div>
-						<div class="unit-style">原片总成本</div>
-					</el-col>
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.matPriceO }}万元</div>
-						<div class="unit-style">原料成本</div>
-					</el-col>
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.energyPriceO }}万元</div>
-						<div class="unit-style">能源成本</div>
-					</el-col>
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.otherPriceO }}万元</div>
-						<div class="unit-style">其他成本</div>
-					</el-col>
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.ratioO }}</div>
-						<div class="unit-style">原片良品率/%</div>
-					</el-col>
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.areaPriceO }}元</div>
-						<div class="unit-style">原片每平米成本</div>
-					</el-col>
-				</el-row>
-			</el-col>
-			<el-col :span="24" style="position: relative">
-				<div class="title">
-					<svg-icon icon-class="home-produce" />
-					<span class="title-inner">深加工成本</span>
-				</div>
-				<el-row class="box">
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.priceD }}万元</div>
-						<div class="unit-style">深加工总成本</div>
-					</el-col>
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.energyPriceD }}万元</div>
-						<div class="unit-style">能源成本</div>
-					</el-col>
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.otherPriceD }}万元</div>
-						<div class="unit-style">其他成本</div>
-					</el-col>
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.ratioD }}</div>
-						<div class="unit-style">深加工良品率/%</div>
-					</el-col>
-					<el-col :span="4" class="num-box shadow">
-						<div class="num-style">{{ homeData.areaPriceD }}元</div>
-						<div class="unit-style">深加工每平米成本</div>
-					</el-col>
-				</el-row>
-			</el-col>
-		</el-row>
-		<el-row class="main-bottom" :gutter="16" v-if="false">
-			<el-col :span="9">
-				<div class="chart-wrapper">
-					<line-chart :chart-data="lineChartData" />
-				</div>
-			</el-col>
-			<el-col :span="7">
-				<div class="chart-wrapper">
-					<pie-chart />
-				</div>
-			</el-col>
-			<el-col :span="8">
-				<div class="chart-wrapper">
-					<bar-chart />
-				</div>
-			</el-col>
-		</el-row>
-		<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>
-import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import LineChart from '../dashboard/LineChart';
-import PieChart from '../dashboard/PieChart';
-import BarChart from '../dashboard/BarChart';
-import PanelGroup from '../dashboard/PanelGroup';
-import { getData } from '@/api/cost/allCost';
-import { getUserProfile } from '@/api/system/user';
-
-const lineChartData = {
-	newVisitis: {
-		expectedData: [100, 120, 161, 134, 105, 160, 165],
-		actualData: [120, 82, 91, 154, 162, 140, 145],
-	},
-	messages: {
-		expectedData: [200, 192, 120, 144, 160, 130, 140],
-		actualData: [180, 160, 151, 106, 145, 150, 130],
-	},
-	purchases: {
-		expectedData: [80, 100, 121, 104, 105, 90, 100],
-		actualData: [120, 90, 100, 138, 142, 130, 130],
-	},
-	shoppings: {
-		expectedData: [130, 140, 141, 142, 145, 150, 160],
-		actualData: [120, 82, 91, 154, 162, 140, 130],
-	},
-};
-
-export default {
-	name: 'Home',
-	mixins: [tableHeightMixin],
-	components: {
-		LineChart,
-		PieChart,
-		PanelGroup,
-		BarChart,
-	},
-	computed: {
-		gradientBackground() {
-			return {
-				'background-image':
-					'linear-gradient(90deg, #f0f0f0 25%, rgba(255, 255, 255, 0) 25%, rgba(255, 255, 255, 0) 50%, #f0f0f0 50%, #f0f0f0 75%, rgba(255, 255, 255, 0) 75%, rgba(255, 255, 255, 0))',
-				'background-size': '100px 100px', // 调整条纹的大小
-			};
-		},
-	},
-	data() {
-		return {
-			activeName: '日',
-			user: '',
-			lineChartData: lineChartData.newVisitis,
-			homeData: {},
-			timeday: moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD'),
-			startTime:
-				moment(new Date()).subtract(0, 'days').format('YYYY-MM-DD') +
-				' 00:00:00',
-			endTime:
-				moment(new Date()).subtract(-1, 'days').format('YYYY-MM-DD') +
-				' 00:00:00',
-
-			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);
-						},
-					},
-				],
-			},
-		};
-	},
-	created() {
-	},
-	beforeDestroy() {
-	},
-	methods: {
-		getData() {
-			let listQuery = {
-				//分页
-				pageSize: 10,
-				pageNo: 1,
-				statisticType: ['', '日', '周', '月', '年'].indexOf(this.activeName),
-				startTime: this.timeday + ' 00:00:00',
-			};
-			getData(listQuery).then((response) => {
-				this.homeData = response.data;
-				for (let i in this.homeData) {
-					this.homeData[i] = Number(this.homeData[i]).toFixed(2);
-				}
-			});
-		},
-		timedayChange() {
-			let listQuery = {
-				//分页
-				pageSize: 10,
-				pageNo: 1,
-				statisticType: ['', '日', '周', '月', '年'].indexOf(this.activeName),
-				startTime: this.timeday + ' 00:00:00',
-			};
-				getData(listQuery).then((response) => {
-					this.homeData = response.data;
-					for (let i in this.homeData) {
-						this.homeData[i] = Number(this.homeData[i]).toFixed(2);
-					}
-				});
-		},
-		goDetail() {
-			this.$router.push({ path: 'indexDetail' });
-		},
-	},
-};
-</script>
-
-<style lang="scss" scoped>
-.home-page::before {
-	background-image: url('~@/assets/img/home-bg.png');
-	background-size: cover;
-	background-repeat: no-repeat;
-	background-position: center;
-	content: '';
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	transform: rotate(180deg);
-}
-.date-tabs {
-	padding-left: 40px;
-	padding-top: 20px;
-	position: relative;
-	margin-bottom: 20px;
-}
-:deep(.date-tabs) {
-	.el-tabs__header {
-		margin-bottom: 8px;
-		display: inline-block;
-		transform: translateY(-12px);
-	}
-
-	.el-tabs__content {
-		overflow: visible;
-	}
-
-	.el-tabs__item {
-		font-size: 18px;
-		color: #fff;
-		padding-left: 0 !important;
-		padding-right: 0 !important;
-		line-height: 36px !important;
-		height: 36px;
-	}
-	.el-tabs__item.is-active {
-		color: #0b58ff;
-	}
-}
-.detail {
-	display: inline-block;
-	position: absolute;
-	left: 260px;
-	top: 10px;
-}
-:deep(.detail) {
-	.el-input__inner {
-		background-color: transparent;
-		color: white;
-	}
-}
-// .current-date {
-// 	color: #fff;
-// 	font-size: 18px;
-// 	position: absolute;
-// 	left: 260px;
-// 	top: 14px;
-// }
-.current-time {
-	color: #fff;
-	font-size: 18px;
-	position: absolute;
-	right: 38px;
-	top: 14px;
-}
-.main-top {
-	width: 100%;
-	padding: 0 20px 0 40px;
-	.title {
-		position: absolute;
-		left: 34px;
-		top: 20px;
-		width: 180px;
-		font-size: 32px;
-		z-index: 10;
-		.title-inner {
-			position: absolute;
-			left: 42px;
-			top: 5px;
-			font-size: calc(100vw * 20 / 1920);
-		}
-	}
-	.box {
-		background-color: #fff;
-		border-radius: 24px;
-		height: 192px;
-		padding: 40px 24px 32px 24px;
-		margin-bottom: 20px;
-		box-shadow: 0 8px 8px 0 gray;
-		.num-box {
-			height: 120px;
-			padding-top: 26px;
-			text-align: center;
-			.num-style {
-				color: #000;
-				font-size: calc(100vw * 40 / 1920);
-			}
-			.unit-style {
-				color: rgba(0, 0, 0, 0.7);
-				font-size: calc(100vw * 18 / 1920);
-			}
-		}
-		.shadow {
-			background: linear-gradient(90deg, #ffffff 80%, #f2f4f9 100%);
-		}
-	}
-}
-.main-bottom {
-	width: 100%;
-	margin-top: 20px;
-	.chart-wrapper {
-		margin-left: 10px;
-		height: 425px;
-		background: #fff;
-		border-radius: 5px;
-		box-shadow: 0 3px 3px 0 gray;
-	}
-}
-</style>
-<style lang="scss">
-.home-page {
-	.el-progress-bar__inner {
-		background-image: url('~@/assets/img/home-progress-bg.png');
-		background-size: cover;
-	}
-}
-</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/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/error/401.vue b/src/views/error/401.vue
index 448b6ecd..16a31f4d 100644
--- a/src/views/error/401.vue
+++ b/src/views/error/401.vue
@@ -1,88 +1,93 @@
 <template>
-  <div class="errPage-container">
-    <el-button icon="arrow-left" class="pan-back-btn" @click="back">
-      返回
-    </el-button>
-    <el-row>
-      <el-col :span="12">
-        <h1 class="text-jumbo text-ginormous">
-          401错误!
-        </h1>
-        <h2>您没有访问权限！</h2>
-        <h6>对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面</h6>
-        <ul class="list-unstyled">
-          <li class="link-type">
-            <router-link to="/">
-              回首页
-            </router-link>
-          </li>
-        </ul>
-      </el-col>
-      <el-col :span="12">
-        <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
-      </el-col>
-    </el-row>
-  </div>
+	<div class="errPage-container">
+		<el-button icon="arrow-left" class="pan-back-btn" @click="back">
+			返回
+		</el-button>
+		<el-row>
+			<el-col :span="12">
+				<h1 class="text-jumbo text-ginormous">401错误!</h1>
+				<h2>您没有访问权限！</h2>
+				<h6>对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面</h6>
+				<ul class="list-unstyled">
+					<li class="link-type">
+						<router-link to="/">回首页</router-link>
+					</li>
+				</ul>
+			</el-col>
+			<el-col :span="12">
+				<img
+					:src="errGif"
+					width="313"
+					height="428"
+					alt="Girl has dropped her ice cream." />
+			</el-col>
+		</el-row>
+	</div>
 </template>
 
 <script>
-import errGif from '@/assets/401_images/401.gif'
+import errGif from '@/assets/401_images/401.gif';
 
 export default {
-  name: 'Page401',
-  data() {
-    return {
-      errGif: errGif + '?' + +new Date()
-    }
-  },
-  methods: {
-    back() {
-      if (this.$route.query.noGoBack) {
-        this.$router.push({ path: '/' })
-      } else {
-        this.$router.go(-1)
-      }
-    }
-  }
-}
+	name: 'Page401',
+	data() {
+		return {
+			errGif: errGif + '?' + +new Date(),
+		};
+	},
+	methods: {
+		back() {
+			if (this.$route.query.noGoBack) {
+				this.$router.push({
+					path: '/',
+					query: {
+						keyword: 'home',
+					},
+				});
+			} else {
+				this.$router.go(-1);
+			}
+		},
+	},
+};
 </script>
 
 <style lang="scss" scoped>
-  .errPage-container {
-    width: 800px;
-    max-width: 100%;
-    margin: 100px auto;
-    .pan-back-btn {
-      background: #008489;
-      color: #fff;
-      border: none!important;
-    }
-    .pan-gif {
-      margin: 0 auto;
-      display: block;
-    }
-    .pan-img {
-      display: block;
-      margin: 0 auto;
-      width: 100%;
-    }
-    .text-jumbo {
-      font-size: 60px;
-      font-weight: 700;
-      color: #484848;
-    }
-    .list-unstyled {
-      font-size: 14px;
-      li {
-        padding-bottom: 5px;
-      }
-      a {
-        color: #008489;
-        text-decoration: none;
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-    }
-  }
+.errPage-container {
+	width: 800px;
+	max-width: 100%;
+	margin: 100px auto;
+	.pan-back-btn {
+		background: #008489;
+		color: #fff;
+		border: none !important;
+	}
+	.pan-gif {
+		margin: 0 auto;
+		display: block;
+	}
+	.pan-img {
+		display: block;
+		margin: 0 auto;
+		width: 100%;
+	}
+	.text-jumbo {
+		font-size: 60px;
+		font-weight: 700;
+		color: #484848;
+	}
+	.list-unstyled {
+		font-size: 14px;
+		li {
+			padding-bottom: 5px;
+		}
+		a {
+			color: #008489;
+			text-decoration: none;
+			&:hover {
+				text-decoration: underline;
+			}
+		}
+	}
+}
 </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/login.vue b/src/views/login.vue
index c412f3c1..ef7f70e8 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -108,7 +108,7 @@
 				</h2>
 
 				<!-- 表单 -->
-				<div class="form-cont" style="margin-top: 60px;">
+				<div class="form-cont" style="margin-top: 60px">
 					<div style="">
 						<el-form
 							ref="loginForm"
@@ -200,12 +200,14 @@
 							</div>
 
 							<!-- 下方的登录按钮 -->
-							<el-form-item id="button-form-item" style="width: 100%; margin-top: 32px">
+							<el-form-item
+								id="button-form-item"
+								style="width: 100%; margin-top: 32px">
 								<el-button
 									:loading="loading"
 									size="medium"
 									type="primary"
-									style="width: 100%; height: 66px; font-size: 18px;"
+									style="width: 100%; height: 66px; font-size: 18px"
 									@click.native.prevent="getCode">
 									<span v-if="!loading">登 录</span>
 									<span v-else>登 录 中...</span>
@@ -284,7 +286,7 @@ export default {
 				mobile: '',
 				mobileCode: '',
 				rememberMe: false,
-				tenantName: '技术中心',
+				tenantName: '芋道源码',
 			},
 			scene: 21,
 
@@ -409,7 +411,14 @@ export default {
 							this.loginForm
 						)
 						.then(() => {
-							this.$router.push({ path: this.redirect || '/' }).catch(() => {});
+							this.$router
+								.push({
+									path: this.redirect || '/',
+									query: {
+										keyword: 'home',
+									},
+								})
+								.catch(() => {});
 						})
 						.catch(() => {
 							this.loading = false;
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 49c9a020..00000000
Binary files a/src/views/mp/menu/assets/demo.png and /dev/null differ
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 bb09591a..00000000
Binary files a/src/views/mp/menu/assets/iphone_backImg.png and /dev/null differ
diff --git a/src/views/mp/menu/assets/logo.png b/src/views/mp/menu/assets/logo.png
deleted file mode 100644
index f3d2503f..00000000
Binary files a/src/views/mp/menu/assets/logo.png and /dev/null differ
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 4a89d4bd..00000000
Binary files a/src/views/mp/menu/assets/menu_foot.png and /dev/null differ
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 248cfb76..00000000
Binary files a/src/views/mp/menu/assets/menu_head.png and /dev/null differ
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/product&recipe/product/add-or-updata.vue b/src/views/product&recipe/product/add-or-updata.vue
index 95abfaa7..eef8a936 100644
--- a/src/views/product&recipe/product/add-or-updata.vue
+++ b/src/views/product&recipe/product/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-12 15:35:21
+ * @LastEditTime: 2025-11-28 14:38:31
  * @Description:
 -->
 <template>
@@ -14,56 +14,29 @@
 		label-width="80px">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="产品编码" prop="code">
+				<el-form-item label="物料编码" prop="materialCode">
 					<el-input
-						v-model="dataForm.code"
+						v-model="dataForm.materialCode"
 						clearable
-						placeholder="请输入产品编码" />
+						placeholder="请输入物料编码" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="产品名称" prop="name">
+				<el-form-item label="物料型号" prop="materialName">
 					<el-input
-						v-model="dataForm.name"
+						v-model="dataForm.materialName"
 						clearable
-						placeholder="请输入产品名称" />
+						placeholder="请输入物料型号" />
 				</el-form-item>
 			</el-col>
 		</el-row>
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="产品规格" prop="address">
+				<el-form-item label="物料规格" prop="material">
 					<el-input
-						v-model="dataForm.address"
+						v-model="dataForm.material"
 						clearable
-						placeholder="请输入产品规格" />
-				</el-form-item>
-			</el-col>
-			<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 typeArr"
-							: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="enabled">
-					<el-select
-						:style="{ width: '100%' }" 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>
+						placeholder="请输入物料规格" />
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -72,39 +45,33 @@
 
 <script>
 import basicAdd from '@/mixins/basic-add';
-import {
-	createFactory,
-	updateFactory,
-	getFactory,
-	getCode,
-} from '@/api/core/base/factory';
+import { createProduct, updateProduct,getProduct } from '@/api/ssdl/product&recipe';
 
 export default {
 	mixins: [basicAdd],
 	data() {
 		return {
 			urlOptions: {
-				isGetCode: true,
-				codeURL: getCode,
-				createURL: createFactory,
-				updateURL: updateFactory,
-				infoURL: getFactory,
+				createURL: createProduct,
+				updateURL: updateProduct,
+				infoURL: getProduct,
 			},
 			dataForm: {
 				id: undefined,
-				code: undefined,
-				name: undefined,
-				address: undefined,
-        enabled:'1',
-				remark: undefined,
+				material: undefined,
+				materialName: undefined,
+				materialCode: undefined,
 			},
       typeArr: [],
 			dataRule: {
-				code: [
-					{ required: true, message: '产品编码不能为空', trigger: 'blur' },
+				materialCode: [
+					{ required: true, message: '物料编码不能为空', trigger: 'blur' },
 				],
-				name: [
-					{ required: true, message: '产品名称不能为空', trigger: 'blur' },
+				materialName: [
+					{ required: true, message: '物料型号不能为空', trigger: 'blur' },
+				],
+				material: [
+					{ required: true, message: '规格不能为空', trigger: 'blur' },
 				],
 			},
 		};
diff --git a/src/views/product&recipe/product/changeStatus.vue b/src/views/product&recipe/product/changeStatus.vue
deleted file mode 100644
index b9744b78..00000000
--- a/src/views/product&recipe/product/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/product&recipe/product/index.vue b/src/views/product&recipe/product/index.vue
index 2fd23064..9e7ff0dc 100644
--- a/src/views/product&recipe/product/index.vue
+++ b/src/views/product&recipe/product/index.vue
@@ -41,48 +41,32 @@
 <script>
 import AddOrUpdate from './add-or-updata';
 import basicPage from '@/mixins/basic-page';
-import changeStatus from './changeStatus.vue';
 import { parseTime } from '@/filter/code-filter';
-import {
-	deleteFactory,
-	getFactoryPage,
-	exportFactoryExcel,
-} from '@/api/core/base/factory';
+import { deleteProduct, getProductPage } from '@/api/ssdl/product&recipe';
 
 const tableProps = [
 	{
-		prop: 'code',
-		label: '产品编码',
+		prop: 'materialCode',
+		label: '物料编码',
 	},
 	{
-		prop: 'name',
-		label: '产品名称',
+		prop: 'materialName',
+		label: '物料型号',
 	},
 	{
-		prop: 'address',
-		label: '规格型号',
+		prop: 'material',
+		label: '规格',
 	},
 	{
-		prop: 'remark',
-		label: '产品分类',
-	},
-	{
-		prop: 'remark1',
+		prop: 'creator',
 		label: '创建人',
-		width: 90,
 	},
 	{
 		prop: 'createTime',
-		label: '时间',
+		label: '创建时间',
 		filter: parseTime,
 		width: 150,
 	},
-	{
-		prop: 'enabled',
-		label: '状态',
-		subcomponent: changeStatus,
-		width: 80,
-	},
 ];
 
 export default {
@@ -90,47 +74,33 @@ export default {
 	data() {
 		return {
 			urlOptions: {
-				getDataListURL: getFactoryPage,
-				deleteURL: deleteFactory,
-				exportURL: exportFactoryExcel,
+				getDataListURL: getProductPage,
+				deleteURL: deleteProduct,
 			},
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`base:factory:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`base:factory:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
 			].filter((v) => v),
 			tableData: [],
 			formConfig: [
 				{
-					type: 'select',
-					label: '分类',
-					selectOptions: [],
-					param: 'val1',
-				},
-				{
-					type: 'select',
-					label: '状态',
-					selectOptions: [
-						{ id: 1, name: '正常' },
-						{ id: 2, name: '停用' },
-					],
-					param: 'val2',
+					type: 'input',
+					label: '型号',
+					placeholder: '型号',
+					param: 'name',
 				},
 				{
 					type: 'input',
-					label: '产品编码',
-					placeholder: '产品编码',
-					param: 'name',
+					label: '编码',
+					placeholder: '编码',
+					param: 'code',
 				},
 				{
 					type: 'button',
@@ -150,7 +120,7 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:factory:create') ? 'button' : '',
+					type: 'button',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -177,16 +147,15 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name;
-					this.listQuery.val1 = val.val1;
-					this.listQuery.val2 = val.val2;
+					this.listQuery.pageSize = 20;
+					this.listQuery.materialName = val.name;
+					this.listQuery.materialCode = val.code;
 					this.getDataList();
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 10,
+						pageSize: 20,
 						pageNo: 1,
 						total: 1,
 					};
@@ -204,6 +173,27 @@ export default {
 					console.log(val);
 			}
 		},
+    // 删除
+    deleteHandle(id, name, index,data) {
+      this.$confirm(`是否确认删除${'物料型号为  ' + data.materialName + '  '}的数据项?`, "系统提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
 	},
 };
 </script>
diff --git a/src/views/core/base/product/SmallTitle.vue b/src/views/product&recipe/recipe/SmallTitle.vue
similarity index 100%
rename from src/views/core/base/product/SmallTitle.vue
rename to src/views/product&recipe/recipe/SmallTitle.vue
diff --git a/src/views/product&recipe/recipe/add-or-updata.vue b/src/views/product&recipe/recipe/add-or-updata.vue
index 95abfaa7..c409cabb 100644
--- a/src/views/product&recipe/recipe/add-or-updata.vue
+++ b/src/views/product&recipe/recipe/add-or-updata.vue
@@ -1,114 +1,357 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
- * @LastEditTime: 2025-11-12 15:35:21
- * @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-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 typeArr"
-							: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="enabled">
-					<el-select
-						:style="{ width: '100%' }" 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>
-		</el-row>
-	</el-form>
+	<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="8">
+							<el-form-item label="配方规格" prop="processSize">
+								<el-input
+									v-model="dataForm.processSize"
+									clearable
+									:disabled="isdetail"
+									placeholder="请输入配方规格" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="配方型号" prop="processName">
+								<el-input
+									v-model="dataForm.processName"
+									clearable
+									:disabled="isdetail"
+									placeholder="请输入配方型号" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="配方描述" prop="processDesc">
+								<el-input
+									v-model="dataForm.processDesc"
+									clearable
+									:disabled="isdetail"
+									placeholder="请输入配方描述" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true"
+					v-if="dataForm.processName && dataForm.processSize">
+					物料属性列表
+				</small-title>
+
+				<div
+					class="attr-list"
+					v-if="dataForm.processName && dataForm.processSize">
+					<base-table
+						:table-props="tableProps"
+						:page="listQuery.pageNo"
+						:limit="listQuery.pageSize"
+						:add-button-show="
+							productAttributeList.length > 3 || 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 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"
+			@refreshDataList="getList" />
+	</el-drawer>
 </template>
 
 <script>
-import basicAdd from '@/mixins/basic-add';
 import {
-	createFactory,
-	updateFactory,
-	getFactory,
-	getCode,
-} from '@/api/core/base/factory';
+	updateProcess,
+	createProcess,
+	getProcess,
+	getProcessDetailPage,
+	deleteProcess,
+} from '@/api/ssdl/product&recipe';
+import productAttrAdd from './attr-add';
+import { parseTime } from '@/filter/code-filter';
+import SmallTitle from './SmallTitle';
+
+const tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime,
+	},
+	{
+		prop: 'materialName',
+		label: '物料型号',
+	},
+	{
+		prop: 'material',
+		label: '物料规格',
+	},
+	{
+		prop: 'materialNumber',
+		label: '物料数量',
+	},
+];
 
 export default {
-	mixins: [basicAdd],
+	components: { productAttrAdd, SmallTitle },
 	data() {
 		return {
-			urlOptions: {
-				isGetCode: true,
-				codeURL: getCode,
-				createURL: createFactory,
-				updateURL: updateFactory,
-				infoURL: getFactory,
-			},
+			visible: false,
+			addOrUpdateVisible: false,
+			tableBtn,
+			tableProps,
+			productAttributeList: [],
 			dataForm: {
-				id: undefined,
-				code: undefined,
-				name: undefined,
-				address: undefined,
-        enabled:'1',
-				remark: undefined,
+				id: null,
+				processName: '', // 配方型号
+				processSize: '', // 配方规格
+				processDesc: '', // 配方描述
+			},
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
 			},
-      typeArr: [],
 			dataRule: {
-				code: [
-					{ required: true, message: '产品编码不能为空', trigger: 'blur' },
+				processSize: [
+					{
+						required: true,
+						message: '配方规格不能为空',
+						trigger: 'blur',
+					},
 				],
-				name: [
-					{ required: true, message: '产品名称不能为空', trigger: 'blur' },
+				processName: [
+					{
+						required: true,
+						message: '配方型号不能为空',
+						trigger: 'blur',
+					},
 				],
 			},
+			isdetail: false,
 		};
 	},
-	methods: {},
+	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) {
+					// 获取物料详情
+					getProcess(id).then((response) => {
+						this.dataForm = response.data;
+						// 获取物料的属性列表
+						this.getList();
+					});
+				}
+			});
+		},
+
+		getList() {
+			// 获取物料的属性列表
+			getProcessDetailPage({
+				processName: this.dataForm.processName,
+				processSize: this.dataForm.processSize,
+				pageSize: 100,
+				pageNo: 1,
+				total: 1,
+			}).then((response) => {
+				this.productAttributeList = response.data;
+			});
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProcess(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.productAttributeList ||
+						!(this.productAttributeList.length > 0)
+					) {
+						this.$modal.msg('物料属性不能为空');
+						return;
+					}
+					this.productAttributeList.forEach((item) => {
+						item.processName = this.dataForm.processName;
+						item.processSize = this.dataForm.processSize;
+						item.processDesc = this.dataForm.processDesc;
+					});
+					// 修改的提交
+					updateProcess(this.productAttributeList).then((response) => {
+						this.$modal.msgSuccess('提交成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+					return;
+					// 添加的提交
+					createProcess(this.productAttributeList).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id, this.dataForm);
+			});
+		},
+		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/product&recipe/recipe/attr-add.vue b/src/views/product&recipe/recipe/attr-add.vue
new file mode 100644
index 00000000..071f5533
--- /dev/null
+++ b/src/views/product&recipe/recipe/attr-add.vue
@@ -0,0 +1,184 @@
+<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="equipmentId">
+				<el-select
+					style="width: 100%"
+					v-model="dataForm.equipmentId"
+					@change="setEquipment"
+					placeholder="请选择设备">
+					<el-option
+						v-for="item in equipmentArr"
+						:key="item.id"
+						:label="item.equipmentName"
+						:value="item.id"></el-option>
+				</el-select>
+			</el-form-item> -->
+			<el-form-item label="物料" prop="materialId">
+				<el-select
+					style="width: 100%"
+					v-model="dataForm.materialId"
+					filterable
+					@change="setMaterial"
+					placeholder="请选择物料">
+					<el-option
+						v-for="item in productArr"
+						:key="item.id"
+						:label="
+							item.materialCode + '-' + item.materialName + '-' + item.material
+						"
+						:value="item.id"></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="数量" prop="materialNumber">
+				<el-input-number
+					v-model="dataForm.materialNumber"
+					:step="1"
+					step-strictly
+					:min="0"></el-input-number>
+			</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 {
+	getAllProductPage,
+	createProcess,
+	getProcess,
+	updateProcess,
+} from '@/api/ssdl/product&recipe';
+
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+        processId: '', // 配方id
+				processName: '', // 配方型号
+				processSize: '', // 配方规格
+				processDesc: '', // 配方描述
+				materialId: '',
+				material: '',
+				materialName: '',
+				materialNumber: '',
+			},
+			productArr: [],
+			equipmentArr: [],
+			dataRule: {
+				materialId: [
+					{ required: true, message: '物料不能为空', trigger: 'change' },
+				],
+				materialNumber: [
+					{ required: true, message: '数量不能为空', trigger: 'blur' },
+				],
+			},
+		};
+	},
+	methods: {
+		init(id,data) {
+			this.dataForm.id = id || '';
+			this.dataForm.processId = data.id || '';
+			this.dataForm.processName = data.processName || '';
+			this.dataForm.processSize = data.processSize || '';
+			this.dataForm.processDesc = data.processDesc || '';
+			this.visible = true;
+			getAllProductPage().then((res) => {
+				this.productArr = res.data;
+			});
+			// getEquipmentPage({ pageNo: 1, pageSize: 100 }).then((res) => {
+			// 	this.equipmentArr = res.data.list;
+			// });
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getProcess(this.dataForm.id).then((res) => {
+						this.dataForm = res.data;
+					});
+				}
+			});
+		},
+		setMaterial() {
+			const data = this.productArr.find(
+				(i) => i.id === this.dataForm.materialId
+			);
+			this.dataForm.materialName = data.materialName;
+			this.dataForm.material = data.material;
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateProcess([{
+							...this.dataForm,
+						}]).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createProcess([{
+						...this.dataForm,
+					}]).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/product&recipe/recipe/changeStatus.vue b/src/views/product&recipe/recipe/changeStatus.vue
deleted file mode 100644
index b9744b78..00000000
--- a/src/views/product&recipe/recipe/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/product&recipe/recipe/index.vue b/src/views/product&recipe/recipe/index.vue
index 5c070dd9..6b36d457 100644
--- a/src/views/product&recipe/recipe/index.vue
+++ b/src/views/product&recipe/recipe/index.vue
@@ -1,154 +1,134 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 14:55:51
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-28 14:34:11
+ * @Description:
+-->
 <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="getDataList">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="90"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
+		<el-table
+			:data="tableData"
+			:header-cell-style="{
+				background: '#F2F4F9',
+				color: '#606266',
+			}"
+			border
+			style="width: 100%"
+			ref="dataList">
+			<el-table-column type="expand">
+				<template slot-scope="scope">
+					<product
+						:processName="scope.row.processName"
+						:processSize="scope.row.processSize"></product>
+				</template>
+			</el-table-column>
+			<el-table-column prop="processName" label="配方型号" />
+			<el-table-column prop="processSize" label="配方规格" />
+			<el-table-column prop="processDesc" label="配方描述" />
+			<el-table-column prop="createTime" label="创建时间" width="150">
+				<template v-slot="scope">
+					<span>{{ parseTime(scope.row.createTime) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="操作" width="120">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						@click="handleClick({ data: { ...scope.row }, type: 'edit' })">
+						<span class="iconfont icon-edit primary-color"></span>
+					</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						@click="handleClick({ data: { ...scope.row }, type: 'delete' })">
+						<span class="iconfont icon-delete" style="color: #f56c6c"></span>
+					</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						@click="handleClick({ data: { ...scope.row }, type: 'detail' })">
+						<span class="iconfont icon-detail primary-color"></span>
+					</el-button>
+				</template>
+			</el-table-column>
+		</el-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>
+		<add-or-update
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getDataList" />
 	</div>
 </template>
 
 <script>
 import AddOrUpdate from './add-or-updata';
+import product from './product-mini';
 import basicPage from '@/mixins/basic-page';
-import changeStatus from './changeStatus.vue';
 import { parseTime } from '@/filter/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: 'remark1',
-		label: '创建人',
-		width: 90,
-	},
-	{
-		prop: 'createTime',
-		label: '时间',
-		filter: parseTime,
-		width: 150,
-	},
-	{
-		prop: 'enabled',
-		label: '状态',
-		subcomponent: changeStatus,
-		width: 80,
-	},
-];
+	deleteProcessList,
+	getProcessPage,
+	getProcessDetailPage,
+} from '@/api/ssdl/product&recipe';
 
 export default {
 	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
-				getDataListURL: getFactoryPage,
-				deleteURL: deleteFactory,
-				exportURL: exportFactoryExcel,
+				getDataListURL: getProcessPage,
+				deleteURL: deleteProcessList,
 			},
-			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`base:factory:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`base:factory:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+				{
+					type: 'detail',
+					btnName: '详情',
+				},
 			].filter((v) => v),
 			tableData: [],
 			formConfig: [
 				{
-					type: 'select',
-					label: '适用框绞线',
-					selectOptions: [],
+					type: 'input',
+					label: '配方型号',
+					placeholder: '配方型号',
 					param: 'val1',
 				},
 				{
-					type: 'select',
-					label: '修改人',
-					selectOptions: [],
+					type: 'input',
+					label: '配方规格',
+					placeholder: '配方规格',
 					param: 'val2',
 				},
-				{
-					type: 'select',
-					label: '状态',
-					selectOptions: [
-						{ id: 1, name: '正常' },
-						{ id: 2, name: '停用' },
-					],
-					param: 'val3',
-				},
-				{
-					type: 'datePicker',
-					label: '最后修改时间',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'searchTime',
-				},
-				{
-					type: 'input',
-					label: '产品编码',
-					placeholder: '产品编码',
-					param: 'name',
-				},
+				// {
+				// 	type: 'input',
+				// 	label: '物料型号',
+				// 	placeholder: '物料型号',
+				// 	param: 'val3',
+				// },
+				// {
+				// 	type: 'input',
+				// 	label: '物料编码',
+				// 	placeholder: '物料编码',
+				// 	param: 'val4',
+				// },
 				{
 					type: 'button',
 					btnName: '搜索',
@@ -167,26 +147,28 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:factory:create') ? 'button' : '',
+					type: 'button',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
 					plain: true,
 				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
+				// {
+				// 	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,
+		product,
 	},
 	created() {},
 	methods: {
@@ -194,19 +176,17 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name;
-					this.listQuery.val1 = val.val1;
-					this.listQuery.val2 = val.val2;
-					this.listQuery.val3 = val.val3;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					this.listQuery.pageSize = 20;
+					this.listQuery.processName = val.val1 || null;
+					this.listQuery.processSize = val.val2 || null;
+					// this.listQuery.materialName = val.val3 || null;
+					// this.listQuery.materialCode = val.val4 || null;
 					this.getDataList();
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 10,
+						pageSize: 20,
 						pageNo: 1,
 						total: 1,
 					};
@@ -224,6 +204,55 @@ export default {
 					console.log(val);
 			}
 		},
+		otherMethods(val) {
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = '详情';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(val.data.id, true);
+			});
+		},
+		// 删除
+		deleteHandle(id, name, index, data) {
+			this.$confirm(
+				`是否确认删除${'配方型号为  ' + data.processName + '  '}的数据项?`,
+				'系统提示',
+				{
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning',
+				}
+			)
+				.then(() => {
+					// 获取物料的属性列表
+					getProcessDetailPage({
+						processName: data.processName,
+						processSize: data.processSize,
+						pageSize: 100,
+						pageNo: 1,
+						total: 1,
+					}).then((response) => {
+						const ids = response.data.map((i) => i.id);
+						this.urlOptions.deleteURL(ids).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getDataList();
+								},
+							});
+						});
+					});
+				})
+				.catch(() => {});
+		},
 	},
 };
 </script>
+
+<style>
+.app-container .el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+</style>
diff --git a/src/views/product&recipe/recipe/product-mini.vue b/src/views/product&recipe/recipe/product-mini.vue
new file mode 100644
index 00000000..884d2e94
--- /dev/null
+++ b/src/views/product&recipe/recipe/product-mini.vue
@@ -0,0 +1,89 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-24 14:47:58
+ * @LastEditors: zwq
+ * @LastEditTime: 2026-01-13 15:56:45
+ * @Description:
+-->
+<template>
+	<div>
+	<!-- <div class="app-container"> -->
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+      max-height="200"
+			:page="1"
+			:limit="listQuery.total"
+			:table-data="tableData" />
+      </div>
+</template>
+
+<script>
+import basicPage from '@/mixins/basic-page';
+import { parseTime } from '@/filter/code-filter';
+import { getProcessDetailPage } from '@/api/ssdl/product&recipe';
+
+const tableProps = [
+	{
+		prop: 'materialCode',
+		label: '物料编号',
+	},
+	{
+		prop: 'materialName',
+		label: '物料型号',
+	},
+	{
+		prop: 'material',
+		label: '物料规格',
+	},
+	{
+		prop: 'materialNumber',
+		label: '物料数量',
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	props: {
+    processSize: {
+			type: String,
+			default: '',
+		},
+    processName: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getProcessDetailPage,
+			},
+			tableProps,
+			tableData: [],
+      listQuery: {
+        processName: this.processName,
+        processSize: this.processSize,
+        pageSize: 100,
+        pageNo: 1,
+        total: 1,
+      },
+		};
+	},
+	components: {
+	},
+	created() {
+  },
+	methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+	},
+};
+</script>
diff --git a/src/views/productionVisualization/equipmentBoard/components/alarmTop.vue b/src/views/productionVisualization/equipmentBoard/components/alarmTop.vue
index 30280ff9..dfd4d050 100644
--- a/src/views/productionVisualization/equipmentBoard/components/alarmTop.vue
+++ b/src/views/productionVisualization/equipmentBoard/components/alarmTop.vue
@@ -4,7 +4,7 @@
       <div class="title">异常原因Top5</div>
       <div class="alarm-item" style="margin-top: 14px;">
         <div class="item top1">
-          <dov class="item-data">
+          <div class="item-data">
             <div class="data-unit">
               单位/次
             </div>
@@ -16,10 +16,10 @@
                 261,938,984
               </div>
             </div>
-          </dov>
+          </div>
         </div>
         <div class="item top2">
-          <dov class="item-data">
+          <div class="item-data">
             <div class="data-unit">
               单位/次
             </div>
@@ -31,10 +31,10 @@
                 261,938,984
               </div>
             </div>
-          </dov>
+          </div>
         </div>
         <div class="item top3">
-          <dov class="item-data">
+          <div class="item-data">
             <div class="data-unit">
               单位/次
             </div>
@@ -46,10 +46,10 @@
                 261,938,984
               </div>
             </div>
-          </dov>
+          </div>
         </div>
         <div class="item top4">
-          <dov class="item-data">
+          <div class="item-data">
             <div class="data-unit">
               单位/次
             </div>
@@ -61,10 +61,10 @@
                 261,938,984
               </div>
             </div>
-          </dov>
+          </div>
         </div>
         <div class="item top5">
-          <dov class="item-data">
+          <div class="item-data">
             <div class="data-unit">
               单位/次
             </div>
@@ -76,7 +76,7 @@
                 261,938,984
               </div>
             </div>
-          </dov>
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/views/productionVisualization/equipmentBoard/components/threeDimensionalChart.vue b/src/views/productionVisualization/equipmentBoard/components/threeDimensionalChart.vue
index 3b8d1141..34beab98 100644
--- a/src/views/productionVisualization/equipmentBoard/components/threeDimensionalChart.vue
+++ b/src/views/productionVisualization/equipmentBoard/components/threeDimensionalChart.vue
@@ -1999,7 +1999,7 @@ export default {
 
     // 根据位置编码（如FK10101L）获取单个位置的状态类名
     getPositionClass(positionCode) {
-      console.log('positionCode'.positionCode);
+     // console.log('positionCode'.positionCode);
 
       // 查找完全匹配的lineEdgeLibraryCode
       const targetData = this.dataList.find(item =>
diff --git a/src/views/productionVisualization/equipmentBoard/index.vue b/src/views/productionVisualization/equipmentBoard/index.vue
index 63ef27f1..ff76e686 100644
--- a/src/views/productionVisualization/equipmentBoard/index.vue
+++ b/src/views/productionVisualization/equipmentBoard/index.vue
@@ -1,61 +1,63 @@
 <template>
-  <div id="dayReport" class="dayReport" :style="styles">
-    <ReportHeader top-title="车间生产看板" />
-    <div class="main-body" style=" flex: 1; display: flex;padding: 16px 20px 22px 24px;flex-direction: column;">
-      <div class="top" style="display: flex;gap: 16px;">
-        <div class="top-three" style="
-              display: grid;
-              gap: 12px;
-              grid-template-columns: 367px 1493px;
-            ">
-          <agvStatus />
-          <threeDimensionalChart :dataList="dataList" />
-        </div>
-      </div>
-      <div class="top" style="display: flex;gap: 16px;margin-top: 6px;">
-        <div class="bottom-three" style="
-              display: grid;
-              gap: 12px;
-              grid-template-columns: 512px 930px 402px;
-            ">
-          <div class="left-three" style="
-              display: grid;
-              gap: 16px;
-              grid-template-rows: 213px 213px;
-            ">
-            <taskType />
-            <taskStatus />
-          </div>
-          <div class="center-three" style="
-              display: grid;
-              gap: 16px;
-              grid-template-rows: 330px 92px;
-            ">
-            <realTask />
-            <alarm />
+	<div id="dayReport" class="dayReport" :style="styles">
+		<ReportHeader top-title="车间生产看板" />
+		<div
+			class="main-body"
+			style="
+				flex: 1;
+				display: flex;
+				padding: 16px 20px 22px 24px;
+				flex-direction: column;
+			">
+			<div class="top" style="display: flex; gap: 16px">
+				<div
+					class="top-three"
+					style="display: grid; gap: 12px; grid-template-columns: 367px 1493px">
+					<agvStatus />
+					<threeDimensionalChart :dataList="dataList" />
+				</div>
+			</div>
+			<div class="top" style="display: flex; gap: 16px; margin-top: 6px">
+				<div
+					class="bottom-three"
+					style="
+						display: grid;
+						gap: 12px;
+						grid-template-columns: 512px 930px 402px;
+					">
+					<div
+						class="left-three"
+						style="display: grid; gap: 16px; grid-template-rows: 213px 213px">
+						<taskType />
+						<taskStatus />
+					</div>
+					<div
+						class="center-three"
+						style="display: grid; gap: 16px; grid-template-rows: 330px 92px">
+						<realTask />
+						<alarm />
 
-            <!-- <taskStatus /> -->
-          </div>
-          <alarmTop />
-        </div>
-      </div>
-    </div>
-  </div>
+						<!-- <taskStatus /> -->
+					</div>
+					<alarmTop />
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 <script>
-import ReportHeader from './components/Header.vue'
+import ReportHeader from './components/Header.vue';
 // import screenfull from 'screenfull'
-import agvStatus from './components/agvStatus.vue'
-import taskType from './components/taskType.vue'
-import realTask from './components/realTask.vue'
-import alarm from './components/alarm.vue'
-import alarmTop from './components/alarmTop.vue'
+import agvStatus from './components/agvStatus.vue';
+import taskType from './components/taskType.vue';
+import realTask from './components/realTask.vue';
+import alarm from './components/alarm.vue';
+import alarmTop from './components/alarmTop.vue';
 
-import taskStatus from './components/taskStatus.vue'
-
-import threeDimensionalChart from './components/threeDimensionalChart.vue'
-import { getLineEdgeLibraryList } from '../../../api/visualization/visualization'
+import taskStatus from './components/taskStatus.vue';
 
+import threeDimensionalChart from './components/threeDimensionalChart.vue';
+import { getLineEdgeLibraryList } from '../../../api/visualization/visualization';
 
 // import financeCosts from './components/financeCosts.vue'
 // import keyProductionIndicators from './components/keyProductionIndicators.vue'
@@ -64,151 +66,164 @@ import { getLineEdgeLibraryList } from '../../../api/visualization/visualization
 // import keyWork from './components/keyWork.vue'
 // import moment from 'moment'
 export default {
-  name: 'DayReport',
-  components: { ReportHeader, agvStatus, threeDimensionalChart, taskType, taskStatus, realTask, alarm, alarmTop },
-  data() {
-    return {
-      // isFullScreen: false,
-      timer: null,
-      beilv: 1,
-      value: 100,
-      dataList:[]
-    }
-  },
+	name: 'DayReport',
+	components: {
+		ReportHeader,
+		agvStatus,
+		threeDimensionalChart,
+		taskType,
+		taskStatus,
+		realTask,
+		alarm,
+		alarmTop,
+	},
+	data() {
+		return {
+			// isFullScreen: false,
+			timer: null,
+			beilv: 1,
+			value: 100,
+			dataList: [],
+		};
+	},
 
-  created() {
-    // this.init()
-    this.windowWidth(document.documentElement.clientWidth)
-  },
-  computed: {
-    // ...mapGetters(['sidebar']),
-    styles() {
-      const v = Math.floor(this.value * this.beilv * 100) / 10000
-      return {
-        transform: `scale(${v})`,
-        transformOrigin: 'left top'
-        // overflow: hidden;
-      }
-    }
-  },
-  watch: {
-    clientWidth(val) {
-      if (!this.timer) {
-        this.clientWidth = val
-        this.beilv2 = this.clientWidth / 1920
-        this.timer = true
-        let _this = this
-        setTimeout(function () {
-          _this.timer = false
-        }, 500)
-      }
-      // 这里可以添加修改时的方法
-      this.windowWidth(val);
-    }
-  },
-  // beforeDestroy() {
-  //   clearInterval(this.timer)
-  //   this.destroy()
-  // },
-  mounted() {
-    const _this = this;
-    _this.beilv = document.documentElement.clientWidth / 1920
-    window.onresize = () => {
-      return (() => {
-        _this.clientWidth = `${document.documentElement.clientWidth}`
-        this.beilv = _this.clientWidth / 1920
-      })()
-    }
-    this.getData()
-  },
-  methods: {
-    getData(data) {
-      console.log(data);
-      getLineEdgeLibraryList().then((res) => {
-        console.log('res', res);
+	created() {
+		// this.init()
+		this.windowWidth(document.documentElement.clientWidth);
+	},
+	computed: {
+		// ...mapGetters(['sidebar']),
+		styles() {
+			const v = Math.floor(this.value * this.beilv * 100) / 10000;
+			return {
+				transform: `scale(${v})`,
+				transformOrigin: 'left top',
+				// overflow: hidden;
+			};
+		},
+	},
+	watch: {
+		clientWidth(val) {
+			if (!this.timer) {
+				this.clientWidth = val;
+				this.beilv2 = this.clientWidth / 1920;
+				this.timer = true;
+				let _this = this;
+				setTimeout(function () {
+					_this.timer = false;
+				}, 500);
+			}
+			// 这里可以添加修改时的方法
+			this.windowWidth(val);
+		},
+	},
+	// beforeDestroy() {
+	//   clearInterval(this.timer)
+	//   this.destroy()
+	// },
+	mounted() {
+		const _this = this;
+		let baseWidth = 1920;
+		if (this.$route.query.keyword == 'home') {
+			baseWidth = 2180;
+		}
+		_this.beilv = document.documentElement.clientWidth / baseWidth;
+		window.onresize = () => {
+			return (() => {
+				_this.clientWidth = `${document.documentElement.clientWidth}`;
+				this.beilv = _this.clientWidth / baseWidth;
+			})();
+		};
+		this.getData();
+	},
+	methods: {
+		getData(data) {
+			console.log(data);
+			getLineEdgeLibraryList().then((res) => {
+				console.log('res', res);
 
-        this.dataList =res.data
-      })
-    },
-    windowWidth(value) {
-      this.clientWidth = value
-      this.beilv2 = this.clientWidth / 1920
-    },
-    // change() {
-    //   this.isFullScreen = screenfull.isFullscreen
-    // },
-    // init() {
-    //   if (!screenfull.isEnabled) {
-    //     this.$message({
-    //       message: 'you browser can not work',
-    //       type: 'warning'
-    //     })
-    //     return false
-    //   }
-    //   screenfull.on('change', this.change)
-    // },
-    // destroy() {
-    //   if (!screenfull.isEnabled) {
-    //     this.$message({
-    //       message: 'you browser can not work',
-    //       type: 'warning'
-    //     })
-    //     return false
-    //   }
-    //   screenfull.off('change', this.change)
-    // },
-    // // 全屏
-    // screenfullChange() {
-    //   console.log('screenfull.enabled', screenfull.isEnabled);
+				this.dataList = res.data;
+			});
+		},
+		windowWidth(value) {
+			this.clientWidth = value;
+			this.beilv2 = this.clientWidth / 1920;
+		},
+		// change() {
+		//   this.isFullScreen = screenfull.isFullscreen
+		// },
+		// init() {
+		//   if (!screenfull.isEnabled) {
+		//     this.$message({
+		//       message: 'you browser can not work',
+		//       type: 'warning'
+		//     })
+		//     return false
+		//   }
+		//   screenfull.on('change', this.change)
+		// },
+		// destroy() {
+		//   if (!screenfull.isEnabled) {
+		//     this.$message({
+		//       message: 'you browser can not work',
+		//       type: 'warning'
+		//     })
+		//     return false
+		//   }
+		//   screenfull.off('change', this.change)
+		// },
+		// // 全屏
+		// screenfullChange() {
+		//   console.log('screenfull.enabled', screenfull.isEnabled);
 
-    //   if (!screenfull.isEnabled) {
-    //     this.$message({
-    //       message: 'you browser can not work',
-    //       type: 'warning'
-    //     })
-    //     return false
-    //   }
-    //   screenfull.toggle(this.$refs.dayReportB)
-    // },
-    // changeDate(val) {
-    //   this.date = val
-    //   // this.weekDay = this.weekArr[moment(this.date).format('e')]
-    //   // this.getData()
-    //   if (this.date === moment().format('yyyy-MM-DD')) {
-    //     this.loopTime()
-    //   } else {
-    //     clearInterval(this.timer)
-    //   }
-    // },
-    // 导出
-    // exportPDF() {
-    //   this.$message.success('正在导出，请稍等！')
-    //   const element = document.getElementById('dayRepDom')
-    //   element.style.display = 'block'
-    //   const fileName = '株洲碲化镉生产日报' + moment().format('yyMMDD') + '.pdf'
-    //   html2canvas(element, {
-    //     dpi: 300, // Set to 300 DPI
-    //     scale: 3 // Adjusts your resolution
-    //   }).then(function(canvas) {
-    //     const imgWidth = 595.28
-    //     const imgHeight = 841.89
-    //     const pageData = canvas.toDataURL('image/jpeg', 1.0)
-    //     const PDF = new JsPDF('', 'pt', [imgWidth, imgHeight])
-    //     PDF.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight)
-    //     setTimeout(() => {
-    //       PDF.save(fileName) // 导出文件名
-    //     }, 1000)
-    //   })
-    //   element.style.display = 'none'
-    // }
-  }
-}
+		//   if (!screenfull.isEnabled) {
+		//     this.$message({
+		//       message: 'you browser can not work',
+		//       type: 'warning'
+		//     })
+		//     return false
+		//   }
+		//   screenfull.toggle(this.$refs.dayReportB)
+		// },
+		// changeDate(val) {
+		//   this.date = val
+		//   // this.weekDay = this.weekArr[moment(this.date).format('e')]
+		//   // this.getData()
+		//   if (this.date === moment().format('yyyy-MM-DD')) {
+		//     this.loopTime()
+		//   } else {
+		//     clearInterval(this.timer)
+		//   }
+		// },
+		// 导出
+		// exportPDF() {
+		//   this.$message.success('正在导出，请稍等！')
+		//   const element = document.getElementById('dayRepDom')
+		//   element.style.display = 'block'
+		//   const fileName = '株洲碲化镉生产日报' + moment().format('yyMMDD') + '.pdf'
+		//   html2canvas(element, {
+		//     dpi: 300, // Set to 300 DPI
+		//     scale: 3 // Adjusts your resolution
+		//   }).then(function(canvas) {
+		//     const imgWidth = 595.28
+		//     const imgHeight = 841.89
+		//     const pageData = canvas.toDataURL('image/jpeg', 1.0)
+		//     const PDF = new JsPDF('', 'pt', [imgWidth, imgHeight])
+		//     PDF.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight)
+		//     setTimeout(() => {
+		//       PDF.save(fileName) // 导出文件名
+		//     }, 1000)
+		//   })
+		//   element.style.display = 'none'
+		// }
+	},
+};
 </script>
 <style scoped lang="scss">
 .dayReport {
-  width: 1920px;
-  height: 1080px;
-  background: #F2F4F9;
-  // background-size: cover;
+	width: 1920px;
+	height: 1080px;
+	background: #f2f4f9;
+	// background-size: cover;
 }
 </style>
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/src/views/taskCenter/taskList/components/add-or-updata.vue b/src/views/taskCenter/taskList/components/add-or-updata.vue
index e0c75ee0..f00c99ea 100644
--- a/src/views/taskCenter/taskList/components/add-or-updata.vue
+++ b/src/views/taskCenter/taskList/components/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-13 15:07:24
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-07 15:35:14
+ * @LastEditTime: 2025-11-20 14:47:37
  * @Description:
 -->
 <template>
@@ -45,52 +45,48 @@
 				label-width="80px">
 				<el-row :gutter="10">
 					<el-col :span="6">
-						<el-form-item label="搬运对象" prop="val1">
+						<el-form-item label="任务类型" prop="mainTaskType">
 							<el-select
 								style="width: 100%"
-								v-model="dataForm.val1"
-								placeholder="请选择搬运对象">
+								v-model="dataForm.mainTaskType"
+								placeholder="请选择任务类型">
 								<el-option
-									v-for="item in options1"
+									v-for="item in options0"
 									: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-col :span="6" v-if="dataForm.mainTaskType !== 2">
+						<el-form-item label="产品名称" prop="productId">
 							<el-select
 								style="width: 100%"
-								v-model="dataForm.val2"
+								v-model="dataForm.productId"
+								@change="setMaterial"
 								placeholder="请选择产品名称">
 								<el-option
-									v-for="item in options1"
-									:key="item.value"
-									:label="item.label"
-									:value="item.value"></el-option>
+									v-for="item in productArr"
+									:key="item.id"
+									:label="item.materialName"
+									:value="item.id"></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-col :span="6" v-if="dataForm.mainTaskType !== 2">
+						<el-form-item label="规格型号">
+							<el-input
+								readonly
+								v-model="dataForm.material"
+								placeholder="规格型号"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="搬运数量" prop="val4">
+						<el-form-item label="搬运数量" prop="quantity">
 							<el-input
-								v-model="dataForm.val4"
-								oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+								v-model="dataForm.quantity"
+								@blur="validateNumber"
+								placeholder="请输入正整数且为双数">
 								<template slot="append">盘</template>
 							</el-input>
 						</el-form-item>
@@ -101,67 +97,11 @@
 						<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">
@@ -174,17 +114,206 @@
 			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
 				步骤二：选择终点
 			</small-title>
+			<div class="potBG-div">
+				<div>
+					<el-row :gutter="10">
+						<el-col :span="10">
+							终点库区:
+							<el-select
+								style="width: 300px; margin-left: 10px"
+								v-model="endPot"
+								size="small"
+								@change="getEndPot"
+								placeholder="请选择终点库区">
+								<el-option
+									v-for="item in regionArr"
+									: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 free" />
+							空盘
+							<span class="num1-startPot-status full" />
+							满盘
+							<span class="num1-startPot-status unavailable" />
+							不可用
+							<span class="num1-startPot-status locked" />
+							锁定
+						</el-col>
+					</el-row>
+					<div class="potTitleBG">
+						<div v-for="item in Object.keys(PotList)" :key="item">
+							<div class="potTitle">
+								{{ item }}
+							</div>
+							<div class="potList">
+								<div
+									class="pot"
+									v-for="sitem in PotList[item]"
+									:key="sitem.id"
+									:class="
+										sitem.usableState == 1
+											? sitem.lineEdgeLibraryState == 1
+												? 'full'
+												: 'free'
+											: sitem.usableState == 2
+											? 'unavailable'
+											: 'locked'
+									"
+									@click="
+										sitem.usableState == 1 &&
+											sitem.lineEdgeLibraryState == 0 &&
+											setStartPot(sitem)
+									"
+									:title="sitem.lineEdgeLibraryName">
+									{{ sitem.lineEdgeLibraryCode }}
+								</div>
+							</div>
+						</div>
+					</div>
+					<el-divider></el-divider>
+					<div style="text-align: right">
+						搬运数量
+						<span style="color: #409eff; font-size: 16px">
+							{{ dataForm.quantity }}
+						</span>
+						盘 可用库位
+						<span style="color: #409eff; font-size: 16px">{{ stockNum }}</span>
+						个
+						<span
+							v-if="dataForm.quantity > stockNum"
+							style="color: #e6a23c; font-size: 16px">
+							<i class="el-icon-warning"></i>
+							请注意搬运数量超过可用库位
+						</span>
+					</div>
+				</div>
+			</div>
 		</div>
 		<div v-if="stepNum == 3">
 			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
 				步骤三：预览与下发
 			</small-title>
+			<el-row :gutter="20">
+				<el-col :span="24">
+					<div
+						style="
+							margin: 10px 0;
+							font-size: 14px;
+							font-weight: 500;
+							color: black;
+						">
+						搬运对象
+					</div>
+				</el-col>
+				<el-col :span="6">
+					搬运对象：{{ dataForm.mainTaskType !== 2 ? '产品' : '空盘' }}
+				</el-col>
+				<el-col :span="6" v-if="dataForm.mainTaskType !== 2">
+					产品名称：
+					{{ productArr.find((i) => i.id === dataForm.productId).materialName }}
+				</el-col>
+				<el-col :span="6" v-if="dataForm.mainTaskType !== 2">
+					规格型号：
+					{{ productArr.find((i) => i.id === dataForm.productId).material }}
+				</el-col>
+				<el-col :span="6">搬运数量：{{ dataForm.quantity + ' 盘' }}</el-col>
+				<el-col :span="24">
+					<div
+						style="
+							margin: 10px 0;
+							font-size: 14px;
+							font-weight: 500;
+							color: black;
+						">
+						起点信息
+					</div>
+				</el-col>
+				<el-col :span="24">按策略自动选择</el-col>
+			</el-row>
+			<div>
+				<el-row :gutter="10">
+					<el-col :span="24">
+						<div
+							style="
+								margin: 10px 0;
+								font-size: 14px;
+								font-weight: 500;
+								color: black;
+							">
+							终点信息
+						</div>
+					</el-col>
+					<el-col :span="10">
+						库区：{{ regionArr.find((i) => i.value === endPot).label }}
+					</el-col>
+				</el-row>
+				<div class="potTitleBG">
+					<div v-for="item in Object.keys(PotList)" :key="item">
+						<div class="potTitle">
+							{{ item }}
+						</div>
+						<div class="potList">
+							<div
+								class="pot"
+								v-for="sitem in PotList[item]"
+								:key="sitem.id"
+								:class="
+									sitem.usableState == 1
+										? sitem.lineEdgeLibraryState == 1
+											? 'full'
+											: 'free'
+										: sitem.usableState == 2
+										? 'unavailable'
+										: 'locked'
+								"
+								:title="sitem.lineEdgeLibraryName">
+								{{ sitem.lineEdgeLibraryCode }}
+							</div>
+						</div>
+					</div>
+				</div>
+				<el-row :gutter="10">
+					<el-col :span="24">
+						<div
+							style="
+								margin: 10px 0;
+								font-size: 14px;
+								font-weight: 500;
+								color: black;
+							">
+							任务信息
+						</div>
+					</el-col>
+					<el-col :span="8">
+						任务类型：{{ options0[dataForm.mainTaskType - 1].label }}
+					</el-col>
+					<el-col :span="8">任务数量：{{ dataForm.quantity / 2 }}</el-col>
+					<el-col :span="8">
+						本批次任务优先级：
+						<el-select
+							size="small"
+							v-model="taskPriority"
+							placeholder="请选择优先级">
+							<el-option
+								v-for="item in options2"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"></el-option>
+						</el-select>
+					</el-col>
+				</el-row>
+			</div>
 		</div>
 	</div>
 </template>
 
 <script>
 import SmallTitle from './SmallTitle';
+import { getRegion, createPCTask } from '@/api/ssdl/taskList';
+import { getProductPage } from '@/api/ssdl/product&recipe';
 export default {
 	components: {
 		SmallTitle,
@@ -207,72 +336,123 @@ export default {
 			//第一步参数
 			dataForm: {
 				id: undefined,
-				val1: undefined,
-				val2: undefined,
-				val3: undefined,
-				val4: undefined,
+				mainTaskType: undefined,
+				productId: undefined,
+				materialName: '', // 物料名称
+				materialCode: '', // 物料编码
+				material: undefined,
+				quantity: undefined,
 				val5: 1,
 			},
-			options1: [
+			productArr: [],
+			options0: [
 				{
-					label: '产品',
+					label: '满盘搬运',
 					value: 1,
 				},
 				{
-					label: '空盘',
+					label: '空盘搬运',
 					value: 2,
 				},
+				{
+					label: '备货搬运',
+					value: 3,
+				},
 			],
-			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,
-					},
+			options2: [
+				{
+					label: '最高',
+					value: 0,
+				},
+				{
+					label: '较高',
+					value: 1,
+				},
+				{
+					label: '常规',
+					value: 2,
+				},
+				{
+					label: '较低',
+					value: 3,
+				},
+				{
+					label: '最低',
+					value: 4,
+				},
+			],
+			dataRule: {
+				mainTaskType: [
+					{ required: true, message: '任务类型不能为空', trigger: 'change' },
 				],
-				G02: [
-					{
-						id: '005',
-						name: 'L005',
-					},
-					{
-						id: '006',
-						name: 'R006',
-					},
-					{
-						id: '007',
-						name: 'L007',
-					},
-					{
-						id: '008',
-						name: 'R008',
-					},
+				productId: [
+					{ required: true, message: '产品名称不能为空', trigger: 'change' },
+				],
+				quantity: [
+					{ required: true, message: '搬运数量不能为空', trigger: 'blur' },
 				],
 			},
+			endPot: 7, //起点库区选择的类型，进来默认第一个
+			PotList: {},
+			//第二步参数
+			regionArr: [
+				{
+					label: '框绞1号线设备1满盘缓存区',
+					value: 7,
+				},
+				{
+					label: '框绞1号线设备2满盘缓存区',
+					value: 8,
+				},
+				{
+					label: '框绞1号线设备3满盘缓存区',
+					value: 9,
+				},
+				{
+					label: '框绞1号线设备4满盘缓存区',
+					value: 10,
+				},
+				{
+					label: '框绞3号线设备1满盘缓存区',
+					value: 11,
+				},
+				{
+					label: '框绞3号线设备2满盘缓存区',
+					value: 12,
+				},
+				{
+					label: '框绞3号线设备3满盘缓存区',
+					value: 13,
+				},
+				{
+					label: '框绞3号线设备4满盘缓存区',
+					value: 14,
+				},
+				{
+					label: '框绞2号线设备1满盘缓存区',
+					value: 15,
+				},
+				{
+					label: '框绞2号线设备2满盘缓存区',
+					value: 16,
+				},
+				{
+					label: '框绞2号线设备3满盘缓存区',
+					value: 17,
+				},
+			],
+			stockNum: 0, //可用库位数
+			taskPriority: 2, //优先级
 		};
 	},
 	methods: {
 		init(id) {
 			this.dataForm.id = id || undefined;
+			this.stepNum = 1;
+			this.$emit('setSN', this.stepNum);
+			getProductPage({ pageNo: 1, pageSize: 100 }).then((res) => {
+				this.productArr = res.data.list;
+			});
 			this.$nextTick(() => {
 				if (this.dataForm.id) {
 				} else {
@@ -292,11 +472,21 @@ export default {
 		//下一步
 		nextSubmit() {
 			if (this.stepNum == 1) {
-				this.stepNum += 1;
-				this.$emit('setSN', this.stepNum);
-				return;
+				this.$refs['dataForm'].validate((valid) => {
+					if (!valid) {
+						return false;
+					}
+					this.stepNum += 1;
+					this.getEndPot();
+					this.$emit('setSN', this.stepNum);
+					return;
+				});
 			}
 			if (this.stepNum == 2) {
+				if (this.dataForm.quantity > this.stockNum) {
+					this.$message('请注意搬运数量超过可用库位');
+					return;
+				}
 				this.stepNum += 1;
 				this.$emit('setSN', this.stepNum);
 				return;
@@ -309,10 +499,50 @@ export default {
 		},
 		cancelStep() {},
 
-		// 第一步方法
-		setStartPot(data) {
-			data.status = data.status == 1 ? 2 : 1;
+		validateNumber() {
+			const value = this.dataForm.quantity;
+
+			// 校验正整数且为双数
+			if (!/^[1-9]\d*$/.test(value) || value % 2 !== 0) {
+				this.$message.error('请输入正整数且为双数');
+				this.dataForm.quantity = '';
+				return false;
+			}
+
+			return true;
 		},
+		setMaterial() {
+      const data = this.productArr.find((i) => i.id === this.dataForm.productId)
+			this.dataForm.materialName = data.materialName
+			this.dataForm.materialCode = data.materialCode
+			this.dataForm.material = data.material
+		},
+		// 获取终点库区
+		getEndPot() {
+			this.PotList = {};
+			this.stockNum = 0;
+			getRegion(this.endPot).then((res) => {
+				res.data.forEach((item) => {
+					if (item.lineEdgeLibraryState == 0 && item.usableState == 1) {
+						this.stockNum += 1;
+					}
+				});
+				//提取巷道
+				let xiangdaoArr = res.data.map((item) =>
+					item.bindGroupId.substring(0, 5)
+				);
+				//提取去重
+				xiangdaoArr = [...new Set(xiangdaoArr)];
+				//巷道为对象名，巷道内库位赋给巷道
+				xiangdaoArr.forEach((objName) => {
+					const stockArr = res.data.filter((item) => {
+						if (item.bindGroupId.substring(0, 5) == objName) return item;
+					});
+					this.$set(this.PotList, objName, stockArr);
+				});
+			});
+		},
+		setStartPot(data) {},
 	},
 };
 </script>
@@ -347,7 +577,7 @@ export default {
 	display: flex;
 }
 .potTitle {
-	width: 82px;
+	width: 190px;
 	background-color: rgb(169, 235, 249);
 	border-radius: 3px;
 	margin-right: 5px;
@@ -355,17 +585,19 @@ export default {
 	color: #000000;
 	letter-spacing: 1px;
 	margin-bottom: 10px;
+	font-size: 16px;
 }
 .potList {
-	width: 82px;
+	width: 190px;
 	display: grid;
-	grid-template-columns: 40px 40px;
-	gap: 2px;
+	grid-template-columns: 90px 90px;
+	gap: 8px;
 }
 .pot {
-	width: 40px;
+	width: 90px;
 	text-align: center;
 	border: 1px solid gainsboro;
+	color: black;
 	border-radius: 3px;
 	padding: 5px 0;
 	margin-bottom: 5px;
@@ -373,6 +605,29 @@ export default {
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
+/* 空闲状态 */
+.free {
+	background-color: #edf7ff;
+	border: 1px solid #57a5f4;
+}
+
+/* 满位状态 */
+.full {
+	background-color: #fff1d4;
+	border: 1px solid #f8b881;
+}
+
+/* 不可用状态 */
+.unavailable {
+	background-color: #e9e8e8;
+	border: 1px solid #b4b4b4;
+}
+
+/* 锁定状态 */
+.locked {
+	background-color: #e8d7ff;
+	border: 1px solid #722ed1;
+}
 </style>
 
 <!-- //序号圆点 -->
@@ -433,7 +688,7 @@ export default {
 }
 
 .connector {
-	width: 160px; /* 计算连接线长度 */
+	width: 220px; /* 计算连接线长度 */
 	height: 2px;
 	border-bottom: 1px dashed rgb(11, 88, 255, 1);
 	margin: 0 5px;
diff --git a/src/views/taskCenter/taskList/components/detailDrawer.vue b/src/views/taskCenter/taskList/components/detailDrawer.vue
index f98e25a9..524a0ce2 100644
--- a/src/views/taskCenter/taskList/components/detailDrawer.vue
+++ b/src/views/taskCenter/taskList/components/detailDrawer.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-11-07 17:01:51
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-07 22:31:17
+ * @LastEditTime: 2025-11-17 15:47:16
  * @Description:
 -->
 <template>
@@ -15,11 +15,20 @@
 		<div class="bgDiv1">
 			<el-row :gutter="20" style="margin-bottom: 15px">
 				<el-col :span="8" style="font-size: 20px; font-weight: 600">
-					TSK202510230001
+					{{ infoData.mainTaskCode }}
 				</el-col>
-				<el-col :span="8">满盘搬运（自动）</el-col>
 				<el-col :span="8">
-					上次刷新：{{ parseTime(Date.now()) }}
+					{{
+						['', '满盘搬运', '空盘搬运', '备料搬运', '临时搬运'][
+							infoData.mainTaskType
+						] +
+						'(' +
+						['', '自动', '人工'][infoData.taskAttribute] +
+						')'
+					}}
+				</el-col>
+				<el-col :span="8">
+					上次刷新：{{ parseTime(nowDate) }}
 					<el-button type="text" @click="refresh">刷新</el-button>
 				</el-col>
 			</el-row>
@@ -31,23 +40,25 @@
 			<el-row :gutter="20" style="margin-bottom: 15px">
 				<el-col :span="8">
 					<span
-						:style="{ backgroundColor: statusColor[1].color }"
+						:style="{
+							backgroundColor: statusColor[infoData.mainTaskState].color,
+						}"
 						class="taskStatus">
-						{{ statusColor[1].label }}
+						{{ statusColor[infoData.mainTaskState].label }}
 					</span>
 				</el-col>
-				<el-col :span="8">中</el-col>
-				<el-col :span="8">--</el-col>
+				<el-col :span="8">
+					{{ ['最高', '较高', '常规', '较低', '最低'][infoData.taskPriority] }}
+				</el-col>
+				<el-col :span="8">{{ infoData.agv }}</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-col :span="8">{{ infoData.creator }}</el-col>
+				<el-col :span="8">{{ parseTime(infoData.createTime) }}</el-col>
 			</el-row>
 		</div>
 		<div class="bgDiv2">
@@ -61,7 +72,9 @@
 				<el-step title="执行中"></el-step>
 				<el-step title="已完成"></el-step>
 			</el-steps>
-			<div class="abnormal">任务异常：无效路径</div>
+			<div class="abnormal" v-if="infoData.mainTaskState == 7">
+				任务异常：无效路径
+			</div>
 		</div>
 		<div class="bgDiv3">
 			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
@@ -71,16 +84,72 @@
 				<el-col :span="12">
 					<div class="pan-info">
 						<div class="pan-title">L盘</div>
+						<div class="pan-body">
+							<el-row :gutter="15">
+								<el-col :span="12">物料名称</el-col>
+								<el-col :span="12">物料规格</el-col>
+								<el-col :span="12" style="color: black">
+									{{ infoData.leftMaterialName }}
+								</el-col>
+								<el-col :span="12" style="color: black">
+									{{ infoData.leftMaterial }}
+								</el-col>
+								<el-col :span="12">物料编码</el-col>
+								<el-col :span="12">批次</el-col>
+								<el-col :span="12" style="color: black">
+									{{ infoData.leftMaterialCode }}
+								</el-col>
+								<el-col :span="12" style="color: black">
+									{{ infoData.leftBatch }}
+								</el-col>
+								<el-col :span="12">线缆长度</el-col>
+								<el-col :span="12">虚拟盘号</el-col>
+								<el-col :span="12" style="color: black">
+									{{ infoData.leftCableLength }}
+								</el-col>
+								<el-col :span="12" style="color: black">
+									{{ infoData.leftVirtualTrayNumber }}
+								</el-col>
+							</el-row>
+						</div>
 					</div>
 				</el-col>
 				<el-col :span="12">
 					<div class="pan-info">
 						<div class="pan-title">R盘</div>
+						<div class="pan-body">
+							<el-row :gutter="15">
+								<el-col :span="12">物料名称</el-col>
+								<el-col :span="12">物料规格</el-col>
+								<el-col :span="12" style="color: black">
+									{{ infoData.rightMaterialName }}
+								</el-col>
+								<el-col :span="12" style="color: black">
+									{{ infoData.rightMaterial }}
+								</el-col>
+								<el-col :span="12">物料编码</el-col>
+								<el-col :span="12">批次</el-col>
+								<el-col :span="12" style="color: black">
+									{{ infoData.rightMaterialCode }}
+								</el-col>
+								<el-col :span="12" style="color: black">
+									{{ infoData.rightBatch }}
+								</el-col>
+								<el-col :span="12">线缆长度</el-col>
+								<el-col :span="12">虚拟盘号</el-col>
+								<el-col :span="12" style="color: black">
+									{{ infoData.rightCableLength }}
+								</el-col>
+								<el-col :span="12" style="color: black">
+									{{ infoData.rightVirtualTrayNumber }}
+								</el-col>
+							</el-row>
+						</div>
 					</div>
 				</el-col>
 			</el-row>
 		</div>
-		<div class="bgDiv4">
+		<div class="bgDiv4" v-if="false">
 			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
 				回收信息
 			</small-title>
@@ -100,95 +169,101 @@
 				任务明细
 			</small-title>
 			<el-descriptions :column="2" size="medium" border>
-				<el-descriptions-item label="起点库位(L/R)">
-					CK-01-A05-L / R
+				<el-descriptions-item label="起点库位( L )(候选)">
+					{{ infoData.leftLibraryStartName }}
 				</el-descriptions-item>
-				<el-descriptions-item label="终点库位(L/R)">
-					CC-02-B03-L/R (候选 )
+				<el-descriptions-item label="终点库位( L )(候选)">
+					{{ infoData.leftLibraryEndName }}
 				</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 label="起点库位( R )(候选)">
+					{{ infoData.rightLibraryStartName }}
+				</el-descriptions-item>
+				<el-descriptions-item label="终点库位( R )(候选)">
+					{{ infoData.rightLibraryEndName }}
+				</el-descriptions-item>
+
+				<el-descriptions-item
+					label="起点库位( L )"
+					:labelStyle="{ background: '#f1ffe9' }">
+					{{ infoData.changeLeftLibraryStartName }}
+				</el-descriptions-item>
+				<el-descriptions-item
+					label="终点库位( L )"
+					:labelStyle="{ background: '#f1ffe9' }">
+					{{ infoData.changeLeftLibraryEndName }}
+				</el-descriptions-item>
+				<el-descriptions-item
+					label="起点库位( R )"
+					:labelStyle="{ background: '#f1ffe9' }">
+					{{ infoData.changeRightLibraryStartName }}
+				</el-descriptions-item>
+				<el-descriptions-item
+					label="终点库位( R )"
+					:labelStyle="{ background: '#f1ffe9' }">
+					{{ infoData.changeRightLibraryEndName }}
 				</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 class="timelineDiv">
+				<el-timeline style="padding: 0">
+					<el-timeline-item
+						v-for="(activity, index) in activities"
+						:key="index"
+						:type="index == 0 ? 'primary' : ''"
+						:color="activity.color"
+						size="large"
+						hide-timestamp>
+						<span>
+							{{ activity.triggerObject + ' | ' + activity.description }}
+						</span>
+						<span style="float: right">
+							{{ parseTime(activity.createTime) }}
+						</span>
+					</el-timeline-item>
+				</el-timeline>
+			</div>
 		</div>
-						<el-divider></el-divider>
+		<el-divider></el-divider>
 
-      <!-- 底部按钮 -->
-			<div class="drawer-body__footer">
-        <el-button @click="closeD">返 回</el-button>
-      </div>
+		<!-- 底部按钮 -->
+		<div class="drawer-body__footer">
+			<el-button @click="closeD">返 回</el-button>
+		</div>
 	</el-drawer>
 </template>
 <script>
 import SmallTitle from './SmallTitle';
+import { getTask, getTaskLogPage } from '@/api/ssdl/taskList';
 
 export default {
 	name: '',
 	data() {
 		return {
 			visible: false,
-			title: '',
+			infoID: '',
+			infoData: '',
 			statusColor: [
 				//bgDiv1的任务状态
 				{ label: '待下发', color: '#fa8c16' },
 				{ label: '待执行', color: '#1890ff' },
 				{ label: '执行中', color: '#1890ff' },
+				{ label: '取货完成', color: '#52c41a' },
 				{ label: '已完成', color: '#52c41a' },
 				{ label: '暂停中', color: '#8c8c8c' },
 				{ label: '已终止', color: '#faad14' },
 				{ label: '异常', color: '#ff4d4f' },
-				{ label: '禁用', color: '#d9d9d9' },
 			],
+			nowDate: Date.now(),
 			//bgDiv2的步骤条
-			stepNum: 2,
+			stepNum: 0,
 			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',
-				},
-			],
+			activities: [],
 		};
 	},
 	components: {
@@ -196,13 +271,37 @@ export default {
 	},
 	created() {},
 	methods: {
-		init(val) {
+		init(id) {
 			this.visible = true;
+			this.infoID = id;
+			this.$nextTick(() => {
+				this.getInfoData();
+			});
+		},
+		getInfoData() {
+			getTask(this.infoID).then(({ data }) => {
+				this.infoData = data;
+				if (data.mainTaskState < 3) {
+					this.stepNum = data.mainTaskState;
+				} else if (data.mainTaskState == 4) {
+					this.stepNum = 3;
+				}
+				getTaskLogPage({
+					mainTaskId: this.infoID,
+					pageNo: 1,
+					pageSize: 100,
+				}).then(({ data }) => {
+					this.activities = data.list.sort((a, b) => a.timestamp - b.timestamp);
+				});
+			});
 		},
 		//刷新
-		refresh() {},
+		refresh() {
+			this.nowDate = Date.now();
+			this.getInfoData();
+		},
 		closeD() {
-      this.visible = false
+			this.visible = false;
 			this.$emit('closeDrawer');
 		},
 	},
@@ -211,11 +310,10 @@ export default {
 
 <style lang="scss" scoped>
 .bgDiv1 {
-	background-color: rgba(242, 242, 242, 0.5);
+	background-color: #f1f9ff;
 	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;
@@ -224,8 +322,18 @@ export default {
 	}
 }
 .bgDiv2 {
-	border-bottom: 1px solid rgba(121, 121, 121, 0.5);
 	padding: 18px 0;
+	background-image: linear-gradient(
+		to right,
+		transparent 0%,
+		#c5c5c5 10%,
+		#c5c5c5 90%,
+		transparent 100%
+	);
+	background-position: bottom;
+	background-size: 100% 1px;
+	background-repeat: no-repeat;
+	padding-bottom: 1px;
 	.abnormal {
 		width: 80%;
 		margin: auto;
@@ -242,11 +350,12 @@ export default {
 .bgDiv3 {
 	padding: 20px 20px 0;
 	.pan-info {
-		height: 350px;
+		height: 200px;
 		border: 1px solid rgba(121, 121, 121, 0.8);
 		border-radius: 5px;
 		.pan-title {
-			background-color: rgba(242, 242, 242, 0.5);
+			background-color: #d8eeff;
+			border-radius: 5px;
 			height: 35px;
 			font-size: 20px;
 			line-height: 35px;
@@ -254,6 +363,11 @@ export default {
 			border-bottom: 1px solid rgba(121, 121, 121, 0.5);
 			letter-spacing: 2px;
 		}
+		.pan-body {
+			padding: 15px;
+			font-size: 16px;
+			color: rgba(121, 121, 121, 1);
+		}
 	}
 }
 .bgDiv4 {
@@ -264,6 +378,11 @@ export default {
 }
 .bgDiv6 {
 	padding: 20px 20px 0;
+	.timelineDiv {
+		padding: 5px;
+		height: 400px;
+		overflow-y: auto;
+	}
 }
 .drawer-body__footer {
 	display: flex;
diff --git a/src/views/taskCenter/taskList/components/subSpan1.vue b/src/views/taskCenter/taskList/components/subSpan1.vue
index 931ecb10..5740345d 100644
--- a/src/views/taskCenter/taskList/components/subSpan1.vue
+++ b/src/views/taskCenter/taskList/components/subSpan1.vue
@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2025-10-13 16:18:41
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-06 15:19:24
+ * @LastEditTime: 2025-11-17 09:28:31
  * @Description:
 -->
 <template>
 	<span>
 		{{
-			(injectData.val2
-				? ['满盘搬运', '空盘搬运', '备料搬运', '临时搬运'][injectData.val2]
+			(injectData.mainTaskType
+				? ['','满盘搬运', '空盘搬运', '备料搬运', '临时搬运'][injectData.mainTaskType]
 				: '-')
 		}}
 	</span>
diff --git a/src/views/taskCenter/taskList/components/subSpan2.vue b/src/views/taskCenter/taskList/components/subSpan2.vue
index 6519543c..8683388e 100644
--- a/src/views/taskCenter/taskList/components/subSpan2.vue
+++ b/src/views/taskCenter/taskList/components/subSpan2.vue
@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2025-10-13 16:18:41
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-06 15:20:43
+ * @LastEditTime: 2025-11-17 11:11:56
  * @Description:
 -->
 <template>
 	<span>
 		{{
-			(injectData.val3
-				? ['待下发', '待执行', '执行中', '已完成', '暂停中', '已终止', '异常'][injectData.val3]
+			(injectData.mainTaskState
+				? ['待下发', '待执行', '执行中', '取货完成','已完成', '暂停中', '终止', '异常'][injectData.mainTaskState]
 				: '-')
 		}}
 	</span>
diff --git a/src/views/taskCenter/taskList/components/subSpan3.vue b/src/views/taskCenter/taskList/components/subSpan3.vue
index 00322b68..6b86d4ef 100644
--- a/src/views/taskCenter/taskList/components/subSpan3.vue
+++ b/src/views/taskCenter/taskList/components/subSpan3.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-13 16:18:41
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-06 15:37:02
+ * @LastEditTime: 2025-11-17 14:35:35
  * @Description:
 -->
 <template>
@@ -16,11 +16,14 @@
 					background-color: #e89b24;
 					color: #fff;
           text-align:center;
-          line-height:16px
+          line-height:16px;
+          margin-right:5px
 				">
 				L
 			</div>
-			产品名称+产品规格
+      <span v-if="injectData.prop==='val4'">{{injectData.leftMaterialName+'-'+injectData.leftMaterialCode}}</span>
+      <span v-else-if="injectData.prop==='val5'">{{injectData.leftLibraryStartName}}</span>
+      <span v-else-if="injectData.prop==='val6'">{{injectData.leftLibraryStartName}}</span>
 		</div>
 		<div style="display: flex; align-items: center">
 			<div
@@ -31,11 +34,14 @@
 					background-color: #6a96ec;
 					color: #fff;
           text-align:center;
-          line-height:16px
+          line-height:16px;
+          margin-right:5px
 				">
 				R
 			</div>
-			产品名称+产品规格
+      <span v-if="injectData.prop==='val4'">{{injectData.rightMaterialName+'-'+injectData.rightMaterialCode}}</span>
+      <span v-else-if="injectData.prop==='val5'">{{injectData.rightLibraryStartName}}</span>
+      <span v-else-if="injectData.prop==='val6'">{{injectData.rightLibraryEndName}}</span>
 		</div>
 	</div>
 </template>
@@ -51,7 +57,8 @@ export default {
 	data() {
 		return {};
 	},
-	created() {},
+	created() {
+  },
 	methods: {},
 };
 </script>
diff --git a/src/views/taskCenter/taskList/components/subSpan4.vue b/src/views/taskCenter/taskList/components/subSpan4.vue
index 931ecb10..fc94d4e5 100644
--- a/src/views/taskCenter/taskList/components/subSpan4.vue
+++ b/src/views/taskCenter/taskList/components/subSpan4.vue
@@ -2,15 +2,13 @@
  * @Author: zwq
  * @Date: 2025-10-13 16:18:41
  * @LastEditors: zwq
- * @LastEditTime: 2025-11-06 15:19:24
+ * @LastEditTime: 2025-11-17 09:32:07
  * @Description:
 -->
 <template>
 	<span>
 		{{
-			(injectData.val2
-				? ['满盘搬运', '空盘搬运', '备料搬运', '临时搬运'][injectData.val2]
-				: '-')
+			injectData.agv
 		}}
 	</span>
 </template>
diff --git a/src/views/taskCenter/taskList/components/subSpan5.vue b/src/views/taskCenter/taskList/components/subSpan5.vue
new file mode 100644
index 00000000..810bbb68
--- /dev/null
+++ b/src/views/taskCenter/taskList/components/subSpan5.vue
@@ -0,0 +1,82 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-11-17 16:17:21
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-17 16:30:28
+ * @Description:
+-->
+<template>
+	<el-popover placement="top" trigger="click" v-model="visible">
+    优先级
+		<el-select v-model="priority" placeholder="请选择优先级">
+			<el-option
+				v-for="item in priorityArr"
+				:key="item.value"
+				:label="item.label"
+				:value="item.value"></el-option>
+		</el-select>
+		<div style="text-align: right; margin: 10px 10px 0">
+			<el-button size="mini" type="text" @click="visible = false">
+				取消
+			</el-button>
+			<el-button type="primary" size="mini" @click="changePriority">
+				确定
+			</el-button>
+		</div>
+		<el-button slot="reference" type="text">
+			{{ ['最高', '较高', '常规', '较低', '最低'][injectData.taskPriority] }}
+		</el-button>
+	</el-popover>
+</template>
+
+<script>
+import { updateTask } from '@/api/ssdl/taskList';
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {
+			list: this.injectData,
+			visible: false,
+			priorityArr: [
+				{
+					value: 0,
+					label: '最高',
+				},
+				{
+					value: 1,
+					label: '较高',
+				},
+				{
+					value: 2,
+					label: '常规',
+				},
+				{
+					value: 3,
+					label: '较低',
+				},
+				{
+					value: 4,
+					label: '最低',
+				},
+			],
+			priority: '',
+		};
+	},
+	created() {},
+	methods: {
+		changePriority() {
+			const data = { ...this.injectData, taskPriority: this.priority };
+			updateTask(data).then((res) => {
+				this.$modal.msgSuccess('修改成功');
+        this.visible = false
+				this.$emit('emitData');
+			});
+		},
+	},
+};
+</script>
diff --git a/src/views/taskCenter/taskList/index.vue b/src/views/taskCenter/taskList/index.vue
index 943d749d..96c9e0e1 100644
--- a/src/views/taskCenter/taskList/index.vue
+++ b/src/views/taskCenter/taskList/index.vue
@@ -4,10 +4,9 @@
 			<search-bar
 				:formConfigs="formConfig"
 				ref="searchBarForm"
-				:isFold="true"
 				@headBtnClick="buttonClick" />
 			<div style="font-size: 14px">
-				自动刷新(5s)
+				自动刷新(10s)
 				<el-switch v-model="autoRefresh"></el-switch>
 			</div>
 		</div>
@@ -17,11 +16,12 @@
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
 			:max-height="tableH"
-			:table-data="tableData">
+			:table-data="tableData"
+			@emitFun="getDataList">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="260"
+				:width="100"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -61,21 +61,12 @@
 								@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 ? '下一步' : '创建并下发' }}
+								{{ stepNum < 3 ? '下一步' : '创建任务' }}
 							</el-button>
 						</el-col>
 					</el-row>
@@ -106,29 +97,31 @@ import subSpan1 from './components/subSpan1.vue';
 import subSpan2 from './components/subSpan2.vue';
 import subSpan3 from './components/subSpan3.vue';
 import subSpan4 from './components/subSpan4.vue';
+import subSpan5 from './components/subSpan5.vue';
 import detailDrawer from './components/detailDrawer.vue';
-import stopInStock from './components/stopInStock.vue'
+import stopInStock from './components/stopInStock.vue';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import { parseTime } from '@/filter/code-filter';
+import { getTaskPage } from '@/api/ssdl/taskList';
 
 const tableProps = [
 	{
-		prop: 'code',
+		prop: 'mainTaskCode',
 		label: '任务编号',
 		width: 140,
 	},
 	{
-		prop: 'val1',
+		prop: 'taskAttribute',
 		label: '创建方式',
-		filter: (val) => (val ? ['自动', '人工'][val] : '-'),
+		filter: (val) => (val ? ['', '自动', '人工'][val] : '-'),
 	},
 	{
-		prop: 'val2',
+		prop: 'mainTaskType',
 		label: '任务类型',
 		subcomponent: subSpan1,
 	},
 	{
-		prop: 'val3',
+		prop: 'mainTaskState',
 		label: '状态',
 		subcomponent: subSpan2,
 	},
@@ -136,19 +129,19 @@ const tableProps = [
 		prop: 'val4',
 		label: '搬运对象(L/R)',
 		subcomponent: subSpan3,
-		width: 160,
+		width: 220,
 	},
 	{
 		prop: 'val5',
 		label: '起点(L/R)',
 		subcomponent: subSpan3,
-		width: 160,
+		width: 220,
 	},
 	{
 		prop: 'val6',
 		label: '终点(L/R)',
 		subcomponent: subSpan3,
-		width: 160,
+		width: 220,
 	},
 	{
 		prop: 'val7',
@@ -156,17 +149,16 @@ const tableProps = [
 		subcomponent: subSpan4,
 	},
 	{
-		prop: 'creatTime',
+		prop: 'val8',
+		label: '优先级',
+		subcomponent: subSpan5,
+	},
+	{
+		prop: 'createTime',
 		label: '创建时间',
 		filter: parseTime,
 		width: 150,
 	},
-	{
-		prop: 'Time',
-		label: '执行时长',
-		filter: (val) => parseTime(val, '{HH}:{mm}:{ss}'),
-		width: 100,
-	},
 ];
 
 export default {
@@ -179,46 +171,20 @@ export default {
 					type: 'detail',
 					btnName: '详情',
 				},
-				{
-					type: 'issue',
-					btnName: '下发',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'equal',
-								name: 'status',
-								value: 1,
-							},
-						],
-					},
-				},
-				{
-					type: 'pause',
-					btnName: '暂停',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'unequal',
-								name: 'status',
-								value: 1,
-							},
-						],
-					},
-				},
-				{
-					type: 'reassign',
-					btnName: '改派',
-				},
-				{
-					type: 'stop',
-					btnName: '终止',
-				},
-				{
-					type: 'recycle',
-					btnName: '回收',
-				},
+				// {
+				// 	type: 'stop',
+				// 	btnName: '终止',
+				// 	showParam: {
+				// 		type: '&',
+				// 		data: [
+				// 			{
+				// 				type: 'equal',
+				// 				name: 'mainTaskState',
+				// 				value: 2,
+				// 			},
+				// 		],
+				// 	},
+				// },
 			].filter((v) => v),
 			tableData: [],
 			listQuery: {
@@ -238,15 +204,11 @@ export default {
 						},
 						{
 							id: 2,
-							name: '备料搬运',
+							name: '空盘搬运',
 						},
 						{
 							id: 3,
-							name: '临时搬运',
-						},
-						{
-							id: 4,
-							name: '空盘搬运',
+							name: '备料搬运',
 						},
 					],
 					param: 'val1',
@@ -254,23 +216,15 @@ export default {
 				},
 				{
 					type: 'select',
-					label: '业务类型',
+					label: '创建方式',
 					selectOptions: [
 						{
 							id: 1,
-							name: '满盘搬运',
+							name: '自动任务',
 						},
 						{
 							id: 2,
-							name: '空盘搬运',
-						},
-						{
-							id: 3,
-							name: '备料搬运',
-						},
-						{
-							id: 4,
-							name: '临时搬运',
+							name: '人工任务',
 						},
 					],
 					param: 'val2',
@@ -281,20 +235,24 @@ export default {
 					label: '状态',
 					selectOptions: [
 						{
-							id: 1,
+							id: 0,
 							name: '待下发',
 						},
 						{
-							id: 2,
+							id: 1,
 							name: '待执行',
 						},
 						{
-							id: 3,
+							id: 2,
 							name: '执行中',
 						},
+						{
+							id: 3,
+							name: '取货完成',
+						},
 						{
 							id: 4,
-							name: '已完成',
+							name: '完成',
 						},
 						{
 							id: 5,
@@ -302,7 +260,7 @@ export default {
 						},
 						{
 							id: 6,
-							name: '已终止',
+							name: '终止',
 						},
 						{
 							id: 7,
@@ -312,46 +270,10 @@ export default {
 					param: 'val3',
 					filterable: true,
 				},
-				{
-					type: 'select',
-					label: '执行车辆',
-					selectOptions: [],
-					param: 'val4',
-					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: 'select',
-					label: '回收任务',
-					selectOptions: [
-						{
-							id: 1,
-							name: '是',
-						},
-						{
-							id: 0,
-							name: '否',
-						},
-					],
-					param: 'val5',
-					filterable: true,
-				},
 				{
 					type: 'input',
-					label: '编号',
-					placeholder: '编号',
+					label: '任务编号',
+					placeholder: '任务编号',
 					param: 'code',
 				},
 				{
@@ -372,9 +294,7 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('monitoring:cost-othercost-log:create')
-						? 'button'
-						: '',
+					type: 'button',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -396,7 +316,7 @@ export default {
 				this.getDataList();
 				this.refreshTimer = setInterval(() => {
 					this.getDataList();
-				}, 5000);
+				}, 10000);
 			} else {
 				// 关闭时清除定时器
 				if (this.refreshTimer) {
@@ -415,9 +335,11 @@ export default {
 	components: {
 		AddOrUpdate,
 		detailDrawer,
-    stopInStock,
+		stopInStock,
+	},
+	created() {
+		this.getDataList();
 	},
-	created() {},
 	mounted() {
 		this.autoRefresh = true;
 	},
@@ -427,11 +349,10 @@ export default {
 				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.listQuery.mainTaskType = val.val1 || null;
+					this.listQuery.taskAttribute = val.val2 || null;
+					this.listQuery.mainTaskState = val.val3 || null;
+					this.listQuery.mainTaskCode = val.code || null;
 					this.getDataList();
 					break;
 				case 'add':
@@ -452,17 +373,12 @@ export default {
 		},
 		// 获取数据列表
 		getDataList() {
-			this.tableData = [
-				{
-					code: 1,
-				},
-			];
-			// this.dataListLoading = true
-			// this.urlOptions.getDataListURL(this.listQuery).then(response => {
-			//   this.tableData = response.data.list;
-			//   this.listQuery.total = response.data.total;
-			// this.dataListLoading = false
-			// });
+			this.dataListLoading = true;
+			getTaskPage(this.listQuery).then((response) => {
+				this.tableData = response.data.list;
+				this.listQuery.total = response.data.total;
+				this.dataListLoading = false;
+			});
 		},
 		// 每页数
 		sizeChangeHandle(val) {
@@ -490,29 +406,32 @@ export default {
 		//tableBtn点击
 		handleClick(val) {
 			if (val.type === 'stop') {
-				if (val.data === '无货') {
-					this.stopFun(val.data);
-				} else {
-					this.stopStockVisible = true;
-					this.$nextTick(() => {
-						this.$refs.stopStockRef.init();
-					});
-				}
+				this.stopFun(val.data);
+				// if (val.data === '无货') {
+				// 	this.stopFun(val.data);
+				// } else {
+				// 	this.stopStockVisible = true;
+				// 	this.$nextTick(() => {
+				// 		this.$refs.stopStockRef.init();
+				// 	});
+				// }
 			} else if (val.type === 'detail') {
 				this.$nextTick(() => {
-					this.$refs.detailDrawer.init(val.data, 'detail');
+					this.$refs.detailDrawer.init(val.data.id, 'detail');
 				});
-			} else {
-				this.otherMethods(val);
 			}
 		},
 		stopFun(val) {
-			this.$prompt('确认终止空载该任务？此操作不可恢复', '终止任务', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				inputType: 'textarea',
-				inputPlaceholder: '请输入终止原因',
-			})
+			this.$prompt(
+				'确认终止该任务？此操作任务立即终止，车辆保持暂停，请人工回收货物，释放车辆!',
+				'终止任务',
+				{
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					inputType: 'textarea',
+					inputPlaceholder: '请输入终止原因',
+				}
+			)
 				.then(({ value }) => {
 					console.log('终止原因' + value);
 				})
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 f067da31..f8044c12 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,38 +3,38 @@
 
 
 "@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.5":
-  "integrity" "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.22.5.tgz"
-  "version" "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.5"
 
 "@babel/compat-data@^7.22.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
-  "integrity" "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.22.9.tgz"
-  "version" "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@*", "@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-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w=="
-  "resolved" "https://registry.npmmirror.com/@babel/core/-/core-7.22.9.tgz"
-  "version" "7.22.9"
+"@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":
+  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.5"
@@ -46,51 +46,51 @@
     "@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"
+    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.22.7", "@babel/generator@^7.22.9":
-  "integrity" "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw=="
-  "resolved" "https://registry.npmmirror.com/@babel/generator/-/generator-7.22.9.tgz"
-  "version" "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.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-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz"
-  "version" "7.22.5"
+  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.5"
 
 "@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":
-  "integrity" "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz"
-  "version" "7.22.9"
+  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.5"
-    "browserslist" "^4.21.9"
-    "lru-cache" "^5.1.1"
-    "semver" "^6.3.1"
+    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.5", "@babel/helper-create-class-features-plugin@^7.22.6":
-  "integrity" "sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz"
-  "version" "7.22.9"
+  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"
@@ -100,66 +100,66 @@
     "@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-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz"
-  "version" "7.22.9"
+  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.2":
-  "integrity" "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz"
-  "version" "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.5":
-  "integrity" "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz"
-  "version" "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":
-  "integrity" "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz"
-  "version" "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.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.5":
-  "integrity" "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz"
-  "version" "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.22.5"
 
 "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.8.3":
-  "integrity" "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz"
-  "version" "7.22.5"
+  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.5"
 
 "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9":
-  "integrity" "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz"
-  "version" "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.5"
     "@babel/helper-module-imports" "^7.22.5"
@@ -168,151 +168,151 @@
     "@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.5":
-  "integrity" "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz"
-  "version" "7.22.9"
+  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.5"
     "@babel/helper-wrap-function" "^7.22.9"
 
 "@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
-  "integrity" "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz"
-  "version" "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.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.5":
-  "integrity" "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz"
-  "version" "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.5":
-  "integrity" "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz"
-  "version" "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.9":
-  "integrity" "sha512-sZ+QzfauuUEfxSEjKFmi3qDSHgLsTPK/pEpoD/qonZKOtTPTLbf59oabPQ4rKekt9lFcj/hTZaOhWwFYrgjk+Q=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.9.tgz"
-  "version" "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.5"
     "@babel/types" "^7.22.5"
 
 "@babel/helpers@^7.22.6":
-  "integrity" "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA=="
-  "resolved" "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.22.6.tgz"
-  "version" "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.5"
     "@babel/traverse" "^7.22.6"
     "@babel/types" "^7.22.5"
 
 "@babel/highlight@^7.22.5":
-  "integrity" "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw=="
-  "resolved" "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.22.5.tgz"
-  "version" "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.5"
-    "chalk" "^2.0.0"
-    "js-tokens" "^4.0.0"
+    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.20.15":
-  "integrity" "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
-  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
-  "version" "7.22.7"
+  version "7.22.7"
+  resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
+  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
 
 "@babel/parser@^7.21.3":
-  "integrity" "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
-  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
-  "version" "7.22.7"
+  version "7.22.7"
+  resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
+  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
 
 "@babel/parser@^7.22.5":
-  "integrity" "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
-  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
-  "version" "7.22.7"
+  version "7.22.7"
+  resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
+  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
 
 "@babel/parser@^7.22.7":
-  "integrity" "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
-  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
-  "version" "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":
-  "integrity" "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ=="
-  "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"
-  "version" "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.5":
-  "integrity" "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g=="
-  "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"
-  "version" "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.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-omXqPF7Onq4Bb7wHxXjM3jSMSJvUUbvDvmmds7KI5n9Cq6Ln5I05I1W2nRlRof1rGdiUxJrxwe285WF96XlBXQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.7.tgz"
-  "version" "7.22.7"
+  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.6"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -321,170 +321,170 @@
     "@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":
-  "integrity" "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"
-  "version" "7.18.6"
+  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.5":
-  "integrity" "sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz"
-  "version" "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.22.7":
-  "integrity" "sha512-7HmE7pk/Fmke45TODvxvkxRMV9RazV+ZZzhOL9AG8G29TLrr3jkjwF7uJfxZ30EoXpO+LJkq4oA8NjO2DTnEDg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.7.tgz"
-  "version" "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.5"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -492,49 +492,49 @@
     "@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.22.5":
-  "integrity" "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz"
-  "version" "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.5":
-  "integrity" "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz"
-  "version" "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.5"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
 "@babel/plugin-transform-classes@^7.22.6":
-  "integrity" "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz"
-  "version" "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.6"
@@ -544,129 +544,129 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@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.22.5":
-  "integrity" "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz"
-  "version" "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", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  "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"
+  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.5":
-  "integrity" "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz"
-  "version" "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.5":
-  "integrity" "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz"
-  "version" "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.5":
-  "integrity" "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz"
-  "version" "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.5":
-  "integrity" "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz"
-  "version" "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.5":
-  "integrity" "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz"
-  "version" "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.22.5":
-  "integrity" "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz"
-  "version" "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.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-modules-commonjs@^7.22.5":
-  "integrity" "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz"
-  "version" "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.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
 "@babel/plugin-transform-modules-systemjs@^7.22.5":
-  "integrity" "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz"
-  "version" "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.22.5"
@@ -674,48 +674,48 @@
     "@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.5":
-  "integrity" "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz"
-  "version" "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.5":
-  "integrity" "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz"
-  "version" "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.5":
-  "integrity" "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz"
-  "version" "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.5"
     "@babel/helper-compilation-targets" "^7.22.5"
@@ -724,49 +724,49 @@
     "@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.5":
-  "integrity" "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz"
-  "version" "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.5", "@babel/plugin-transform-optional-chaining@^7.22.6":
-  "integrity" "sha512-Vd5HiWml0mDVtcLHIoEU5sw6HOUW/Zk0acLs/SAeuLzkGNOPc9DB4nkUajemhCmTIz3eiaKREZn2hQQqF79YTg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.6.tgz"
-  "version" "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.5":
-  "integrity" "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz"
-  "version" "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.5":
-  "integrity" "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz"
-  "version" "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.5"
@@ -774,110 +774,110 @@
     "@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.5":
-  "integrity" "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz"
-  "version" "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.1"
+    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-9KjBH61AGJetCPYp/IEyLEp47SyybZb0nDRpBvmtEkm+rUIwxdlKpyNHI1TmsGkeuLclJdleQHRZ8XLBnnh8CQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz"
-  "version" "7.22.9"
+  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.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "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-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.5":
-  "integrity" "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz"
-  "version" "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-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g=="
-  "resolved" "https://registry.npmmirror.com/@babel/preset-env/-/preset-env-7.22.9.tgz"
-  "version" "7.22.9"
+  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.22.9"
     "@babel/helper-compilation-targets" "^7.22.9"
@@ -954,48 +954,48 @@
     "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
     "@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-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.5":
-  "integrity" "sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg=="
-  "resolved" "https://registry.npmmirror.com/@babel/preset-modules/-/preset-modules-0.1.6.tgz"
-  "version" "0.1.6"
+  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-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.6.tgz"
-  "version" "7.22.6"
+  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.13.11"
+    regenerator-runtime "^0.13.11"
 
 "@babel/template@^7.22.5":
-  "integrity" "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw=="
-  "resolved" "https://registry.npmmirror.com/@babel/template/-/template-7.22.5.tgz"
-  "version" "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.5"
     "@babel/parser" "^7.22.5"
     "@babel/types" "^7.22.5"
 
 "@babel/traverse@^7.22.5", "@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8", "@babel/traverse@^7.7.0":
-  "integrity" "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw=="
-  "resolved" "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.22.8.tgz"
-  "version" "7.22.8"
+  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.5"
     "@babel/generator" "^7.22.7"
@@ -1005,76 +1005,76 @@
     "@babel/helper-split-export-declaration" "^7.22.6"
     "@babel/parser" "^7.22.7"
     "@babel/types" "^7.22.5"
-    "debug" "^4.1.0"
-    "globals" "^11.1.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
 
 "@babel/types@^7.22.5", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  "integrity" "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA=="
-  "resolved" "https://registry.npmmirror.com/@babel/types/-/types-7.22.5.tgz"
-  "version" "7.22.5"
+  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.5"
-    "to-fast-properties" "^2.0.0"
+    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"
@@ -1082,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" "*"
@@ -1115,175 +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-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
-  "resolved" "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
-  "version" "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.15":
-  "integrity" "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
-  "resolved" "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
-  "version" "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":
-  "integrity" "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-  "resolved" "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
-  "version" "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-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA=="
-  "resolved" "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz"
-  "version" "0.3.18"
+  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"
 
 "@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-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="
-  "resolved" "https://registry.npmmirror.com/@types/body-parser/-/body-parser-1.19.2.tgz"
-  "version" "1.19.2"
+  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-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig=="
-  "resolved" "https://registry.npmmirror.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz"
-  "version" "1.5.0"
+  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-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="
-  "resolved" "https://registry.npmmirror.com/@types/connect/-/connect-3.4.35.tgz"
-  "version" "3.4.35"
+  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-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg=="
-  "resolved" "https://registry.npmmirror.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz"
-  "version" "4.17.35"
+  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" "*"
@@ -1291,9 +1291,9 @@
     "@types/send" "*"
 
 "@types/express@*":
-  "integrity" "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="
-  "resolved" "https://registry.npmmirror.com/@types/express/-/express-4.17.17.tgz"
-  "version" "4.17.17"
+  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"
@@ -1301,215 +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-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ=="
-  "resolved" "https://registry.npmmirror.com/@types/http-errors/-/http-errors-2.0.1.tgz"
-  "version" "2.0.1"
+  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-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA=="
-  "resolved" "https://registry.npmmirror.com/@types/http-proxy/-/http-proxy-1.17.11.tgz"
-  "version" "1.17.11"
+  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-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="
-  "resolved" "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.12.tgz"
-  "version" "7.0.12"
+  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-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
-  "resolved" "https://registry.npmmirror.com/@types/mime/-/mime-1.3.2.tgz"
-  "version" "1.3.2"
+  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-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="
-  "resolved" "https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.2.tgz"
-  "version" "1.2.2"
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.2.tgz"
+  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
 "@types/node@*":
-  "integrity" "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg=="
-  "resolved" "https://registry.npmmirror.com/@types/node/-/node-20.4.5.tgz"
-  "version" "20.4.5"
+  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-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="
-  "resolved" "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"
-  "version" "2.4.1"
+  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-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
-  "resolved" "https://registry.npmmirror.com/@types/q/-/q-1.5.5.tgz"
-  "version" "1.5.5"
+  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-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
-  "resolved" "https://registry.npmmirror.com/@types/qs/-/qs-6.9.7.tgz"
-  "version" "6.9.7"
+  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-1jJ3OO8FXHCcuVXCuO1EMC/MjDuT6/cxgsMw/UebkO9afnL99Y5QTpUjk7+flK4G5FzBVJEgDKL5eFtoxJs9MQ=="
-  "resolved" "https://registry.npmmirror.com/@types/raf/-/raf-3.4.1.tgz"
-  "version" "3.4.1"
+  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-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
-  "resolved" "https://registry.npmmirror.com/@types/range-parser/-/range-parser-1.2.4.tgz"
-  "version" "1.2.4"
+  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-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q=="
-  "resolved" "https://registry.npmmirror.com/@types/send/-/send-0.17.1.tgz"
-  "version" "0.17.1"
+  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-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw=="
-  "resolved" "https://registry.npmmirror.com/@types/serve-static/-/serve-static-1.15.2.tgz"
-  "version" "1.15.2"
+  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-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="
-  "resolved" "https://registry.npmmirror.com/@types/source-list-map/-/source-list-map-0.1.2.tgz"
-  "version" "0.1.2"
+  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-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ=="
-  "resolved" "https://registry.npmmirror.com/@types/tapable/-/tapable-1.0.8.tgz"
-  "version" "1.0.8"
+  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-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g=="
-  "resolved" "https://registry.npmmirror.com/@types/uglify-js/-/uglify-js-3.17.1.tgz"
-  "version" "3.17.1"
+  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-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg=="
-  "resolved" "https://registry.npmmirror.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz"
-  "version" "3.2.0"
+  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-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g=="
-  "resolved" "https://registry.npmmirror.com/@types/webpack/-/webpack-4.41.33.tgz"
-  "version" "4.41.33"
+  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.5.3":
-  "integrity" "sha512-dty8lsZk9QPc0i4It79tjWsmPiaC3FpgARFM0vJGko4k3yKNZIYkAk8kjiDRfkAQH/HZ3rYi5dDTriFNzwSsIg=="
-  "resolved" "https://registry.npmmirror.com/@videojs/http-streaming/-/http-streaming-3.5.3.tgz"
-  "version" "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.1.1"
-    "mux.js" "7.0.0"
-    "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"
@@ -1517,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"
@@ -1550,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"
@@ -1570,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"
@@ -1678,91 +1678,91 @@
     "@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.4":
-  "integrity" "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.3.4.tgz"
-  "version" "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.21.3"
     "@vue/shared" "3.3.4"
-    "estree-walker" "^2.0.2"
-    "source-map-js" "^1.0.2"
+    estree-walker "^2.0.2"
+    source-map-js "^1.0.2"
 
 "@vue/compiler-dom@3.3.4":
-  "integrity" "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz"
-  "version" "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.4"
     "@vue/shared" "3.3.4"
 
 "@vue/compiler-sfc@^3.0.0-beta.14", "@vue/compiler-sfc@^3.0.1":
-  "integrity" "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz"
-  "version" "3.3.4"
+  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.20.15"
     "@vue/compiler-core" "3.3.4"
@@ -1770,129 +1770,129 @@
     "@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"
+    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.4":
-  "integrity" "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz"
-  "version" "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.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.4":
-  "integrity" "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw=="
-  "resolved" "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz"
-  "version" "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.20.15"
     "@vue/compiler-core" "3.3.4"
     "@vue/shared" "3.3.4"
-    "estree-walker" "^2.0.2"
-    "magic-string" "^0.30.0"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.0"
 
 "@vue/shared@3.3.4":
-  "integrity" "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
-  "resolved" "https://registry.npmmirror.com/@vue/shared/-/shared-3.3.4.tgz"
-  "version" "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"
@@ -1900,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"
@@ -1933,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"
@@ -1944,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"
@@ -1954,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"
@@ -1966,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"
@@ -1978,9882 +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@^7.1.1", "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@^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@^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.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@^8.8.2":
-  "integrity" "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-8.10.0.tgz"
-  "version" "8.10.0"
+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.9.0":
-  "integrity" "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-8.10.0.tgz"
-  "version" "8.10.0"
+acorn@^8.9.0:
+  version "8.10.0"
+  resolved "https://registry.npmmirror.com/acorn/-/acorn-8.10.0.tgz"
+  integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
-"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"
+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==
 
-"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"
+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==
 
-"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":
-  "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@^3.2.0":
-  "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.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" "^1.9.0"
+    color-convert "^1.9.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.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" "^1.9.0"
+    color-convert "^1.9.0"
 
-"ansi-styles@^4.0.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@^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:
-    "color-convert" "^2.0.1"
+    color-convert "^2.0.1"
 
-"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"
+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":
-  "integrity" "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
-  "resolved" "https://registry.npmmirror.com/any-promise/-/any-promise-1.3.0.tgz"
-  "version" "1.3.0"
+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":
-  "integrity" "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="
-  "resolved" "https://registry.npmmirror.com/anymatch/-/anymatch-2.0.0.tgz"
-  "version" "2.0.0"
+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:
-    "micromatch" "^3.1.4"
-    "normalize-path" "^2.1.1"
+    micromatch "^3.1.4"
+    normalize-path "^2.1.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"
+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:
-    "normalize-path" "^3.0.0"
-    "picomatch" "^2.0.4"
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
 
-"aproba@^1.1.1":
-  "integrity" "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
-  "resolved" "https://registry.npmmirror.com/aproba/-/aproba-1.2.0.tgz"
-  "version" "1.2.0"
+aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/aproba/-/aproba-1.2.0.tgz"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-"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"
+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==
 
-"argparse@^1.0.7":
-  "integrity" "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="
-  "resolved" "https://registry.npmmirror.com/argparse/-/argparse-1.0.10.tgz"
-  "version" "1.0.10"
+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:
-    "sprintf-js" "~1.0.2"
+    sprintf-js "~1.0.2"
 
-"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"
+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==
 
-"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"
+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==
 
-"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"
+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":
-  "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"
+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"
-    "is-array-buffer" "^3.0.1"
+    call-bind "^1.0.2"
+    is-array-buffer "^3.0.1"
 
-"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"
+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":
-  "integrity" "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
-  "resolved" "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz"
-  "version" "1.1.1"
+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":
-  "integrity" "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw=="
-  "resolved" "https://registry.npmmirror.com/array-includes/-/array-includes-3.1.6.tgz"
-  "version" "3.1.6"
+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:
-    "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"
+    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-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-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:
-    "array-uniq" "^1.0.1"
+    array-uniq "^1.0.1"
 
-"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-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":
-  "integrity" "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="
-  "resolved" "https://registry.npmmirror.com/array-unique/-/array-unique-0.3.2.tgz"
-  "version" "0.3.2"
+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":
-  "integrity" "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA=="
-  "resolved" "https://registry.npmmirror.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz"
-  "version" "1.3.1"
+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.1.4"
-    "es-abstract" "^1.20.4"
-    "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.1":
-  "integrity" "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ=="
-  "resolved" "https://registry.npmmirror.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz"
-  "version" "1.3.1"
+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.1.4"
-    "es-abstract" "^1.20.4"
-    "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.5":
-  "integrity" "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q=="
-  "resolved" "https://registry.npmmirror.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz"
-  "version" "1.0.5"
+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.1.4"
-    "es-abstract" "^1.20.4"
-    "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.1":
-  "integrity" "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw=="
-  "resolved" "https://registry.npmmirror.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz"
-  "version" "1.0.1"
+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"
-    "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-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="
-  "resolved" "https://registry.npmmirror.com/assert/-/assert-1.5.0.tgz"
-  "version" "1.5.0"
+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.1"
-    "util" "0.10.3"
+    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.4":
-  "integrity" "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg=="
-  "resolved" "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz"
-  "version" "0.4.5"
+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.2"
-    "semver" "^6.3.1"
+    semver "^6.3.1"
 
-"babel-plugin-polyfill-corejs3@^0.8.2":
-  "integrity" "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA=="
-  "resolved" "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz"
-  "version" "0.8.3"
+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.2"
-    "core-js-compat" "^3.31.0"
+    core-js-compat "^3.31.0"
 
-"babel-plugin-polyfill-regenerator@^0.5.1":
-  "integrity" "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA=="
-  "resolved" "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz"
-  "version" "0.5.2"
+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.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.1.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.0.1":
-  "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-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg=="
-  "resolved" "https://registry.npmmirror.com/browserify-sign/-/browserify-sign-4.2.1.tgz"
-  "version" "4.2.1"
+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.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"
+    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.21.0":
-  "integrity" "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg=="
-  "resolved" "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.9.tgz"
-  "version" "4.21.9"
+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.30001503"
-    "electron-to-chromium" "^1.4.431"
-    "node-releases" "^2.0.12"
-    "update-browserslist-db" "^1.0.11"
+    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":
-  "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@^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.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"
+    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@^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":
-  "integrity" "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="
-  "resolved" "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz"
-  "version" "1.0.2"
+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.1"
-    "get-intrinsic" "^1.0.2"
+    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.30001503":
-  "integrity" "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA=="
-  "resolved" "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz"
-  "version" "1.0.30001517"
+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.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.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.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.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.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.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.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.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@^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.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" "^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@^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@^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@^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" "^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@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/chalk/-/chalk-2.3.0.tgz"
+  integrity sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==
   dependencies:
-    "ansi-styles" "^3.1.0"
-    "escape-string-regexp" "^1.0.5"
-    "supports-color" "^4.0.0"
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.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"
+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":
-  "integrity" "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ=="
-  "resolved" "https://registry.npmmirror.com/check-types/-/check-types-8.0.3.tgz"
-  "version" "8.0.3"
+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":
-  "integrity" "sha512-E4seb9UZkSJtkm65Ry2ZLWTw5Z87DOyGcCePdg3ft7da342hnEliMtcDAPSn+YSo/o0xl1Egmhh671kxEJgY+g=="
-  "resolved" "https://registry.npmmirror.com/chinese-lunar/-/chinese-lunar-0.1.4.tgz"
-  "version" "0.1.4"
+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":
-  "integrity" "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="
-  "resolved" "https://registry.npmmirror.com/chokidar/-/chokidar-2.1.8.tgz"
-  "version" "2.1.8"
+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"
+    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-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g=="
-  "resolved" "https://registry.npmmirror.com/cli-spinners/-/cli-spinners-2.9.0.tgz"
-  "version" "2.9.0"
+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-V8XwYqXjIPMfPCaZMja4I2MJPT45EEnzRmTL1Ps6aMsmUQ/PhZ48OwUvddBFNqNZeVV13aPm1b5K1c3ogfad8Q=="
-  "resolved" "https://registry.npmmirror.com/code-brick-zj/-/code-brick-zj-1.0.2.tgz"
-  "version" "1.0.2"
+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":
-  "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@^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.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.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@^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.1.4"
+    color-name "~1.1.4"
 
-"color-name@^1.0.0", "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-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":
-  "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.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":
-  "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-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-name" "^1.0.0"
-    "simple-swizzle" "^0.2.2"
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
 
-"color@^3.0.0":
-  "integrity" "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="
-  "resolved" "https://registry.npmmirror.com/color/-/color-3.2.1.tgz"
-  "version" "3.2.1"
+color@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.npmmirror.com/color/-/color-3.2.1.tgz"
+  integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
   dependencies:
-    "color-convert" "^1.9.3"
-    "color-string" "^1.6.0"
+    color-convert "^1.9.3"
+    color-string "^1.6.0"
 
-"colorette@^2.0.16":
-  "integrity" "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
-  "resolved" "https://registry.npmmirror.com/colorette/-/colorette-2.0.20.tgz"
-  "version" "2.0.20"
+colorette@^2.0.16:
+  version "2.0.20"
+  resolved "https://registry.npmmirror.com/colorette/-/colorette-2.0.20.tgz"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
-"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"
+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:
-    "delayed-stream" "~1.0.0"
+    delayed-stream "~1.0.0"
 
-"commander@*", "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"
+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":
-  "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"
+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":
-  "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"
+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":
-  "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"
+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":
-  "integrity" "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="
-  "resolved" "https://registry.npmmirror.com/commander/-/commander-9.5.0.tgz"
-  "version" "9.5.0"
+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":
-  "integrity" "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
-  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.19.0.tgz"
-  "version" "2.19.0"
+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":
-  "integrity" "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
-  "resolved" "https://registry.npmmirror.com/commondir/-/commondir-1.0.1.tgz"
-  "version" "1.0.1"
+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":
-  "integrity" "sha512-hPFGULxdwugu1QWW3SvVOCUHLzO34+a2J6Wqy0c5ASQkfi9/8nZcBB0ZohaEbXOQlCflMAEMmEWk7u7BVs4koA=="
-  "resolved" "https://registry.npmmirror.com/component-classes/-/component-classes-1.2.6.tgz"
-  "version" "1.2.6"
+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-indexof" "0.0.3"
+    component-indexof "0.0.3"
 
-"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"
+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-matches-selector" "~0.1.5"
+    component-matches-selector "~0.1.5"
 
-"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-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-closest" "*"
-    "component-event" "*"
+    component-closest "*"
+    component-event "*"
 
-"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-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==
 
-"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@*, 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":
-  "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-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":
-  "integrity" "sha512-puDQKvx/64HZXb4hBwIcvQLaLgux8o1CbWl39s41hrIIZDl1lJiD5jc22gj3RBeGK0ovxALDYpIbyjqDUUl0rw=="
-  "resolved" "https://registry.npmmirror.com/component-indexof/-/component-indexof-0.0.3.tgz"
-  "version" "0.0.3"
+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":
-  "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-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:
-    "component-query" "*"
-    "global-object" "^1.0.0"
+    component-query "*"
+    global-object "^1.0.0"
 
-"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-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":
-  "integrity" "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="
-  "resolved" "https://registry.npmmirror.com/compressible/-/compressible-2.0.18.tgz"
-  "version" "2.0.18"
+compressible@~2.0.16:
+  version "2.0.18"
+  resolved "https://registry.npmmirror.com/compressible/-/compressible-2.0.18.tgz"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
   dependencies:
-    "mime-db" ">= 1.43.0 < 2"
+    mime-db ">= 1.43.0 < 2"
 
-"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"
+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:
-    "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"
+    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"
 
-"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@^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:
-    "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"
+    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"
 
-"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-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":
-  "integrity" "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="
-  "resolved" "https://registry.npmmirror.com/concat-stream/-/concat-stream-1.6.2.tgz"
-  "version" "1.6.2"
+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:
-    "buffer-from" "^1.0.0"
-    "inherits" "^2.0.3"
-    "readable-stream" "^2.2.2"
-    "typedarray" "^0.0.6"
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
 
-"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"
+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:
-    "ini" "^1.3.4"
-    "proto-list" "~1.2.1"
+    ini "^1.3.4"
+    proto-list "~1.2.1"
 
-"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"
+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==
 
-"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-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":
-  "integrity" "sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ=="
-  "resolved" "https://registry.npmmirror.com/connect/-/connect-3.6.6.tgz"
-  "version" "3.6.6"
+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:
-    "debug" "2.6.9"
-    "finalhandler" "1.1.0"
-    "parseurl" "~1.3.2"
-    "utils-merge" "1.0.1"
+    debug "2.6.9"
+    finalhandler "1.1.0"
+    parseurl "~1.3.2"
+    utils-merge "1.0.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"
+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==
 
-"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"
+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:
-    "bluebird" "^3.1.1"
+    bluebird "^3.1.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"
+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==
 
-"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"
+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:
-    "safe-buffer" "5.2.1"
+    safe-buffer "5.2.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"
+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==
 
-"convert-source-map@^1.7.0":
-  "integrity" "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
-  "resolved" "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz"
-  "version" "1.9.0"
+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":
-  "integrity" "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
-  "resolved" "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz"
-  "version" "1.0.6"
+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":
-  "integrity" "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
-  "resolved" "https://registry.npmmirror.com/cookie/-/cookie-0.5.0.tgz"
-  "version" "0.5.0"
+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":
-  "integrity" "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A=="
-  "resolved" "https://registry.npmmirror.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"
-  "version" "1.0.5"
+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:
-    "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"
+    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"
 
-"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"
+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":
-  "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"
+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:
-    "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"
+    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-compat@^3.31.0", "core-js-compat@^3.6.5":
-  "integrity" "sha512-wIDWd2s5/5aJSdpOJHfSibxNODxoGoWOBHt8JSPB41NOE94M7kuTPZCYLOlTtuoXTsBPKobpJ6T+y0SSy5L9SA=="
-  "resolved" "https://registry.npmmirror.com/core-js-compat/-/core-js-compat-3.31.1.tgz"
-  "version" "3.31.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:
-    "browserslist" "^4.21.9"
+    browserslist "^4.21.9"
 
-"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@^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==
 
-"core-js@^3", "core-js@^3.26.0", "core-js@^3.6.0", "core-js@^3.8.3":
-  "integrity" "sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ=="
-  "resolved" "https://registry.npmmirror.com/core-js/-/core-js-3.31.1.tgz"
-  "version" "3.31.1"
+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":
-  "integrity" "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
-  "resolved" "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.2.tgz"
-  "version" "1.0.2"
+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":
-  "integrity" "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="
-  "resolved" "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"
-  "version" "5.2.1"
+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:
-    "import-fresh" "^2.0.0"
-    "is-directory" "^0.3.1"
-    "js-yaml" "^3.13.1"
-    "parse-json" "^4.0.0"
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.13.1"
+    parse-json "^4.0.0"
 
-"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"
+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":
-  "integrity" "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="
-  "resolved" "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz"
-  "version" "4.0.4"
+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:
-    "bn.js" "^4.1.0"
-    "elliptic" "^6.5.3"
+    bn.js "^4.1.0"
+    elliptic "^6.5.3"
 
-"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"
+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.1"
-    "inherits" "^2.0.1"
-    "md5.js" "^1.3.4"
-    "ripemd160" "^2.0.1"
-    "sha.js" "^2.4.0"
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
 
-"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-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:
-    "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.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@^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"
+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:
-    "lru-cache" "^4.0.1"
-    "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.0", "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-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
-  "resolved" "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz"
-  "version" "4.1.1"
+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-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
-  "resolved" "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz"
-  "version" "1.11.13"
+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-properties@^1.1.2", "define-properties@^1.1.3", "define-properties@^1.1.4", "define-properties@^1.2.0":
-  "integrity" "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="
-  "resolved" "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.0.tgz"
-  "version" "1.2.0"
+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:
-    "has-property-descriptors" "^1.0.0"
-    "object-keys" "^1.1.1"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
-"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@^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:
-    "is-descriptor" "^0.1.0"
+    is-descriptor "^0.1.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@^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" "^1.0.0"
+    is-descriptor "^1.0.0"
 
-"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"
+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.2"
-    "isobject" "^3.0.1"
+    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-13FdUkX+HsAnOmfiFtmdPUB3qImsy3ulwLWJ4qZCCY3p4GyTTWSDfsFnowr34CDtBIfpo4HVF9HGIRh9z/a6+A=="
-  "resolved" "https://registry.npmmirror.com/diagram-js/-/diagram-js-12.4.0.tgz"
-  "version" "12.4.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":
-  "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@^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.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" "0"
-    "domelementtype" "1"
+    dom-serializer "0"
+    domelementtype "1"
 
-"domutils@^2.5.2", "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.431":
-  "integrity" "sha512-aVfC8+440vGfl06l8HKKn8/PD5jRfSnLkTTD65EFvU46igbpQRri1gxSzW9/+TeUlwYzrXk1sw867T96zlyECA=="
-  "resolved" "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.473.tgz"
-  "version" "1.4.473"
+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":
-  "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.19.0", "es-abstract@^1.20.4", "es-abstract@^1.21.2":
-  "integrity" "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw=="
-  "resolved" "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.22.1.tgz"
-  "version" "1.22.1"
+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.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"
+    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-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg=="
-  "resolved" "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"
-  "version" "2.0.1"
+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.1.3"
-    "has" "^1.0.3"
-    "has-tostringtag" "^1.0.0"
+    get-intrinsic "^1.1.3"
+    has "^1.0.3"
+    has-tostringtag "^1.0.0"
 
-"es-shim-unscopables@^1.0.0":
-  "integrity" "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w=="
-  "resolved" "https://registry.npmmirror.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"
-  "version" "1.0.0"
+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:
-    "has" "^1.0.3"
+    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.7":
-  "integrity" "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA=="
-  "resolved" "https://registry.npmmirror.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz"
-  "version" "0.3.7"
+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.11.0"
-    "resolve" "^1.22.1"
+    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.7.4":
-  "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-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow=="
-  "resolved" "https://registry.npmmirror.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz"
-  "version" "2.27.5"
+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.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"
+    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-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA=="
-  "resolved" "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.2.1.tgz"
-  "version" "7.2.1"
+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-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA=="
-  "resolved" "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz"
-  "version" "3.4.1"
+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-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
-  "resolved" "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz"
-  "version" "1.15.2"
+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.1":
-  "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-  "resolved" "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz"
-  "version" "1.1.1"
+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.5":
-  "integrity" "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="
-  "resolved" "https://registry.npmmirror.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz"
-  "version" "1.1.5"
+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.1.3"
-    "es-abstract" "^1.19.0"
-    "functions-have-names" "^1.2.2"
+    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.2", "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":
-  "integrity" "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw=="
-  "resolved" "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz"
-  "version" "1.2.1"
+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.1"
-    "has" "^1.0.3"
-    "has-proto" "^1.0.1"
-    "has-symbols" "^1.0.3"
+    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":
-  "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-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.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:
-    "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-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==
 
-"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@^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:
-    "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"
+    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-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"
+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":
-  "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.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.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"
+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.11.10"
+    min-document "^2.19.0"
+    process "^0.11.10"
 
-"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@~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:
-    "min-document" "^2.19.0"
-    "process" "~0.5.1"
+    min-document "^2.19.0"
+    process "~0.5.1"
 
-"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@^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":
-  "integrity" "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="
-  "resolved" "https://registry.npmmirror.com/globals/-/globals-12.4.0.tgz"
-  "version" "12.4.0"
+globals@^12.1.0:
+  version "12.4.0"
+  resolved "https://registry.npmmirror.com/globals/-/globals-12.4.0.tgz"
+  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
   dependencies:
-    "type-fest" "^0.8.1"
+    type-fest "^0.8.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"
+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:
-    "define-properties" "^1.1.3"
+    define-properties "^1.1.3"
 
-"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"
+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"
-    "glob" "^7.0.3"
-    "object-assign" "^4.0.1"
-    "pify" "^2.0.0"
-    "pinkie-promise" "^2.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@^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@^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"
+    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":
-  "integrity" "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg=="
-  "resolved" "https://registry.npmmirror.com/globby/-/globby-9.2.0.tgz"
-  "version" "9.2.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-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="
-  "resolved" "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"
-  "version" "1.0.0"
+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.1.1"
+    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.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", "has@^1.0.3":
-  "integrity" "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="
-  "resolved" "https://registry.npmmirror.com/has/-/has-1.0.3.tgz"
-  "version" "1.0.3"
+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:
-    "function-bind" "^1.1.1"
+    function-bind "^1.1.1"
 
-"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"
+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.4"
-    "readable-stream" "^3.6.0"
-    "safe-buffer" "^5.2.0"
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
-"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@^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":
-  "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-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":
-  "integrity" "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="
-  "resolved" "https://registry.npmmirror.com/hash.js/-/hash.js-1.1.7.tgz"
-  "version" "1.1.7"
+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:
-    "inherits" "^2.0.3"
-    "minimalistic-assert" "^1.0.1"
+    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.1":
-  "integrity" "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA=="
-  "resolved" "https://registry.npmmirror.com/inherits/-/inherits-2.0.1.tgz"
-  "version" "2.0.1"
+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==
 
-"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.3:
+  version "2.0.3"
+  resolved "https://registry.npmmirror.com/inherits/-/inherits-2.0.3.tgz"
+  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
-"ini@^1.3.4":
-  "integrity" "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-  "resolved" "https://registry.npmmirror.com/ini/-/ini-1.3.8.tgz"
-  "version" "1.3.8"
+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":
-  "integrity" "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="
-  "resolved" "https://registry.npmmirror.com/inquirer/-/inquirer-7.3.3.tgz"
-  "version" "7.3.3"
+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-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ=="
-  "resolved" "https://registry.npmmirror.com/internal-slot/-/internal-slot-1.0.5.tgz"
-  "version" "1.0.5"
+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.0"
-    "has" "^1.0.3"
-    "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@^0.1.6":
-  "integrity" "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A=="
-  "resolved" "https://registry.npmmirror.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"
-  "version" "0.1.6"
+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:
-    "kind-of" "^3.0.2"
+    kind-of "^3.0.2"
 
-"is-accessor-descriptor@^1.0.0":
-  "integrity" "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="
-  "resolved" "https://registry.npmmirror.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"
-  "version" "1.0.0"
+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:
-    "kind-of" "^6.0.0"
+    kind-of "^6.0.0"
 
-"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-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"
-    "has-tostringtag" "^1.0.0"
+    call-bind "^1.0.2"
+    has-tostringtag "^1.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-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:
-    "call-bind" "^1.0.2"
-    "get-intrinsic" "^1.2.0"
-    "is-typed-array" "^1.1.10"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    is-typed-array "^1.1.10"
 
-"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.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":
-  "integrity" "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-  "resolved" "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.3.2.tgz"
-  "version" "0.3.2"
+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":
-  "integrity" "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="
-  "resolved" "https://registry.npmmirror.com/is-bigint/-/is-bigint-1.0.4.tgz"
-  "version" "1.0.4"
+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:
-    "has-bigints" "^1.0.1"
+    has-bigints "^1.0.1"
 
-"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-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" "^1.0.0"
+    binary-extensions "^1.0.0"
 
-"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@~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:
-    "binary-extensions" "^2.0.0"
+    binary-extensions "^2.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-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:
-    "call-bind" "^1.0.2"
-    "has-tostringtag" "^1.0.0"
+    call-bind "^1.0.2"
+    has-tostringtag "^1.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-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":
-  "integrity" "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
-  "resolved" "https://registry.npmmirror.com/is-callable/-/is-callable-1.2.7.tgz"
-  "version" "1.2.7"
+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":
-  "integrity" "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg=="
-  "resolved" "https://registry.npmmirror.com/is-ci/-/is-ci-1.2.1.tgz"
-  "version" "1.2.1"
+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:
-    "ci-info" "^1.5.0"
+    ci-info "^1.5.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-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:
-    "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"
+    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-core-module@^2.11.0":
-  "integrity" "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg=="
-  "resolved" "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.12.1.tgz"
-  "version" "2.12.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:
-    "has" "^1.0.3"
+    has "^1.0.3"
 
-"is-data-descriptor@^0.1.4":
-  "integrity" "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg=="
-  "resolved" "https://registry.npmmirror.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"
-  "version" "0.1.4"
+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:
-    "kind-of" "^3.0.2"
+    kind-of "^3.0.2"
 
-"is-data-descriptor@^1.0.0":
-  "integrity" "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="
-  "resolved" "https://registry.npmmirror.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"
-  "version" "1.0.0"
+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:
-    "kind-of" "^6.0.0"
+    kind-of "^6.0.0"
 
-"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-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:
-    "has-tostringtag" "^1.0.0"
+    has-tostringtag "^1.0.0"
 
-"is-descriptor@^0.1.0":
-  "integrity" "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="
-  "resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.6.tgz"
-  "version" "0.1.6"
+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" "^0.1.6"
-    "is-data-descriptor" "^0.1.4"
-    "kind-of" "^5.0.0"
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
 
-"is-descriptor@^1.0.0", "is-descriptor@^1.0.2":
-  "integrity" "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
-  "resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz"
-  "version" "1.0.2"
+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-accessor-descriptor" "^1.0.0"
-    "is-data-descriptor" "^1.0.0"
-    "kind-of" "^6.0.2"
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
 
-"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-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-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-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-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@^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-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@^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-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-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-plain-object" "^2.0.4"
+    is-plain-object "^2.0.4"
 
-"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-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":
-  "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-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":
-  "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-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":
-  "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-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":
-  "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-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":
-  "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-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.0"
+    is-extglob "^2.1.0"
 
-"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-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:
-    "is-extglob" "^2.1.1"
+    is-extglob "^2.1.1"
 
-"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-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":
-  "integrity" "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="
-  "resolved" "https://registry.npmmirror.com/is-number-object/-/is-number-object-1.0.7.tgz"
-  "version" "1.0.7"
+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:
-    "has-tostringtag" "^1.0.0"
+    has-tostringtag "^1.0.0"
 
-"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-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:
-    "kind-of" "^3.0.2"
+    kind-of "^3.0.2"
 
-"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-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":
-  "integrity" "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
-  "resolved" "https://registry.npmmirror.com/is-obj/-/is-obj-2.0.0.tgz"
-  "version" "2.0.0"
+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":
-  "integrity" "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="
-  "resolved" "https://registry.npmmirror.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"
-  "version" "2.2.0"
+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":
-  "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-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:
-    "is-path-inside" "^2.1.0"
+    is-path-inside "^2.1.0"
 
-"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-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:
-    "path-is-inside" "^1.0.2"
+    path-is-inside "^1.0.2"
 
-"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.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-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@^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":
-  "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-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":
-  "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-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:
-    "isobject" "^3.0.1"
+    isobject "^3.0.1"
 
-"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-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-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-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"
-    "has-tostringtag" "^1.0.0"
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
 
-"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-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-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-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:
-    "call-bind" "^1.0.2"
+    call-bind "^1.0.2"
 
-"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-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":
-  "integrity" "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
-  "resolved" "https://registry.npmmirror.com/is-stream/-/is-stream-2.0.1.tgz"
-  "version" "2.0.1"
+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":
-  "integrity" "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="
-  "resolved" "https://registry.npmmirror.com/is-string/-/is-string-1.0.7.tgz"
-  "version" "1.0.7"
+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-tostringtag" "^1.0.0"
+    has-tostringtag "^1.0.0"
 
-"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-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:
-    "has-symbols" "^1.0.2"
+    has-symbols "^1.0.2"
 
-"is-typed-array@^1.1.10", "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-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:
-    "which-typed-array" "^1.1.11"
+    which-typed-array "^1.1.11"
 
-"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-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-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-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:
-    "call-bind" "^1.0.2"
+    call-bind "^1.0.2"
 
-"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-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==
 
-"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@^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==
 
-"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-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:
-    "is-docker" "^2.0.0"
+    is-docker "^2.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"
+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":
-  "integrity" "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-  "resolved" "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz"
-  "version" "2.0.5"
+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":
-  "integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-  "resolved" "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
-  "version" "1.0.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@1.0.0":
-  "integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-  "resolved" "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
-  "version" "1.0.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==
 
-"isexe@^2.0.0":
-  "integrity" "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-  "resolved" "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz"
-  "version" "2.0.0"
+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":
-  "integrity" "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA=="
-  "resolved" "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz"
-  "version" "2.1.0"
+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@^2.1.0":
-  "integrity" "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA=="
-  "resolved" "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz"
-  "version" "2.1.0"
+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"
+    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@^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==
 
-"isstream@~0.1.2":
-  "integrity" "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
-  "resolved" "https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz"
-  "version" "0.1.2"
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz"
+  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
 
-"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"
+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":
-  "integrity" "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="
-  "resolved" "https://registry.npmmirror.com/jest-worker/-/jest-worker-26.6.2.tgz"
-  "version" "26.6.2"
+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.2":
-  "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", "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.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.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@^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@^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@^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@^5.0.0":
-  "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@^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":
-  "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@^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":
-  "integrity" "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-  "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz"
-  "version" "6.0.3"
+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":
-  "integrity" "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA=="
-  "resolved" "https://registry.npmmirror.com/klona/-/klona-2.0.6.tgz"
-  "version" "2.0.6"
+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":
-  "integrity" "sha512-K2yxgljj5TdCeRN1lBtO3/J26+AIDDDw+04y6VAiZbWcTdBwsYN6RrZBnW5DN/QiSIdKNjKdATLUUluWWFYTIA=="
-  "resolved" "https://registry.npmmirror.com/launch-editor-middleware/-/launch-editor-middleware-2.6.0.tgz"
-  "version" "2.6.0"
+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:
-    "launch-editor" "^2.6.0"
+    launch-editor "^2.6.0"
 
-"launch-editor@^2.2.1", "launch-editor@^2.6.0":
-  "integrity" "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ=="
-  "resolved" "https://registry.npmmirror.com/launch-editor/-/launch-editor-2.6.0.tgz"
-  "version" "2.6.0"
+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:
-    "picocolors" "^1.0.0"
-    "shell-quote" "^1.7.3"
+    picocolors "^1.0.0"
+    shell-quote "^1.7.3"
 
-"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"
+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:
-    "prelude-ls" "~1.1.2"
-    "type-check" "~0.3.2"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.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"
+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":
-  "integrity" "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-  "resolved" "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
-  "version" "1.2.4"
+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":
-  "integrity" "sha512-BKLUjWDsKquV/JuIcoQW4MSAI3ggwEImF1+sB4zaKvyVx1wBk3FsG7UK9bpnmBTN1pm7EH2BBcMwINJzCRv12g=="
-  "resolved" "https://registry.npmmirror.com/lint-staged/-/lint-staged-12.5.0.tgz"
-  "version" "12.5.0"
+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:
-    "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 "^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"
 
-"listr2@^4.0.5":
-  "integrity" "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA=="
-  "resolved" "https://registry.npmmirror.com/listr2/-/listr2-4.0.5.tgz"
-  "version" "4.0.5"
+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" "^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"
+    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"
 
-"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-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:
-    "find-cache-dir" "^0.1.1"
-    "mkdirp" "^0.5.1"
+    find-cache-dir "^0.1.1"
+    mkdirp "^0.5.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-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":
-  "integrity" "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug=="
-  "resolved" "https://registry.npmmirror.com/loader-utils/-/loader-utils-0.2.17.tgz"
-  "version" "0.2.17"
+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:
-    "big.js" "^3.1.3"
-    "emojis-list" "^2.0.0"
-    "json5" "^0.5.0"
-    "object-assign" "^4.0.1"
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.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.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" "^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.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.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@^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@^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"
+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" "^2.1.2"
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
 
-"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@^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:
-    "p-locate" "^3.0.0"
-    "path-exists" "^3.0.0"
+    p-locate "^3.0.0"
+    path-exists "^3.0.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"
+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" "^4.1.0"
+    p-locate "^4.1.0"
 
-"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.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":
-  "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.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":
-  "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.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":
-  "integrity" "sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ=="
-  "resolved" "https://registry.npmmirror.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"
-  "version" "4.6.0"
+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":
-  "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.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":
-  "integrity" "sha512-sOQs2aqGpbl27tmCS1QNZA09Uqp01ZzWfDUoD+xzTii0E7dSQfRKcRetFwa+uXaxaqL+TKm7CgD2JdKP7aZBSw=="
-  "resolved" "https://registry.npmmirror.com/lodash.padend/-/lodash.padend-4.6.1.tgz"
-  "version" "4.6.1"
+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":
-  "integrity" "sha512-LO37ZnhmBVx0GvOU/caQuipEh4GN82TcWv3yHlebGDgOxbxiwwzW5Pcx2AcvpIv2WmvmSMoC492yQFNhy/l/UQ=="
-  "resolved" "https://registry.npmmirror.com/lodash.transform/-/lodash.transform-4.6.0.tgz"
-  "version" "4.6.0"
+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":
-  "integrity" "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
-  "resolved" "https://registry.npmmirror.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
-  "version" "4.5.0"
+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":
-  "integrity" "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-  "resolved" "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz"
-  "version" "4.17.21"
+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":
-  "integrity" "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-  "resolved" "https://registry.npmmirror.com/lodash/-/lodash-4.17.11.tgz"
-  "version" "4.17.11"
+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":
-  "integrity" "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="
-  "resolved" "https://registry.npmmirror.com/log-symbols/-/log-symbols-2.2.0.tgz"
-  "version" "2.2.0"
+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:
-    "chalk" "^2.0.1"
+    chalk "^2.0.1"
 
-"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"
+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:
-    "ansi-escapes" "^4.3.0"
-    "cli-cursor" "^3.1.0"
-    "slice-ansi" "^4.0.0"
-    "wrap-ansi" "^6.2.0"
+    ansi-escapes "^4.3.0"
+    cli-cursor "^3.1.0"
+    slice-ansi "^4.0.0"
+    wrap-ansi "^6.2.0"
 
-"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"
+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":
-  "integrity" "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA=="
-  "resolved" "https://registry.npmmirror.com/lower-case/-/lower-case-1.1.4.tgz"
-  "version" "1.1.4"
+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":
-  "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.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:
-    "pseudomap" "^1.0.2"
-    "yallist" "^2.1.2"
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
 
-"lru-cache@^4.1.2":
-  "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@^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.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:
-    "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@^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" "^3.0.2"
+    yallist "^3.0.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@^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"
+    yallist "^4.0.0"
 
-"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"
+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.0":
-  "integrity" "sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA=="
-  "resolved" "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.1.tgz"
-  "version" "0.30.1"
+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", "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@^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@^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"
+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.2.1"
-    "domify" "^1.4.1"
-    "min-dash" "^4.0.0"
+    component-event "^0.2.1"
+    domify "^1.4.1"
+    min-dash "^4.0.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"
+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:
-    "loader-utils" "^1.1.0"
-    "normalize-url" "1.9.1"
-    "schema-utils" "^1.0.0"
-    "webpack-sources" "^1.1.0"
+    loader-utils "^1.1.0"
+    normalize-url "1.9.1"
+    schema-utils "^1.0.0"
+    webpack-sources "^1.1.0"
 
-"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"
+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":
-  "integrity" "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="
-  "resolved" "https://registry.npmmirror.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
-  "version" "1.0.1"
+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":
-  "integrity" "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="
-  "resolved" "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz"
-  "version" "3.1.2"
+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:
-    "brace-expansion" "^1.1.7"
+    brace-expansion "^1.1.7"
 
-"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"
+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==
 
-"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-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:
-    "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-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-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-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@^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@^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:
-    "yallist" "^4.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"
+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":
-  "integrity" "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="
-  "resolved" "https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz"
-  "version" "2.1.2"
+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:
-    "minipass" "^3.0.0"
-    "yallist" "^4.0.0"
+    minipass "^3.0.0"
+    yallist "^4.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"
+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:
-    "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"
+    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"
 
-"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.3:
+  version "1.2.0"
+  resolved "https://registry.npmmirror.com/mitt/-/mitt-1.2.0.tgz"
+  integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==
 
-"mitt@1.1.2":
-  "integrity" "sha512-3btxP0O9iGADGWAkteQ8mzDtEspZqu4I32y4GZYCV5BrwtzdcRpF4dQgNdJadCrbBx7Lu6Sq9AVrerMHR0Hkmw=="
-  "resolved" "https://registry.npmmirror.com/mitt/-/mitt-1.1.2.tgz"
-  "version" "1.1.2"
+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":
-  "integrity" "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="
-  "resolved" "https://registry.npmmirror.com/mixin-deep/-/mixin-deep-1.3.2.tgz"
-  "version" "1.3.2"
+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:
-    "for-in" "^1.0.2"
-    "is-extendable" "^1.0.1"
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
 
-"mkdirp@^0.5.1", "mkdirp@^0.5.3", "mkdirp@^0.5.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@^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:
-    "minimist" "^1.2.6"
+    minimist "^1.2.6"
 
-"mkdirp@^1.0.3":
-  "integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
-  "version" "1.0.4"
+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":
-  "integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
-  "version" "1.0.4"
+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":
-  "integrity" "sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ=="
-  "resolved" "https://registry.npmmirror.com/mockjs/-/mockjs-1.1.0.tgz"
-  "version" "1.1.0"
+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:
-    "commander" "*"
+    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"
+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:
-    "min-dash" "^3.5.2"
-    "moddle" "^5.0.2"
-    "saxen" "^8.1.2"
+    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"
+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:
-    "min-dash" "^3.0.0"
+    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"
+moment@^2.29.4:
+  version "2.29.4"
+  resolved "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz"
+  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
-"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"
+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:
-    "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"
+    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.1.1":
-  "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@^6.2.0":
-  "integrity" "sha512-/QTkbSAP2+w1nxV+qTcumSDN5PA98P0tjrADijIzQHe85oBK3Akhy9AHlH0ne/GombLMz1rLyvVsmrgRxoPDrQ=="
-  "resolved" "https://registry.npmmirror.com/mux.js/-/mux.js-6.3.0.tgz"
-  "version" "6.3.0"
+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"
 
-"mux.js@7.0.0":
-  "integrity" "sha512-DeZmr+3NDrO02k4SREtl4VB5GyGPCz2fzMjDxBIlamkxffSTLge97rtNMoonnmFHTp96QggDucUtKv3fmyObrA=="
-  "resolved" "https://registry.npmmirror.com/mux.js/-/mux.js-7.0.0.tgz"
-  "version" "7.0.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:
     "@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"
+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:
-    "any-promise" "^1.0.0"
-    "object-assign" "^4.0.1"
-    "thenify-all" "^1.0.0"
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.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"
+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==
 
-"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"
+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:
-    "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"
+    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"
 
-"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"
+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==
 
-"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"
+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":
-  "integrity" "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
-  "resolved" "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz"
-  "version" "2.6.2"
+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":
-  "integrity" "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-  "resolved" "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz"
-  "version" "1.0.5"
+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":
-  "integrity" "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="
-  "resolved" "https://registry.npmmirror.com/no-case/-/no-case-2.3.2.tgz"
-  "version" "2.3.2"
+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:
-    "lower-case" "^1.1.1"
+    lower-case "^1.1.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"
+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==
 
-"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"
+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:
-    "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"
+    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"
 
-"node-releases@^2.0.12":
-  "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-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":
-  "integrity" "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="
-  "resolved" "https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz"
-  "version" "5.0.0"
+nopt@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz"
+  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
   dependencies:
-    "abbrev" "1"
+    abbrev "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"
+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:
-    "hosted-git-info" "^2.1.4"
-    "resolve" "^1.10.0"
-    "semver" "2 || 3 || 4 || 5"
-    "validate-npm-package-license" "^3.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@^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@^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@^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-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:
-    "remove-trailing-separator" "^1.0.1"
+    remove-trailing-separator "^1.0.1"
 
-"normalize-path@^3.0.0", "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@^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==
 
-"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-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":
-  "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@^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":
-  "integrity" "sha512-A48My/mtCklowHBlI8Fq2jFWK4tX4lJ5E6ytFsSOq1fzpvT0SQSgKhSg7lN5c2uYFOrUAOQp6zhhJnpp1eMloQ=="
-  "resolved" "https://registry.npmmirror.com/normalize-url/-/normalize-url-1.9.1.tgz"
-  "version" "1.9.1"
+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:
-    "object-assign" "^4.0.1"
-    "prepend-http" "^1.0.0"
-    "query-string" "^4.1.0"
-    "sort-keys" "^1.0.0"
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
 
-"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-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":
-  "integrity" "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="
-  "resolved" "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-2.0.2.tgz"
-  "version" "2.0.2"
+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" "^2.0.0"
+    path-key "^2.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"
+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"
 
-"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.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:
-    "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"
+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":
-  "integrity" "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="
-  "resolved" "https://registry.npmmirror.com/nth-check/-/nth-check-1.0.2.tgz"
-  "version" "1.0.2"
+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"
 
-"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"
+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:
-    "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"
+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==
 
-"nzh@^1.0.8":
-  "integrity" "sha512-Hmx1wuoj5zoFCEhfic4zW/2csg/vb5BxXAUGUNIyBlSu7ZtZezGVGloqNCnRcHVU1fMC9ZTfvbi6ayPWC1sRSQ=="
-  "resolved" "https://registry.npmmirror.com/nzh/-/nzh-1.0.11.tgz"
-  "version" "1.0.11"
+nzh@^1.0.8:
+  version "1.0.11"
+  resolved "https://registry.npmmirror.com/nzh/-/nzh-1.0.11.tgz"
+  integrity sha512-Hmx1wuoj5zoFCEhfic4zW/2csg/vb5BxXAUGUNIyBlSu7ZtZezGVGloqNCnRcHVU1fMC9ZTfvbi6ayPWC1sRSQ==
 
-"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"
+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":
-  "integrity" "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-  "resolved" "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz"
-  "version" "4.1.1"
+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":
-  "integrity" "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ=="
-  "resolved" "https://registry.npmmirror.com/object-copy/-/object-copy-0.1.0.tgz"
-  "version" "0.1.0"
+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:
-    "copy-descriptor" "^0.1.0"
-    "define-property" "^0.2.5"
-    "kind-of" "^3.0.3"
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
 
-"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"
+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-inspect@^1.12.2", "object-inspect@^1.12.3", "object-inspect@^1.9.0":
-  "integrity" "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
-  "resolved" "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz"
-  "version" "1.12.3"
+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-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"
+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:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.1.3"
+    call-bind "^1.0.2"
+    define-properties "^1.1.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-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":
-  "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-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":
-  "integrity" "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA=="
-  "resolved" "https://registry.npmmirror.com/object-visit/-/object-visit-1.0.1.tgz"
-  "version" "1.0.1"
+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:
-    "isobject" "^3.0.0"
+    isobject "^3.0.0"
 
-"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.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.1.4"
-    "has-symbols" "^1.0.3"
-    "object-keys" "^1.1.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
+    object-keys "^1.1.1"
 
-"object.entries@^1.1.2":
-  "integrity" "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w=="
-  "resolved" "https://registry.npmmirror.com/object.entries/-/object.entries-1.1.6.tgz"
-  "version" "1.1.6"
+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.1.4"
-    "es-abstract" "^1.20.4"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-"object.getownpropertydescriptors@^2.0.3":
-  "integrity" "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ=="
-  "resolved" "https://registry.npmmirror.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz"
-  "version" "2.1.6"
+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.5"
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.21.2"
-    "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.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.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:
-    "isobject" "^3.0.1"
+    isobject "^3.0.1"
 
-"object.values@^1.1.0", "object.values@^1.1.6":
-  "integrity" "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw=="
-  "resolved" "https://registry.npmmirror.com/object.values/-/object.values-1.1.6.tgz"
-  "version" "1.1.6"
+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:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.1.4"
-    "es-abstract" "^1.20.4"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-"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"
+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":
-  "integrity" "sha512-b0k9uqwF60u15KmVkneVw96VYRtZu2QCbXUQ26SgdyVUgMBzctzIfhNPKAWl4oqJEKpe52CzBYSS+HIKtiK8sw=="
-  "resolved" "https://registry.npmmirror.com/omelette/-/omelette-0.4.5.tgz"
-  "version" "0.4.5"
+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":
-  "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.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:
-    "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-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-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"
+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":
-  "integrity" "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="
-  "resolved" "https://registry.npmmirror.com/once/-/once-1.4.0.tgz"
-  "version" "1.4.0"
+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:
-    "wrappy" "1"
+    wrappy "1"
 
-"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@^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:
-    "mimic-fn" "^1.0.0"
+    mimic-fn "^1.0.0"
 
-"onetime@^5.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"
+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" "^2.1.0"
+    mimic-fn "^2.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"
+open@^6.3.0:
+  version "6.4.0"
+  resolved "https://registry.npmmirror.com/open/-/open-6.4.0.tgz"
+  integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
   dependencies:
-    "is-wsl" "^1.1.0"
+    is-wsl "^1.1.0"
 
-"opener@^1.5.1":
-  "integrity" "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="
-  "resolved" "https://registry.npmmirror.com/opener/-/opener-1.5.2.tgz"
-  "version" "1.5.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":
-  "integrity" "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="
-  "resolved" "https://registry.npmmirror.com/opn/-/opn-5.5.0.tgz"
-  "version" "5.5.0"
+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:
-    "is-wsl" "^1.1.0"
+    is-wsl "^1.1.0"
 
-"optionator@^0.8.3":
-  "integrity" "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="
-  "resolved" "https://registry.npmmirror.com/optionator/-/optionator-0.8.3.tgz"
-  "version" "0.8.3"
+optionator@^0.8.3:
+  version "0.8.3"
+  resolved "https://registry.npmmirror.com/optionator/-/optionator-0.8.3.tgz"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   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"
+    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"
 
-"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"
+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:
-    "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"
+    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"
 
-"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-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":
-  "integrity" "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="
-  "resolved" "https://registry.npmmirror.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
-  "version" "1.0.2"
+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":
-  "integrity" "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="
-  "resolved" "https://registry.npmmirror.com/p-finally/-/p-finally-1.0.0.tgz"
-  "version" "1.0.0"
+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":
-  "integrity" "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="
-  "resolved" "https://registry.npmmirror.com/p-finally/-/p-finally-2.0.1.tgz"
-  "version" "2.0.1"
+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":
-  "integrity" "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="
-  "resolved" "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz"
-  "version" "2.3.0"
+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:
-    "p-try" "^2.0.0"
+    p-try "^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-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:
-    "yocto-queue" "^0.1.0"
+    yocto-queue "^0.1.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-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-limit" "^2.0.0"
+    p-limit "^2.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-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:
-    "p-limit" "^2.2.0"
+    p-limit "^2.2.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-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":
-  "integrity" "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="
-  "resolved" "https://registry.npmmirror.com/p-map/-/p-map-4.0.0.tgz"
-  "version" "4.0.0"
+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:
-    "aggregate-error" "^3.0.0"
+    aggregate-error "^3.0.0"
 
-"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"
+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:
-    "retry" "^0.12.0"
+    retry "^0.12.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"
+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==
 
-"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"
+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":
-  "integrity" "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg=="
-  "resolved" "https://registry.npmmirror.com/parallel-transform/-/parallel-transform-1.2.0.tgz"
-  "version" "1.2.0"
+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:
-    "cyclist" "^1.0.1"
-    "inherits" "^2.0.3"
-    "readable-stream" "^2.1.5"
+    cyclist "^1.0.1"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
 
-"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"
+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:
-    "no-case" "^2.2.0"
+    no-case "^2.2.0"
 
-"parchment@^1.1.4":
-  "integrity" "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
-  "resolved" "https://registry.npmmirror.com/parchment/-/parchment-1.1.4.tgz"
-  "version" "1.1.4"
+parchment@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmmirror.com/parchment/-/parchment-1.1.4.tgz"
+  integrity sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==
 
-"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"
+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:
-    "callsites" "^3.0.0"
+    callsites "^3.0.0"
 
-"parse-asn1@^5.0.0", "parse-asn1@^5.1.5":
-  "integrity" "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="
-  "resolved" "https://registry.npmmirror.com/parse-asn1/-/parse-asn1-5.1.6.tgz"
-  "version" "5.1.6"
+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:
-    "asn1.js" "^5.2.0"
-    "browserify-aes" "^1.0.0"
-    "evp_bytestokey" "^1.0.0"
-    "pbkdf2" "^3.0.3"
-    "safe-buffer" "^5.1.1"
+    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-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==
 
-"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"
+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:
-    "error-ex" "^1.3.1"
-    "json-parse-better-errors" "^1.0.1"
+    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"
+    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"
+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"
+    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"
+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":
-  "integrity" "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg=="
-  "resolved" "https://registry.npmmirror.com/postcss-calc/-/postcss-calc-7.0.5.tgz"
-  "version" "7.0.5"
+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 "^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"
+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"
+    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"
+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 "^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"
+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 "^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"
+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 "^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"
+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 "^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"
+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 "^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"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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 "^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"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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 "^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"
+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"
+    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"
+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 "^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"
+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"
+    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"
+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 "^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"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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 "^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"
+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"
+    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-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":
-  "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"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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 "^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"
+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"
+    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@^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":
-  "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-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":
-  "integrity" "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz"
-  "version" "5.2.18"
+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"
+    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":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
+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"
+    picocolors "^0.2.1"
+    source-map "^0.6.1"
 
-"postcss@^8.1.10":
-  "integrity" "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz"
-  "version" "8.4.27"
+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"
+    nanoid "^3.3.6"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
 
-"postcss@^8.4.14":
-  "integrity" "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz"
-  "version" "8.4.27"
+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"
+    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"
+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"
+    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"
+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"
+    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-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":
-  "integrity" "sha512-hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ=="
-  "resolved" "https://registry.npmmirror.com/posthtml-svg-mode/-/posthtml-svg-mode-1.0.3.tgz"
-  "version" "1.0.3"
+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"
+    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"
+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"
+    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"
+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":
-  "integrity" "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
-  "resolved" "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.1.2.tgz"
-  "version" "1.1.2"
+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":
-  "integrity" "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg=="
-  "resolved" "https://registry.npmmirror.com/prepend-http/-/prepend-http-1.0.4.tgz"
-  "version" "1.0.4"
+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":
-  "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"
+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"
+    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"
+"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":
-  "integrity" "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw=="
-  "resolved" "https://registry.npmmirror.com/pretty-error/-/pretty-error-2.1.2.tgz"
-  "version" "2.1.2"
+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"
+    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-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":
-  "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.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":
-  "integrity" "sha512-oNpcutj+nYX2FjdEW7PGltWhXulAnFlM0My/k48L90hARCOJtvBbQXc/6itV2jDvU5xAAtonP+r6wmQgCcbAUA=="
-  "resolved" "https://registry.npmmirror.com/process/-/process-0.5.2.tgz"
-  "version" "0.5.2"
+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":
-  "integrity" "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-  "resolved" "https://registry.npmmirror.com/progress/-/progress-2.0.3.tgz"
-  "version" "2.0.3"
+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":
-  "integrity" "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="
-  "resolved" "https://registry.npmmirror.com/promise-inflight/-/promise-inflight-1.0.1.tgz"
-  "version" "1.0.1"
+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":
-  "integrity" "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="
-  "resolved" "https://registry.npmmirror.com/proto-list/-/proto-list-1.2.4.tgz"
-  "version" "1.2.4"
+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":
-  "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"
+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"
+    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"
+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":
-  "integrity" "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
-  "resolved" "https://registry.npmmirror.com/pseudomap/-/pseudomap-1.0.2.tgz"
-  "version" "1.0.2"
+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":
-  "integrity" "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
-  "resolved" "https://registry.npmmirror.com/psl/-/psl-1.9.0.tgz"
-  "version" "1.9.0"
+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":
-  "integrity" "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="
-  "resolved" "https://registry.npmmirror.com/public-encrypt/-/public-encrypt-4.0.3.tgz"
-  "version" "4.0.3"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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"
+    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.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":
-  "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:
+  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":
-  "integrity" "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
-  "resolved" "https://registry.npmmirror.com/punycode/-/punycode-2.3.0.tgz"
-  "version" "2.3.0"
+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":
-  "integrity" "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="
-  "resolved" "https://registry.npmmirror.com/q/-/q-1.5.1.tgz"
-  "version" "1.5.1"
+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":
-  "integrity" "sha512-R7t6Y3fDDtcU7L4rtqwGUDP9xD64gJhIwpfjhRCTKmBoYF6SS49PIJHRJ048cse6OI7iwTwgyy2C46N9Ygoc6g=="
-  "resolved" "https://registry.npmmirror.com/qrcode.vue/-/qrcode.vue-1.7.0.tgz"
-  "version" "1.7.0"
+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":
-  "integrity" "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA=="
-  "resolved" "https://registry.npmmirror.com/qs/-/qs-6.11.2.tgz"
-  "version" "6.11.2"
+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"
+    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.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":
-  "integrity" "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="
-  "resolved" "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz"
-  "version" "6.11.0"
+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"
+    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"
+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"
+    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"
+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":
-  "integrity" "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
-  "resolved" "https://registry.npmmirror.com/querystringify/-/querystringify-2.2.0.tgz"
-  "version" "2.2.0"
+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":
-  "integrity" "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg=="
-  "resolved" "https://registry.npmmirror.com/quill-delta/-/quill-delta-3.6.3.tgz"
-  "version" "3.6.3"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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"
+    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"
+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":
-  "integrity" "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="
-  "resolved" "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.1.tgz"
-  "version" "2.5.1"
+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"
+    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"
+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"
 
-"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@^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:
-    "graceful-fs" "^4.1.11"
-    "micromatch" "^3.1.10"
-    "readable-stream" "^2.0.2"
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
 
-"readdirp@~3.6.0":
-  "integrity" "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="
-  "resolved" "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz"
-  "version" "3.6.0"
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
-    "picomatch" "^2.2.1"
+    picomatch "^2.2.1"
 
-"regenerate-unicode-properties@^10.1.0":
-  "integrity" "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ=="
-  "resolved" "https://registry.npmmirror.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"
-  "version" "10.1.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:
-    "regenerate" "^1.4.2"
+    regenerate "^1.4.2"
 
-"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"
+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==
 
-"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.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.13.11", "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.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-transform@^0.15.1":
-  "integrity" "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg=="
-  "resolved" "https://registry.npmmirror.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz"
-  "version" "0.15.1"
+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.0":
-  "integrity" "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA=="
-  "resolved" "https://registry.npmmirror.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz"
-  "version" "1.5.0"
+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"
-    "functions-have-names" "^1.2.3"
+    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.1":
-  "integrity" "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g=="
-  "resolved" "https://registry.npmmirror.com/resolve/-/resolve-1.22.2.tgz"
-  "version" "1.22.2"
+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.11.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":
-  "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@^2.6.1":
-  "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
-  "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
-  "version" "2.7.1"
+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-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
-  "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
-  "version" "2.7.1"
+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"
 
-"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@^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:
-    "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.6.3"
+  resolved "https://registry.npmmirror.com/rimraf/-/rimraf-2.6.3.tgz"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   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"
+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:
-    "hash-base" "^3.0.0"
-    "inherits" "^2.0.1"
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
 
-"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-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":
-  "integrity" "sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg=="
-  "resolved" "https://registry.npmmirror.com/run-queue/-/run-queue-1.0.3.tgz"
-  "version" "1.0.3"
+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:
-    "aproba" "^1.1.1"
+    aproba "^1.1.1"
 
-"runjs@4.4.2":
-  "integrity" "sha512-/DB54HRJnxfGA/a9QLZMyAn8H84SMt8oVGF7Vz+OS4BMCve312DXNRpy6Z8yohLuoMctoalXQtvmpd2ChQYD4Q=="
-  "resolved" "https://registry.npmmirror.com/runjs/-/runjs-4.4.2.tgz"
-  "version" "4.4.2"
+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:
-    "chalk" "2.3.0"
-    "lodash.padend" "4.6.1"
-    "microcli" "1.3.3"
-    "omelette" "0.4.5"
+    chalk "2.3.0"
+    lodash.padend "4.6.1"
+    microcli "1.3.3"
+    omelette "0.4.5"
 
-"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"
+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:
-    "individual" "^2.0.0"
+    individual "^2.0.0"
 
-"rxjs@^6.6.0":
-  "integrity" "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="
-  "resolved" "https://registry.npmmirror.com/rxjs/-/rxjs-6.6.7.tgz"
-  "version" "6.6.7"
+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:
-    "tslib" "^1.9.0"
+    tslib "^1.9.0"
 
-"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"
+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:
-    "tslib" "^2.1.0"
+    tslib "^2.1.0"
 
-"safe-array-concat@^1.0.0":
-  "integrity" "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ=="
-  "resolved" "https://registry.npmmirror.com/safe-array-concat/-/safe-array-concat-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.2.0"
-    "has-symbols" "^1.0.3"
-    "isarray" "^2.0.5"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
 
-"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":
-  "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.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":
-  "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.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":
-  "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:
+  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":
-  "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:
+  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":
-  "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"
+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:
-    "rust-result" "^1.0.0"
+    rust-result "^1.0.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-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:
-    "call-bind" "^1.0.2"
-    "get-intrinsic" "^1.1.3"
-    "is-regex" "^1.1.4"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
 
-"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-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:
-    "ret" "~0.1.10"
+    ret "~0.1.10"
 
-"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"
+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==
 
-"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"
+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:
-    "klona" "^2.0.4"
-    "loader-utils" "^2.0.0"
-    "neo-async" "^2.6.2"
-    "schema-utils" "^3.0.0"
-    "semver" "^7.3.2"
+    klona "^2.0.4"
+    loader-utils "^2.0.0"
+    neo-async "^2.6.2"
+    schema-utils "^3.0.0"
+    semver "^7.3.2"
 
-"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"
+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"
+    chokidar ">=3.0.0 <4.0.0"
 
-"sax@^1.2.4", "sax@~1.2.4":
-  "integrity" "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-  "resolved" "https://registry.npmmirror.com/sax/-/sax-1.2.4.tgz"
-  "version" "1.2.4"
+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":
-  "integrity" "sha512-xUOiiFbc3Ow7p8KMxwsGICPx46ZQvy3+qfNVhrkwfz3Vvq45eGt98Ft5IQaA1R/7Tb5B5MKh9fUR9x3c3nDTxw=="
-  "resolved" "https://registry.npmmirror.com/saxen/-/saxen-8.1.2.tgz"
-  "version" "8.1.2"
+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":
-  "integrity" "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="
-  "resolved" "https://registry.npmmirror.com/schema-utils/-/schema-utils-1.0.0.tgz"
-  "version" "1.0.0"
+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"
+    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":
-  "integrity" "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="
-  "resolved" "https://registry.npmmirror.com/schema-utils/-/schema-utils-2.7.1.tgz"
-  "version" "2.7.1"
+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":
-  "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@^5.6.0":
-  "integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
-  "version" "5.7.2"
+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.0.0", "semver@^6.1.0", "semver@^6.1.2", "semver@^6.3.0", "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@^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@^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"
 
 "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"
+  version "5.7.2"
+  resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-"send@0.18.0":
-  "integrity" "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="
-  "resolved" "https://registry.npmmirror.com/send/-/send-0.18.0.tgz"
-  "version" "0.18.0"
+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-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"
+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:
-    "extend-shallow" "^2.0.1"
-    "is-extendable" "^0.1.1"
-    "is-plain-object" "^2.0.3"
-    "split-string" "^3.0.1"
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
 
-"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"
+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":
-  "integrity" "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-  "resolved" "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.1.0.tgz"
-  "version" "1.1.0"
+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":
-  "integrity" "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-  "resolved" "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz"
-  "version" "1.2.0"
+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":
-  "integrity" "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="
-  "resolved" "https://registry.npmmirror.com/sha.js/-/sha.js-2.4.11.tgz"
-  "version" "2.4.11"
+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:
-    "inherits" "^2.0.1"
-    "safe-buffer" "^5.0.1"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
-"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-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:
-    "shebang-regex" "^1.0.0"
+    shebang-regex "^1.0.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"
+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:
-    "shebang-regex" "^3.0.0"
+    shebang-regex "^3.0.0"
 
-"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"
+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":
-  "integrity" "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-  "resolved" "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz"
-  "version" "3.0.0"
+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":
-  "integrity" "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA=="
-  "resolved" "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.8.1.tgz"
-  "version" "1.8.1"
+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":
-  "integrity" "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="
-  "resolved" "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz"
-  "version" "1.0.4"
+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:
-    "call-bind" "^1.0.0"
-    "get-intrinsic" "^1.0.2"
-    "object-inspect" "^1.9.0"
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.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"
+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":
-  "integrity" "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-  "resolved" "https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz"
-  "version" "3.0.7"
+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":
-  "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"
+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:
-    "is-arrayish" "^0.3.1"
+    is-arrayish "^0.3.1"
 
-"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@^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==
 
-"slash@^2.0.0":
-  "integrity" "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="
-  "resolved" "https://registry.npmmirror.com/slash/-/slash-2.0.0.tgz"
-  "version" "2.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==
 
-"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@^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:
-    "ansi-styles" "^3.2.0"
-    "astral-regex" "^1.0.0"
-    "is-fullwidth-code-point" "^2.0.0"
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
+    is-fullwidth-code-point "^2.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@^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:
-    "ansi-styles" "^4.0.0"
-    "astral-regex" "^2.0.0"
-    "is-fullwidth-code-point" "^3.0.0"
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.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"
+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" "^4.0.0"
-    "astral-regex" "^2.0.0"
-    "is-fullwidth-code-point" "^3.0.0"
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
 
-"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"
+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" "^6.0.0"
-    "is-fullwidth-code-point" "^4.0.0"
+    ansi-styles "^6.0.0"
+    is-fullwidth-code-point "^4.0.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-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:
-    "define-property" "^1.0.0"
-    "isobject" "^3.0.0"
-    "snapdragon-util" "^3.0.1"
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
 
-"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"
+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:
-    "kind-of" "^3.2.0"
+    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"
+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:
-    "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"
+    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-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
-  "resolved" "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz"
-  "version" "3.0.13"
+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-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="
-  "resolved" "https://registry.npmmirror.com/sshpk/-/sshpk-1.17.0.tgz"
-  "version" "1.17.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.7":
-  "integrity" "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg=="
-  "resolved" "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz"
-  "version" "1.2.7"
+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.1.4"
-    "es-abstract" "^1.20.4"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-"string.prototype.trimend@^1.0.6":
-  "integrity" "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ=="
-  "resolved" "https://registry.npmmirror.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"
-  "version" "1.0.6"
+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.1.4"
-    "es-abstract" "^1.20.4"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-"string.prototype.trimstart@^1.0.6":
-  "integrity" "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="
-  "resolved" "https://registry.npmmirror.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"
-  "version" "1.0.6"
+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.1.4"
-    "es-abstract" "^1.20.4"
+    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", "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@^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@^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-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":
-  "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"
+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":
-  "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-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:
-    "deepmerge" "1.3.2"
-    "mitt" "1.1.2"
-    "svg-baker" "^1.7.0"
+    deepmerge "1.3.2"
+    mitt "1.1.2"
+    svg-baker "^1.7.0"
 
-"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-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:
-    "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"
+    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-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-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":
-  "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-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"
-    "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"
+    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-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-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.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"
+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":
-  "integrity" "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="
-  "resolved" "https://registry.npmmirror.com/svgo/-/svgo-1.3.2.tgz"
-  "version" "1.3.2"
+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:
-    "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"
+    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"
 
-"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"
+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:
-    "ajv" "^6.10.2"
-    "lodash" "^4.17.14"
-    "slice-ansi" "^2.1.0"
-    "string-width" "^3.0.0"
+    ajv "^6.10.2"
+    lodash "^4.17.14"
+    slice-ansi "^2.1.0"
+    string-width "^3.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"
+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":
-  "integrity" "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A=="
-  "resolved" "https://registry.npmmirror.com/tar/-/tar-6.1.15.tgz"
-  "version" "6.1.15"
+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:
-    "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"
+    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"
 
-"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.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:
-    "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@^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@^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-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" "^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"
+    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@^4.1.2":
-  "integrity" "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="
-  "resolved" "https://registry.npmmirror.com/terser/-/terser-4.8.1.tgz"
-  "version" "4.8.1"
+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:
-    "commander" "^2.20.0"
-    "source-map" "~0.6.1"
-    "source-map-support" "~0.5.12"
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
 
-"terser@^5.3.4":
-  "integrity" "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA=="
-  "resolved" "https://registry.npmmirror.com/terser/-/terser-5.19.2.tgz"
-  "version" "5.19.2"
+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.1":
-  "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"
 
-"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-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-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.11":
-  "integrity" "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA=="
-  "resolved" "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz"
-  "version" "1.0.11"
+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-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA=="
-  "resolved" "https://registry.npmmirror.com/url/-/url-0.11.1.tgz"
-  "version" "0.11.1"
+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.0"
+    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", "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.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.2"
-    "object.getownpropertydescriptors" "^2.0.3"
+    define-properties "^1.1.2"
+    object.getownpropertydescriptors "^2.0.3"
 
-"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"
+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:
-    "inherits" "2.0.3"
+    inherits "2.0.3"
 
-"util@0.10.3":
-  "integrity" "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ=="
-  "resolved" "https://registry.npmmirror.com/util/-/util-0.10.3.tgz"
-  "version" "0.10.3"
+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.1"
+    inherits "2.0.1"
 
-"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"
+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":
-  "integrity" "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
-  "resolved" "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz"
-  "version" "1.0.1"
+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":
-  "integrity" "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw=="
-  "resolved" "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz"
-  "version" "1.0.2"
+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:
-    "base64-arraybuffer" "^1.0.2"
+    base64-arraybuffer "^1.0.2"
 
-"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"
+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==
 
-"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"
+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==
 
-"v8-compile-cache@^2.0.3":
-  "integrity" "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
-  "resolved" "https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"
-  "version" "2.3.0"
+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":
-  "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"
+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:
-    "spdx-correct" "^3.0.0"
-    "spdx-expression-parse" "^3.0.0"
+    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"
+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==
 
-"vendors@^1.0.0":
-  "integrity" "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="
-  "resolved" "https://registry.npmmirror.com/vendors/-/vendors-1.0.4.tgz"
-  "version" "1.0.4"
+vendors@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/vendors/-/vendors-1.0.4.tgz"
+  integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
-"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"
+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:
-    "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-6/uNXQV3xSaKLpaPf/bVvr7omd+82sKUp0RMBgIt4PxHIe28GtX+O+GcNfI2fuwBvcDRDqk5Ei5AG9bJJOpulA=="
-  "resolved" "https://registry.npmmirror.com/video.js/-/video.js-8.5.2.tgz"
-  "version" "8.5.2"
+"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.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" "^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"
+    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-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g=="
-  "resolved" "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-9.3.1.tgz"
-  "version" "9.3.1"
+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-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA=="
-  "resolved" "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz"
-  "version" "15.10.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.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":
-  "integrity" "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="
-  "resolved" "https://registry.npmmirror.com/webpack/-/webpack-4.46.0.tgz"
-  "version" "4.46.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.10", "which-typed-array@^1.1.11":
-  "integrity" "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew=="
-  "resolved" "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.11.tgz"
-  "version" "1.1.11"
+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.2"
-    "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"