diff --git a/.env.dev b/.env.dev
index 16e36043..233c342e 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-12-13 15:33:20
+ # @LastEditTime: 2023-12-13 16:52:10
  # @LastEditors: zhp
  # @Description:
 ###
@@ -20,8 +20,8 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.56:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
-VUE_APP_BASE_API = 'http://192.168.1.78:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.62:48082'
+
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
 
diff --git a/src/api/base/energyQuantityManual.js b/src/api/base/energyQuantityManual.js
new file mode 100644
index 00000000..d919b5a3
--- /dev/null
+++ b/src/api/base/energyQuantityManual.js
@@ -0,0 +1,56 @@
+import request from '@/utils/request'
+
+// 获得分页数据
+export function energyQuantityManualPage(data) {
+  return request({
+    url: '/base/energy-quantity-manual/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 创建
+export function energyQuantityManualCreate(data) {
+  return request({
+    url: '/base/energy-quantity-manual/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新
+export function energyQuantityManualUpdate(data) {
+  return request({
+    url: '/base/energy-quantity-manual/update',
+    method: 'put',
+    data: data
+  })
+}
+
+//获得能源抄表（手动）
+export function energyQuantityManualGet(query) {
+  return request({
+    url: '/base/energy-quantity-manual/get',
+    method: 'get',
+    params: query
+  })
+}
+
+//删除
+export function energyQuantityManualDelete(query) {
+  return request({
+    url: '/base/energy-quantity-manual/delete',
+    method: 'delete',
+    params: query
+  })
+}
+
+//导出
+export function energyQuantityManualExport(data) {
+  return request({
+    url: '/base/energy-quantity-manual/export-excel',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}
\ No newline at end of file
diff --git a/src/api/cost/costEneryAutoReport.js b/src/api/cost/costEneryAutoReport.js
new file mode 100644
index 00000000..4cfe8633
--- /dev/null
+++ b/src/api/cost/costEneryAutoReport.js
@@ -0,0 +1,78 @@
+/*
+ * @Author: zwq
+ * @Date: 2023-11-23 14:57:00
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-12-07 09:37:18
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建能源自动记录报
+export function createCostEneryAutoReport(data) {
+  return request({
+    url: '/extend/cost-enery-auto-report/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新能源自动记录报
+export function updateCostEneryAutoReport(data) {
+  return request({
+    url: '/extend/cost-enery-auto-report/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源自动记录报
+export function deleteCostEneryAutoReport(id) {
+  return request({
+    url: '/extend/cost-enery-auto-report/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得能源自动记录报
+export function getCostEneryAutoReport(id) {
+  return request({
+    url: '/extend/cost-enery-auto-report/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得能源自动记录报分页历史
+export function getCostEneryAutoReportPage(data) {
+  return request({
+    url: '/extend/cost-enery-auto-report/page',
+    method: 'post',
+    data: data
+  })
+}
+// 获得能源查询
+export function getCostEneryAutoPage(data) {
+  return request({
+    url: '/extend/cost-energy-search/getData',
+    method: 'post',
+    data: data
+  })
+}
+// 导出能源自动记录报 Excel
+export function exportCostEneryAutoReportExcel(data) {
+  return request({
+    url: '/extend/cost-enery-auto-report/export-excel',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}
+
+// 导出能源自动记录报 Excel 查询
+export function exportCostEneryExcel(data) {
+  return request({
+    url: '/extend/cost-energy-search/export-excel',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}
diff --git a/src/api/cost/costMaterialAutoReport.js b/src/api/cost/costMaterialAutoReport.js
new file mode 100644
index 00000000..32a58dc1
--- /dev/null
+++ b/src/api/cost/costMaterialAutoReport.js
@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+
+// 创建原料成本自动统计报
+export function createCostMaterialAutoReport(data) {
+  return request({
+    url: '/extend/cost-material-auto-report/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原料成本自动统计报
+export function updateCostMaterialAutoReport(data) {
+  return request({
+    url: '/extend/cost-material-auto-report/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除原料成本自动统计报
+export function deleteCostMaterialAutoReport(id) {
+  return request({
+    url: '/extend/cost-material-auto-report/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原料成本自动统计报
+export function getCostMaterialAutoReport(id) {
+  return request({
+    url: '/extend/cost-material-auto-report/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原料成本自动统计报分页历史
+export function getCostMaterialAutoReportPage(data) {
+  return request({
+    url: '/extend/cost-material-auto-report/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得原料成本查询
+export function getCostMaterialSearchPage(data) {
+  return request({
+    url: '/extend/cost-material-search/getData',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出原料成本自动统计报 Excel
+export function exportCostMaterialAutoReportExcel(data) {
+  return request({
+    url: '/extend/cost-material-auto-report/export-excel',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}
+
+// 导出原料成本自动统计报 Excel查询
+export function exportCostMaterialSearch(data) {
+  return request({
+    url: '/extend/cost-material-search/export-excel',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}
diff --git a/src/api/cost/costMaterialSet.js b/src/api/cost/costMaterialSet.js
new file mode 100644
index 00000000..6d825d33
--- /dev/null
+++ b/src/api/cost/costMaterialSet.js
@@ -0,0 +1,61 @@
+/*
+ * @Author: zwq
+ * @Date: 2023-11-15 09:24:30
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-12-05 14:38:48
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建原料价位配置
+export function createCostMaterialSet(data) {
+  return request({
+    url: '/extend/cost-material-set/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原料价位配置
+export function updateCostMaterialSet(data) {
+  return request({
+    url: '/extend/cost-material-set/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除原料价位配置
+export function deleteCostMaterialSet(id) {
+  return request({
+    url: '/extend/cost-material-set/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原料价位配置
+export function getCostMaterialSet(id) {
+  return request({
+    url: '/extend/cost-material-set/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原料价位配置分页
+export function getCostMaterialSetPage(data) {
+  return request({
+    url: '/extend/cost-material-set/page',
+    method: 'POST',
+    data: data
+  })
+}
+
+// 导出原料价位配置 Excel
+export function exportCostMaterialSetExcel(query) {
+  return request({
+    url: '/extend/cost-material-set/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
diff --git a/src/api/safetyEnvironmental/environmental.js b/src/api/safetyEnvironmental/environmental.js
new file mode 100644
index 00000000..355d0f89
--- /dev/null
+++ b/src/api/safetyEnvironmental/environmental.js
@@ -0,0 +1,92 @@
+import request from '@/utils/request'
+
+// 获得环保检测指标实时数据
+export function environmentalCheckRealtime(query) {
+  return request({
+    url: '/base/environmental-check/realtime',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得环保检测指标趋势数据
+export function environmentalCheckRealtimeTrend(data) {
+  return request({
+    url: '/base/environmental-check-record/trend',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得环保检测指标分页
+export function environmentalCheckPage(query) {
+  return request({
+    url: '/base/environmental-check/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建环保检测指标
+export function environmentalCheckCreate(data) {
+  return request({
+    url: '/base/environmental-check/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新环保检测指标
+export function environmentalCheckUpdate(data) {
+  return request({
+    url: '/base/environmental-check/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获得环保检测指标
+export function environmentalCheckGet(query) {
+  return request({
+    url: '/base/environmental-check/get',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除环保检测指标
+export function environmentalCheckDelete(query) {
+  return request({
+    url: '/base/environmental-check/delete',
+    method: 'delete',
+    params: query
+  })
+}
+
+// 获得环保检测记录分页
+export function environmentalCheckRecordPage(data) {
+  return request({
+    url: '/base/environmental-check-record/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出环保检测记录 Excel
+export function environmentalCheckRecordExport(data) {
+  return request({
+    url: '/base/environmental-check-record/export-excel',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}
+
+// 获取环保检测指标code
+export function getEnvironmentalCheckCode(query) {
+  return request({
+    url: '/base/environmental-check/getCode',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/assets/images/choicepart/Cost.png b/src/assets/images/choicepart/Cost.png
new file mode 100644
index 00000000..76cf8538
Binary files /dev/null and b/src/assets/images/choicepart/Cost.png differ
diff --git a/src/assets/images/choicepart/Databoard.png b/src/assets/images/choicepart/Databoard.png
new file mode 100644
index 00000000..d9bc3d0c
Binary files /dev/null and b/src/assets/images/choicepart/Databoard.png differ
diff --git a/src/assets/images/choicepart/SafetyEnvironmental.png b/src/assets/images/choicepart/SafetyEnvironmental.png
new file mode 100644
index 00000000..ef6e9085
Binary files /dev/null and b/src/assets/images/choicepart/SafetyEnvironmental.png differ
diff --git a/src/assets/images/detectionData.png b/src/assets/images/detectionData.png
new file mode 100644
index 00000000..7142140d
Binary files /dev/null and b/src/assets/images/detectionData.png differ
diff --git a/src/utils/dict.js b/src/utils/dict.js
index ecaafb16..7030db51 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -94,6 +94,8 @@ export const DICT_TYPE = {
   OBJECT_TYPE: 'object_type',
   STATISTIC_TYPE: 'statistic_type',
   TIME_DIM: 'time_dim',
+  TABLE_NAME: 'table_name',
+  METHOD: 'method',
 
   // ============== ORDER - 订单模块 =============
   ORDER_STATUS: 'order_status',
@@ -104,6 +106,9 @@ export const DICT_TYPE = {
   // ============== EQUIPMENT - 设备模块 =============
   MAINTAIN_TYPE: 'maintain_type',
   FAULT_LEVEL: 'fault-level',
+
+  // ============== ENVIRONMENTAL - 环保模块 =============
+  ENVIRONMENT_CHECK_UNIT: 'environment_check_unit'
 }
 
 /**
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 3b4e5256..5d875af0 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -5,7 +5,7 @@
 
 const baseURL = process.env.VUE_APP_BASE_API
 
-// 日期格式化
+// 日期格式化（通用）
 export function parseTime(time, pattern) {
   if (arguments.length === 0 || !time) {
     return null
@@ -48,6 +48,51 @@ export function parseTime(time, pattern) {
   return time_str
 }
 
+// 日期格式化(仅适用表格)
+export function parseTimeTable(pattern) {
+  return function(time){
+    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 function resetForm(refName) {
   if (this.$refs[refName]) {
diff --git a/src/views/choicePart/index.vue b/src/views/choicePart/index.vue
index f77cef0d..add8d8bd 100644
--- a/src/views/choicePart/index.vue
+++ b/src/views/choicePart/index.vue
@@ -2,7 +2,7 @@
   <div class="choicepart-container">
     <navbar />
     <div class="choicepart-wrapper">
-      <div class="choicepart-box" id="choicepartBox" :style="'transform:scale('+scale+');width:1574px;height:538px;'" v-show="showItem">
+      <div class="choicepart-box" id="choicepartBox" :style="'transform:scale('+scale+');width:1710px;height:538px;'" v-show="showItem">
       <div class="choicepart-line1">
         <div
           v-for="(item, index) in menuArr1"
@@ -102,9 +102,7 @@ export default {
           meta: {
             title: ''
           }
-        }
-      ],
-      menuArr2: [
+        },
         {
           name: 'Packaging',
           title: '包装管理',
@@ -112,7 +110,9 @@ export default {
           meta: {
             title: ''
           }
-        },
+        }
+      ],
+      menuArr2: [
         {
           name: 'Material',
           title: '物料管理',
@@ -129,17 +129,41 @@ export default {
             title: ''
           }
         },
+        // {
+        //   name: 'Delivery',
+        //   title: '成品发货',
+        //   visible: false,
+        //   meta: {
+        //     title: ''
+        //   }
+        // },
         {
-          name: 'Delivery',
-          title: '成品发货',
+          name: 'Report',
+          title: '报表管理',
           visible: false,
           meta: {
             title: ''
           }
         },
         {
-          name: 'Report',
-          title: '报表管理',
+          name: 'Cost',
+          title: '成本管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'SafetyEnvironmental',
+          title: '安环管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'Databoard',
+          title: '数据驾驶舱',
           visible: false,
           meta: {
             title: ''
@@ -176,7 +200,7 @@ export default {
       console.log(menuList)
       if (menuList.length > 0) {
         for (let i = 0; i < menuList.length; i ++) {
-          for (let k = 0; k < 7; k++) {
+          for (let k = 0; k < 8; k++) {
             if (menuList[i].name === this.menuArr1[k].name) {
               this.menuArr1[k].visible = true
               this.menuArr1[k].id = menuList[i].id
@@ -185,7 +209,7 @@ export default {
               this.menuArr1[k].meta = menuList[i].meta
             }
           }
-          for (let j = 0; j < 6; j++) {
+          for (let j = 0; j < 7; j++) {
             if (menuList[i].name === this.menuArr2[j].name) {
               this.menuArr2[j].visible = true
               this.menuArr2[j].id = menuList[i].id
diff --git a/src/views/cost/energyCost/index.vue b/src/views/cost/energyCost/index.vue
new file mode 100644
index 00000000..a0e122aa
--- /dev/null
+++ b/src/views/cost/energyCost/index.vue
@@ -0,0 +1,162 @@
+<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"></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 codeFilter from '../mixins/code-filter';
+import {
+	getCostEneryAutoPage,
+	exportCostEneryExcel,
+} from '@/api/cost/costEneryAutoReport';
+import { getEnergyTypeListAll } from '@/api/base/energyType';
+import { publicFormatter } from '@/utils/dict';
+
+const tableProps = [
+	{
+		prop: 'energyTypeName',
+		label: '能源类型',
+	},
+	{
+		prop: 'objName',
+		label: '监控对象',
+		filter: (val) => (val != null ? val : '--'),
+	},
+	{
+		prop: 'tableName',
+		label: '水/气表名',
+		filter: (val) => (val != null ? val : '--'),
+		filter: publicFormatter('table_name'),
+	},
+	{
+		prop: 'totalUsed',
+		label: '累计使用量',
+	},
+	{
+		prop: 'totalCost',
+		label: '总价',
+		align: 'right',
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCostEneryAutoPage,
+        exportURL: exportCostEneryExcel
+			},
+			tableData: [],
+			tableProps,
+			drawerVisible: false,
+			formConfig: [
+				{
+					type: 'select',
+					label: '能源类型',
+					selectOptions: [],
+					param: 'energyTypeId',
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '时间范围',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: this.$auth.hasPermi('cost:energyCost:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					color: 'primary',
+					plain: true,
+				},
+			],
+		};
+	},
+	components: {},
+	created() {
+		getEnergyTypeListAll().then((response) => {
+			this.formConfig[0].selectOptions = response.data;
+		});
+	},
+	methods: {
+    // 获取数据列表
+    getDataList() {
+      if(this.listQuery.searchTime){
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        if(response.hasOwnProperty('data')){
+          this.tableData = response.data.list;
+          this.listQuery.total = response.data.total;
+        }
+        this.dataListLoading = false;
+      });
+    }else{
+      this.$message.warning('请选择时间范围')
+    }
+    },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.energyTypeId = val.energyTypeId;
+          this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					this.getDataList();
+					break;
+				case 'export':
+          const data = {
+            energyTypeId:val.energyTypeId,
+            startTime : val.searchTime ? val.searchTime[0] : null,
+            endTime : val.searchTime ? val.searchTime[1] : null,
+          }
+					this.handleExport(data);
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
+<style>
+.app-container .el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+</style>
diff --git a/src/views/cost/energyCostHis/index.vue b/src/views/cost/energyCostHis/index.vue
new file mode 100644
index 00000000..952eb8f1
--- /dev/null
+++ b/src/views/cost/energyCostHis/index.vue
@@ -0,0 +1,173 @@
+<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"></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 codeFilter from '../mixins/code-filter';
+import {
+	getCostEneryAutoReportPage,
+	exportCostEneryAutoReportExcel,
+} from '@/api/cost/costEneryAutoReport';
+import { getEnergyTypeListAll } from '@/api/base/energyType';
+import { publicFormatter } from '@/utils/dict';
+
+const tableProps = [
+	{
+		prop: 'reportType',
+		label: '维度',
+		filter: codeFilter('reportType'),
+	},
+	{
+		prop: 'reportName',
+		label: '时间',
+		minWidth: 150,
+	},
+	{
+		prop: 'energyType',
+		label: '能源类型',
+	},
+	{
+		prop: 'objName',
+		label: '监控对象',
+		filter: (val) => (val != null ? val : '--'),
+	},
+	{
+		prop: 'tableName',
+		label: '水/气表名',
+		filter: (val) => (val != null ? val : '--'),
+		filter: publicFormatter('table_name'),
+	},
+	{
+		prop: 'totalUsed',
+		label: '累计使用量',
+	},
+	{
+		prop: 'totalCost',
+		label: '总价',
+		align: 'right',
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCostEneryAutoReportPage,
+				exportURL: exportCostEneryAutoReportExcel,
+			},
+			tableData: [],
+			tableProps,
+			drawerVisible: false,
+			listQuery: {
+				reportType: 2,
+			},
+			formConfig: [
+				{
+					type: 'select',
+					label: '维度',
+					selectOptions: [
+						{ id: 2, name: '日' },
+						{ id: 3, name: '周' },
+						{ id: 4, name: '月' },
+						{ id: 5, name: '年' },
+					],
+					param: 'reportType',
+					filterable: true,
+					defaultSelect: 2, // 默认值
+					clearable: false,
+				},
+				{
+					type: 'select',
+					label: '能源类型',
+					selectOptions: [],
+					param: 'energyTypeId',
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '时间范围',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: this.$auth.hasPermi('cost:energyCostHis:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					color: 'primary',
+					plain: true,
+				},
+			],
+		};
+	},
+	components: {},
+	created() {
+		getEnergyTypeListAll().then((response) => {
+			this.formConfig[1].selectOptions = response.data;
+		});
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.reportType = val.reportType;
+					this.listQuery.energyTypeId = val.energyTypeId;
+					this.listQuery.reportTime = val.searchTime ? val.searchTime : null;
+					this.getDataList();
+					break;
+				case 'export':
+          const data = {
+            reportType: val.reportType,
+            energyTypeId: val.energyTypeId,
+            reportTime: val.searchTime ? val.searchTime : null
+          }
+					this.handleExport(data);
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
+<style>
+.app-container .el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+</style>
diff --git a/src/views/cost/mixins/basic-add.js b/src/views/cost/mixins/basic-add.js
new file mode 100644
index 00000000..7538902f
--- /dev/null
+++ b/src/views/cost/mixins/basic-add.js
@@ -0,0 +1,121 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-11-02 15:33:39
+ * @Description:
+ */
+import { listData } from "@/api/system/dict/data";
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        createURL: '',
+        updateURL: '',
+        infoURL: '',
+        codeURL: '',
+        getOption: false, //是否加载获取下拉框方法
+        isGetCode: false, //是否加载获取code方法
+        getDictList: false, //是否加载获取数据字典方法
+        optionArrUrl: [], //需要获取下拉框的方法数组
+        optionArr: {}, //需要获取下拉框的方法数组的返回结果
+        dictList: {}, //需要获取数据字典的方法数组的返回结果
+      },
+      visible: false,
+      setData: false
+    }
+  },
+  created() {
+  },
+  activated() {
+  },
+  methods: {
+    init(id) {
+      this.dataForm.id = id || "";
+      this.visible = true;
+      if (this.urlOptions.getOption) {
+        this.getArr()
+      }
+      if (this.urlOptions.getDictList) {
+        this.getDict()
+      }
+      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(() => {
+          });
+      });
+    },
+    /** 查询字典数据列表 */
+    getDict() {
+      this.nameList.forEach((item,index)=>{
+        const queryParams = {
+          pageNo: 1,
+          pageSize: 99,
+          dictType: item,
+        }
+        listData(queryParams).then(response => {
+          this.$set(this.urlOptions.dictList, `dict${index}`, response.data.list)
+        });
+      })
+    },
+    // 表单提交
+    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() {
+      if (this.$refs.dataForm!==undefined) {
+          this.$refs.dataForm.resetFields();
+      }
+    }
+  }
+}
diff --git a/src/views/cost/mixins/basic-page.js b/src/views/cost/mixins/basic-page.js
new file mode 100644
index 00000000..89069ad4
--- /dev/null
+++ b/src/views/cost/mixins/basic-page.js
@@ -0,0 +1,172 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-12-07 09:35:33
+ * @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,
+      addOrUpdate:'addOrUpdate'
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        if(response.hasOwnProperty('data')){
+          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.error(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[this.addOrUpdate].formClear()
+      this.addOrUpdateVisible = false
+      this.addOrEditTitle = ''
+      this.addOrUpdate = 'addOrUpdate'
+    },
+    handleConfirm() {
+      this.$refs[this.addOrUpdate].dataFormSubmit()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getDataList()
+    },
+    /** 导出按钮操作 */
+    handleExport(data) {
+      // 处理查询参数
+      let params = data?{ ...data }:{ ...this.listQuery };
+      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/cost/mixins/code-filter.js b/src/views/cost/mixins/code-filter.js
new file mode 100644
index 00000000..e6725c28
--- /dev/null
+++ b/src/views/cost/mixins/code-filter.js
@@ -0,0 +1,79 @@
+
+/*
+ * @Date: 2020-12-29 16:49:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-12-07 10:00:51
+ * @FilePath: \basic-admin\src\filters\basicData\index.js
+ * @Description:
+ */
+
+const table = {
+  lineStatus: {
+    1: '生产中',
+    2: '停止',
+    3: '未知',
+  },
+  deactivate: {
+    1: '启用',
+    0: '停用',
+  },
+  wareType: {
+    1: '缓存',
+    2: '活动',
+    3: '其它',
+  },
+  reportType: {
+    2: '日',
+    3: '周',
+    4: '月',
+    5: '年',
+  },
+}
+
+// 日期格式化
+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/cost/mixins/connectTime.vue b/src/views/cost/mixins/connectTime.vue
new file mode 100644
index 00000000..4ecde04b
--- /dev/null
+++ b/src/views/cost/mixins/connectTime.vue
@@ -0,0 +1,23 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-12-05 13:45:59
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-12-06 15:54:40
+ * @Description
+-->
+<template>
+	<div>
+		<span>{{ parseTime(injectData.enableTime,'{y}年{m}月{d}日') + '-' + (parseTime(injectData.disableTime)?parseTime(injectData.disableTime,'{y}年{m}月{d}日'):'永久') }}</span>
+	</div>
+</template>
+<script>
+export default {
+	name: '',
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+};
+</script>
diff --git a/src/views/cost/rawMaterialConfig/add-or-updata.vue b/src/views/cost/rawMaterialConfig/add-or-updata.vue
new file mode 100644
index 00000000..6de75d00
--- /dev/null
+++ b/src/views/cost/rawMaterialConfig/add-or-updata.vue
@@ -0,0 +1,166 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 13:52:10
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-12-05 15:41:39
+ * @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
+						clearable
+						@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="grade">
+					<el-select
+						v-model="dataForm.grade"
+						filterable
+						clearable
+						:style="{ width: '100%' }"
+						placeholder="请选择原料等级">
+						<el-option
+							v-for="item in urlOptions.dictList.dict0"
+							:key="item.id"
+							:label="item.label"
+							:value="parseInt(item.value)"></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="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="enabledTime">
+					<el-date-picker
+						v-model="dataForm.enabledTime"
+						type="datetime"
+						value-format="timestamp"
+						:style="{ width: '100%' }"
+						placeholder="选择开始时间"></el-date-picker>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="生效结束时间" prop="disabledTime">
+					<el-date-picker
+						v-model="dataForm.disabledTime"
+						type="datetime"
+						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 {
+	createCostMaterialSet,
+	updateCostMaterialSet,
+	getCostMaterialSet,
+} from '@/api/cost/costMaterialSet';
+import { getHotMaterialList } from '@/api/base/coreHotMaterial';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				getDictList: true,
+				createURL: createCostMaterialSet,
+				updateURL: updateCostMaterialSet,
+				infoURL: getCostMaterialSet,
+				getOption: true,
+			},
+			nameList: ['material_grade'],
+			dataForm: {
+				id: undefined,
+				code: '',
+				materialId: '',
+				price: '',
+				grade: '',
+				enabledTime: new Date().getTime(),
+				disabledTime: null,
+				remark: '',
+			},
+			setData: true,
+			MaterialList: [],
+			dataRule: {
+				materialId: [
+					{ required: true, message: '原料不能为空', trigger: 'change' },
+				],
+				price: [{ required: true, message: '单价不能为空', trigger: 'blur' }],
+				enabledTime: [
+					{
+						required: true,
+						message: '生效开始时间不能为空',
+						trigger: 'change',
+					},
+				],
+			},
+		};
+	},
+	created() {},
+	methods: {
+		getArr() {
+			getHotMaterialList().then((response) => {
+				this.MaterialList = response.data;
+			});
+		},
+		setDataForm() {
+			this.setCode();
+		},
+		setCode() {
+			this.MaterialList.forEach((item) => {
+				if (item.id === this.dataForm.materialId) {
+					this.dataForm.code = item.code;
+				}
+			});
+		},
+	},
+};
+</script>
diff --git a/src/views/cost/rawMaterialConfig/index.vue b/src/views/cost/rawMaterialConfig/index.vue
new file mode 100644
index 00000000..462fa142
--- /dev/null
+++ b/src/views/cost/rawMaterialConfig/index.vue
@@ -0,0 +1,186 @@
+<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="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 { parseTime } from '../mixins/code-filter';
+import {
+	deleteCostMaterialSet,
+	getCostMaterialSetPage,
+} from '@/api/cost/costMaterialSet';
+import { getHotMaterialList } from '@/api/base/coreHotMaterial';
+import { publicFormatter } from '@/utils/dict';
+
+const tableProps = [
+	{
+		prop: 'rawMaterialName',
+		label: '原料名称',
+	},
+	{
+		prop: 'code',
+		label: '原料编码',
+		width: 190,
+	},
+	{
+		prop: 'grade',
+		label: '原料等级',
+		filter: publicFormatter('material_grade'),
+	},
+	{
+		prop: 'dailyUse',
+		label: '单日消耗量(天)吨',
+		width: 130,
+	},
+	{
+		prop: 'price',
+		label: '单价(元/吨)',
+		align: 'right',
+	},
+	{
+		prop: 'enabledTime',
+		label: '生效时间',
+		filter: parseTime,
+		width: 150,
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCostMaterialSetPage,
+				deleteURL: deleteCostMaterialSet,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`cost:rawMaterialConfig:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`cost:rawMaterialConfig:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'select',
+					label: '原料名称',
+					selectOptions: [],
+					param: 'name',
+					filterable: true,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('cost:rawMaterialConfig:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {
+		getHotMaterialList().then((response) => {
+			this.formConfig[0].selectOptions = response.data;
+		});
+	},
+	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: 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/cost/rawMaterialCost/index.vue b/src/views/cost/rawMaterialCost/index.vue
new file mode 100644
index 00000000..fdeeb275
--- /dev/null
+++ b/src/views/cost/rawMaterialCost/index.vue
@@ -0,0 +1,166 @@
+<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"></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 connectTime from '../mixins/connectTime';
+import {
+	getCostMaterialSearchPage,
+	exportCostMaterialSearch,
+} from '@/api/cost/costMaterialAutoReport';
+import { getHotMaterialList } from '@/api/base/coreHotMaterial';
+import { publicFormatter } from '@/utils/dict';
+
+const tableProps = [
+	{
+		prop: 'rawMaterialName',
+		label: '原料名称',
+	},
+	{
+		prop: 'grade',
+		label: '原料等级',
+		filter: publicFormatter('material_grade'),
+	},
+	{
+		prop: 'price',
+		label: '单价(元/吨)',
+		align: 'right',
+	},
+	{
+		prop: 'reportName',
+		label: '单价生效时间',
+		minWidth: 190,
+		subcomponent: connectTime,
+	},
+	{
+		prop: 'totalUsed',
+		label: '累计使用量(吨)',
+	},
+	{
+		prop: 'totalCost',
+		label: '总价(元)',
+		align: 'right',
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCostMaterialSearchPage,
+				exportURL: exportCostMaterialSearch,
+			},
+			tableData: [],
+			tableProps,
+			drawerVisible: false,
+			formConfig: [
+				{
+					type: 'select',
+					label: '原料名称',
+					selectOptions: [],
+					param: 'materialId',
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '时间范围',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: this.$auth.hasPermi('cost:rawMaterialCost:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					color: 'primary',
+					plain: true,
+				},
+			],
+		};
+	},
+	components: {},
+	created() {
+		getHotMaterialList().then((response) => {
+			this.formConfig[0].selectOptions = response.data;
+		});
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			if (this.listQuery.searchTime) {
+				this.dataListLoading = true;
+				this.urlOptions.getDataListURL(this.listQuery).then((response) => {
+					if (response.hasOwnProperty('data')) {
+						this.tableData = response.data.list;
+						this.listQuery.total = response.data.total;
+					}
+					this.dataListLoading = false;
+				});
+			} else {
+				this.$message.warning('请选择时间范围');
+			}
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.materialId = val.materialId;
+					this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					this.getDataList();
+					break;
+				case 'export':
+					this.listQuery.materialId = val.materialId;
+					this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null;
+					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);
+			}
+		},
+	},
+};
+</script>
+<style>
+.app-container .el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+</style>
diff --git a/src/views/cost/rawMaterialCostHis/index.vue b/src/views/cost/rawMaterialCostHis/index.vue
new file mode 100644
index 00000000..f865cf4b
--- /dev/null
+++ b/src/views/cost/rawMaterialCostHis/index.vue
@@ -0,0 +1,170 @@
+<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"></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 codeFilter from '../mixins/code-filter';
+import {
+	getCostMaterialAutoReportPage,
+	exportCostMaterialAutoReportExcel,
+} from '@/api/cost/costMaterialAutoReport';
+import { getHotMaterialList } from '@/api/base/coreHotMaterial';
+import { publicFormatter } from '@/utils/dict';
+
+const tableProps = [
+	{
+		prop: 'reportType',
+		label: '维度',
+		filter: codeFilter('reportType'),
+	},
+	{
+		prop: 'reportName',
+		label: '时间',
+		minWidth: 150,
+	},
+	{
+		prop: 'rawMaterialName',
+		label: '原料名称',
+	},
+	{
+		prop: 'grade',
+		label: '原料等级',
+		filter: publicFormatter('material_grade'),
+	},
+	{
+		prop: 'price',
+		label: '单价(元/吨)',
+		align: 'right',
+	},
+	{
+		prop: 'totalUsed',
+		label: '累计使用量(吨)',
+	},
+	{
+		prop: 'totalCost',
+		label: '总价(元)',
+		align: 'right',
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCostMaterialAutoReportPage,
+        exportURL: exportCostMaterialAutoReportExcel
+			},
+			tableData: [],
+			tableProps,
+			drawerVisible: false,
+			listQuery: {
+				reportType: 2,
+			},
+			formConfig: [
+				{
+					type: 'select',
+					label: '维度',
+					selectOptions: [
+						{ id: 2, name: '日' },
+						{ id: 3, name: '周' },
+						{ id: 4, name: '月' },
+						{ id: 5, name: '年' },
+					],
+					param: 'reportType',
+					filterable: true,
+					defaultSelect: 2, // 默认值
+					clearable: false,
+				},
+				{
+					type: 'select',
+					label: '原料名称',
+					selectOptions: [],
+					param: 'materialId',
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '时间范围',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'searchTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: this.$auth.hasPermi('cost:rawMaterialCostHis:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					color: 'primary',
+					plain: true,
+				},
+			],
+		};
+	},
+	components: {},
+	created() {
+		getHotMaterialList().then((response) => {
+			this.formConfig[1].selectOptions = response.data;
+		});
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.reportType = val.reportType;
+					this.listQuery.materialId = val.materialId;
+					this.listQuery.times = val.searchTime ? val.searchTime : null;
+					this.getDataList();
+					break;
+				case 'export':
+					this.listQuery.reportType = val.reportType;
+					this.listQuery.materialId = val.materialId;
+					this.listQuery.times = val.searchTime ? val.searchTime : null;
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
+<style>
+.app-container .el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+</style>
diff --git a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
index e742441d..f957f7b3 100644
--- a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
+++ b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
@@ -221,18 +221,30 @@ export default {
     timeSelect() {
       switch (this.queryParams.timeDim) {
         case '1':
+          if (!this.timeValue) {
+            this.$modal.msgError('时间范围不能为空')
+            return false
+          }
           if (this.timeValue[1] - this.timeValue[0] > 7*24*3600000) {
             this.$modal.msgError('最大时间范围为7天，请重新选择')
             this.timeValue = []
           }
           break
         case '2':
+          if (!this.dateValue) {
+            this.$modal.msgError('时间范围不能为空')
+            return false
+          }
           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) {
+            this.$modal.msgError('时间范围不能为空')
+            return false
+          }
           if (this.monthValue[1] - this.monthValue[0] > 729*24*3600000) {
             this.$modal.msgError('最大时间范围为24个月，请重新选择')// 同理上面
             this.monthValue = []
@@ -338,7 +350,7 @@ export default {
       }
       switch (this.queryParams.timeDim) {
         case '1':
-          if (this.timeValue.length > 0) {
+          if (this.timeValue && this.timeValue.length > 0) {
             this.queryParams.startTime = this.timeValue[0]
             this.queryParams.endTime = this.timeValue[1] // 不用转
           } else {
diff --git a/src/views/energy/analysis/trendAnalysis/components/lineChart.vue b/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
index 82c8c900..e564a745 100644
--- a/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
+++ b/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
@@ -8,7 +8,6 @@
 <script>
 import * as echarts from 'echarts'
 import resize from '@/utils/chartMixins/resize'
-import moment from 'moment'
 export default {
   name: "LineChart",
   mixins: [resize],
diff --git a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue b/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
index b563296e..303f72fd 100644
--- a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
+++ b/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
@@ -207,18 +207,30 @@ export default {
     timeSelect() {
       switch (this.queryParams.timeDim) {
         case '1':
+          if (!this.timeValue) {
+            this.$modal.msgError('时间范围不能为空')
+            return false
+          }
           if (this.timeValue[1] - this.timeValue[0] > 7*24*3600000) {
             this.$modal.msgError('最大时间范围为7天，请重新选择')
             this.timeValue = []
           }
           break
         case '2':
+          if (!this.dateValue) {
+            this.$modal.msgError('时间范围不能为空')
+            return false
+          }
           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) {
+            this.$modal.msgError('时间范围不能为空')
+            return false
+          }
           if (this.monthValue[1] - this.monthValue[0] > 729*24*3600000) {
             this.$modal.msgError('最大时间范围为24个月，请重新选择')// 同理上面
             this.monthValue = []
@@ -307,7 +319,7 @@ export default {
       }
       switch (this.queryParams.timeDim) {
         case '1':
-          if (this.timeValue.length > 0) {
+          if (this.timeValue && this.timeValue.length > 0) {
             this.queryParams.startTime = this.timeValue[0]
             this.queryParams.endTime = this.timeValue[1] // 不用转
           } else {
@@ -316,7 +328,7 @@ export default {
           }
           break
         case '2':
-          if (this.dateValue.length > 0) {
+          if (this.dateValue && this.dateValue.length > 0) {
             this.queryParams.startTime = this.dateValue[0]
             this.queryParams.endTime = this.dateValue[1] + 86399000 // 转为23:59:59
           } else {
@@ -336,7 +348,7 @@ export default {
           }
           break
         case '4':// 转为本月最后一天的最后一秒
-          if (this.monthValue.length > 0) {
+          if (this.monthValue && this.monthValue.length > 0) {
             this.queryParams.startTime = this.monthValue[0]
             this.queryParams.endTime = this.transformTime(this.monthValue[1])
           } else {
diff --git a/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
new file mode 100644
index 00000000..1dda33d5
--- /dev/null
+++ b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
@@ -0,0 +1,149 @@
+<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%;" 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="tableName">
+          <el-select v-model="form.tableName" placeholder="请选择" style="width: 100%;" filterable>
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='12'>
+        <el-form-item label="抄表数" prop="readingQuantity">
+          <el-input-number v-model="form.readingQuantity" :min="0" :max="999999999999" :controls='false' style="width: 50%;"></el-input-number>
+          <el-select v-model="form.unit" placeholder="单位" style="width: 50%;">
+            <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="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-form>
+</template>
+<script>
+import { energyQuantityManualCreate, energyQuantityManualUpdate, energyQuantityManualGet } from '@/api/base/energyQuantityManual'
+import moment from 'moment'
+export default {
+  name: 'EnergyQuantityManualAdd',
+  props: {
+    energyTypeList: {
+      type: Array,
+      required: true,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      form: {
+        id: '',
+        energyTypeId: '',
+        tableName: '',
+        readingQuantity: null,
+        unit: '',
+        recordTime: ''
+      },
+      rules: {
+        energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
+        tableName: [{ required: true, message: '水/气表名不能为空', trigger: 'change' }],
+        readingQuantity: [{ required: true, message: '抄表数不能为空', trigger: 'blur' }],
+        recordTime: [{ required: true, message: '抄表日期不能为空', trigger: 'change' }]
+      },
+      isEdit: false
+    }
+  },
+  methods: {
+    init(params) {
+      this.form.recordTime = moment().valueOf()
+      if (params.type === 'add') {
+        this.isEdit = false
+      } else if (params.type === 'meterReading') {
+        this.isEdit = false
+        this.form.energyTypeId = params.energyTypeId
+        this.form.tableName = params.tableName + ''
+      }else {
+        this.isEdit = true
+        this.form.id = params.id
+        energyQuantityManualGet({id: this.form.id}).then(res => {
+          if (res.code === 0) {
+            this.form.energyTypeId = res.data.energyTypeId
+            this.form.tableName = res.data.tableName ? res.data.tableName+'' : ''
+            this.form.readingQuantity = res.data.readingQuantity
+            this.form.unit = res.data.unit ? res.data.unit+'' : ''
+            this.form.recordTime = res.data.recordTime ? res.data.recordTime : null
+          }
+        })
+      }
+    },
+    submitForm() {
+      this.$refs['energyQuantityManualForm'].validate((valid) => {
+        if (valid) {
+          if (!this.form.unit) {
+            this.$modal.msgError("抄表数单位不能为空");
+            return false
+          }
+          if (this.isEdit) {
+            // 编辑
+            energyQuantityManualUpdate({...this.form}).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          } else {
+            energyQuantityManualCreate({...this.form}).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
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/energy/base/energyQuantityManual/index.vue b/src/views/energy/base/energyQuantityManual/index.vue
new file mode 100644
index 00000000..39d25b8b
--- /dev/null
+++ b/src/views/energy/base/energyQuantityManual/index.vue
@@ -0,0 +1,309 @@
+<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 { parseTime, parseTimeTable } from '@/utils/ruoyi'
+// import FileSaver from "file-saver"
+// import * as XLSX from 'xlsx/xlsx.mjs'
+import EnergyQuantityManualAdd from './components/energyQuantityManualAdd'
+import moment from 'moment'
+const tableProps = [
+  {
+    prop: 'energyType',
+    label: '能源类型',
+    minWidth: 110,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'tableName',
+    label: '水/气表名',
+    filter: publicFormatter('table_name'),
+    minWidth: 110
+  },
+  {
+    prop: 'recordTime',
+    label: '抄表日期',
+    filter: parseTimeTable('{y}-{m}-{d}'),
+    minWidth: 110
+  },
+  {
+    prop: 'readingQuantity',
+    label: '抄表值'
+  },
+  {
+    prop: 'recordTimeLast',
+    label: '上期抄表日期',
+    filter: parseTimeTable('{y}-{m}-{d}'),
+    minWidth: 110
+  },
+  {
+    prop: 'readingQuantityLast',
+    label: '上期抄表值',
+    minWidth: 110
+  },
+  {
+    prop: 'diff',
+    label: '差值'
+  }
+]
+export default {
+  name: "EnergyQuantityManual",
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'select',
+          label: '能源类型',
+          selectOptions: [],
+          param: 'energyTypeId',
+          filterable: true
+        },
+        {
+          type: 'datePicker',
+          label: '时间',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd',
+          valueFormat: "timestamp",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: []
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: '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,
+      tableH: this.tableHeight(260),
+      // 总条数
+      total: 0,
+      // 班次基础信息列表
+      list: [],
+      tableBtn: [
+      this.$auth.hasPermi('base:energy-quantity-manual:create')
+          ? {
+              type: 'meterReading',
+              btnName: '抄表'
+            }
+          : undefined,
+        this.$auth.hasPermi('base:energy-quantity-manual:update')
+          ? {
+              type: 'edit',
+              btnName: '编辑',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'equal',
+                    name: 'latest',
+                    value: 1
+                  }
+                ]
+              }
+            }
+          : undefined,
+        this.$auth.hasPermi('base:energy-quantity-manual:delete')
+          ? {
+              type: 'delete',
+              btnName: '删除'
+            }
+          : undefined
+      ].filter((v)=>v),
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        energyTypeId: '',
+        recordTime: []
+      },
+      energyTypeList: [],
+      exportList: [],
+      addOrEditTitle: '',
+      centervisible: false,
+
+    };
+  },
+  components: { EnergyQuantityManualAdd },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
+    let start = moment(moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')).valueOf()
+    this.formConfig[1].defaultSelect = [start, end]
+    this.queryParams.recordTime[0] = start
+    this.queryParams.recordTime[1] = end
+    this.getList();
+    this.getTypeList()
+  },
+  methods: {
+    buttonClick(val) {
+      this.queryParams.pageNo = 1;
+      this.queryParams.energyTypeId = val.energyTypeId
+      this.queryParams.recordTime[0] = val.timeVal ? moment(moment(val.timeVal[0]).format('YYYY-MM-DD 00:00:00')).valueOf() : null
+      this.queryParams.recordTime[1] = val.timeVal ? moment(moment(val.timeVal[1]).format('YYYY-MM-DD 23:59:59')).valueOf() : 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({...this.queryParams});
+            }).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.tableName = val.data.tableName
+          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/energyType/components/InnerTable.vue b/src/views/energy/base/energyType/components/InnerTable.vue
index 4dba190d..5eab7af9 100644
--- a/src/views/energy/base/energyType/components/InnerTable.vue
+++ b/src/views/energy/base/energyType/components/InnerTable.vue
@@ -1,12 +1,13 @@
 <template>
   <el-popover placement="right" width="400" trigger="click">
+    <span v-if='tableProps.length'>计量维度： {{dim === 4 ? '月' : (dim === 5 ? '年' : '-')}}</span>
     <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"
-        :align="item.align ? item.align : 'left'" 
+        :align="item.align ? item.align : 'left'"
         width="120">
       </el-table-column>
     </el-table>
@@ -70,7 +71,8 @@ export default {
       tableProps: [],
       singlePrice:'',
       temp1,
-      temp2
+      temp2,
+      dim: ''
     }
   },
   methods: {
@@ -78,7 +80,6 @@ export default {
       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.singlePrice = ''
@@ -87,6 +88,7 @@ export default {
               item.price = item.price.toFixed(2)
             }
             this.tableData = arr1
+            this.dim = ''
           } else if (res.data.pricingMethod === 1) {
             this.tableProps = this.temp2
             this.singlePrice = ''
@@ -95,10 +97,12 @@ export default {
               item.price = item.price.toFixed(2)
             }
             this.tableData = arr2
+            this.dim = res.data.dim
           } else {
             this.tableProps = []
             this.tableData = []
             this.singlePrice = res.data.singlePrice
+            this.dim = ''
           }
         }
       })
diff --git a/src/views/energy/base/energyType/components/InputArea.vue b/src/views/energy/base/energyType/components/InputArea.vue
index 94088653..3da297e7 100644
--- a/src/views/energy/base/energyType/components/InputArea.vue
+++ b/src/views/energy/base/energyType/components/InputArea.vue
@@ -22,7 +22,6 @@ export default {
   },
   methods: {
     changeInput() {
-      console.log(this.list)
       this.$emit('emitData', this.list)
     }
   }
diff --git a/src/views/energy/base/energyType/components/TimePickerArea.vue b/src/views/energy/base/energyType/components/TimePickerArea.vue
index d3b6810b..04730552 100644
--- a/src/views/energy/base/energyType/components/TimePickerArea.vue
+++ b/src/views/energy/base/energyType/components/TimePickerArea.vue
@@ -28,7 +28,6 @@ export default {
   },
   methods: {
     changeInput() {
-      console.log(this.list)
       this.$emit('emitData', this.list)
     }
   }
diff --git a/src/views/energy/base/energyType/components/energyTypeAdd.vue b/src/views/energy/base/energyType/components/energyTypeAdd.vue
index 78142f38..0e9a9342 100644
--- a/src/views/energy/base/energyType/components/energyTypeAdd.vue
+++ b/src/views/energy/base/energyType/components/energyTypeAdd.vue
@@ -41,6 +41,14 @@
           <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="12" v-show="form.pricingMethod === 1">
+        <el-form-item label="计量维度" prop="dim">
+          <el-select v-model="form.dim" placeholder="请选择" style="width: 100%;">
+            <el-option label="月" :value= '4' ></el-option>
+            <el-option label="年" :value= '5' ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
       <el-col :span="24"  v-show="form.pricingMethod === 0">
         <el-form-item label="时间段" prop="pricingMethod">
           <base-table
@@ -213,10 +221,10 @@ export default {
     // 增加
     emitButtonClick1() {
       let n = this.tableData1.length
-      if (n >=3) {
-        this.$modal.msgWarning('最多可添加3档计价')
-        return false
-      }
+      // if (n >=3) {
+      //   this.$modal.msgWarning('最多可添加3档计价')
+      //   return false
+      // }
       let obj = {}
       obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime
       obj.endTime = ''
@@ -289,6 +297,7 @@ export default {
               unit: this.form.unit,
               pricingMethod: this.form.pricingMethod,
               description: this.form.description,
+              dim: this.form.pricingMethod === 1 ? this.form.dim: '',
               singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
               segPriceList: this.form.pricingMethod === 0 ? this.tableData1: [],
               usedPriceList: this.form.pricingMethod === 1 ? this.tableData2: []
@@ -305,6 +314,7 @@ export default {
               unit: this.form.unit,
               pricingMethod: this.form.pricingMethod,
               description: this.form.description,
+              dim: this.form.pricingMethod === 1 ? this.form.dim: '',
               singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
               segPriceList: this.form.pricingMethod === 0 ? this.tableData1: [],
               usedPriceList: this.form.pricingMethod === 1 ? this.tableData2: []
diff --git a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
index f963e713..6a26d269 100644
--- a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
+++ b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
@@ -2,6 +2,18 @@
   <el-form ref="form" :rules="rules" label-width="110px" :model="form">
     <el-row>
       <el-col :span="12">
+        <el-form-item label="抄表方式" prop="method">
+          <el-select v-model="form.method" placeholder="请选择" style="width: 100%;" @change="changeMethod">
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.METHOD)"
+              :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.method == 1'>
         <el-form-item label="监控对象" prop="objectId">
           <el-cascader
             style='width: 100%;'
@@ -13,8 +25,20 @@
             clearable></el-cascader>
         </el-form-item>
       </el-col>
+      <el-col :span="12" v-if='form.method == 2'>
+        <el-form-item label="水/气表名" prop="tableName">
+          <el-select v-model="form.tableName" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)"
+              :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-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"
@@ -25,11 +49,29 @@
           </el-select>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row>
+      <el-col :span="12" v-if='form.method == 1'>
+        <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.method == 1'>
+        <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%;">
+          <el-select v-model="form.limitType" placeholder="请选择" style="width: 100%;" :disabled='form.method == 2'>
             <el-option
               v-for="item in getDictDatas(DICT_TYPE.MONITOR_INDEX_TYPE)"
               :key="item.value"
@@ -39,34 +81,12 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <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-row>
-    <el-row>
       <el-col :span="12">
         <el-form-item label="消耗量阈值">
           <el-input-number v-model="form.minValue" placeholder="最小值" :max="9999999" style="width: 50%;"></el-input-number>
           <el-input-number v-model="form.maxValue" placeholder="最大值" :max="9999999" style="width: 50%;"></el-input-number>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <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-row>
   </el-form>
 </template>
@@ -91,6 +111,7 @@ export default {
     return {
       form: {
         id: '',
+        method: '1',
         objectId: '',
         objectType: '',
         energyTypeId: '',
@@ -103,7 +124,8 @@ export default {
       objIds: [],// 回显数组
       isEdit: false, //是否是编辑
       rules: {
-        objectId: [{ required: true, message: '对象不能为空', trigger: 'change' }],
+        method: [{ 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' }]
@@ -120,6 +142,7 @@ export default {
           if (res.code === 0) {
             this.form = res.data
             this.form.plcParamId = res.data.plcParamId || ''
+            this.form.method = this.form.method ? this.form.method + '' : ''
             this.form.limitType = this.form.limitType ? this.form.limitType + '' : ''
             this.objIds = this.changeDetSelect(this.form.objectId, this.objList)
             if (this.form.type === 2) {
@@ -132,6 +155,14 @@ export default {
         this.form.id = ''
       }
     },
+    // 切换方式
+    changeMethod() {
+      if(this.form.method === '2'){
+        this.form.limitType = "2"
+      }else{
+        this.form.limitType = ''
+      }
+    },
     // 监控详细参数
     getDetailList() {
       getEnergyParamList({
diff --git a/src/views/energy/monitoring/energyLimit/index.vue b/src/views/energy/monitoring/energyLimit/index.vue
index 1b82ab8b..d72aede2 100644
--- a/src/views/energy/monitoring/energyLimit/index.vue
+++ b/src/views/energy/monitoring/energyLimit/index.vue
@@ -51,6 +51,11 @@ import { getTree } from '@/api/base/factory'
 import { publicFormatter } from '@/utils/dict'
 import EnergyLimitAdd from './components/energyLimitAdd'
 const tableProps = [
+  {
+    prop: 'method',
+    label: '抄表方式',
+    filter: publicFormatter('method')
+  },
   {
     prop: 'objName',
     label: '监控对象'
@@ -59,6 +64,11 @@ const tableProps = [
     prop: 'objCode',
     label: '对象编码'
   },
+  {
+    prop: 'tableName',
+    label: '水/气表名',
+    filter: publicFormatter('table_name')
+  },
   {
     prop: 'energyType',
     label: '能源类型'
diff --git a/src/views/energy/monitoring/energyOverlimitLog/index.vue b/src/views/energy/monitoring/energyOverlimitLog/index.vue
index f748592c..1cffef1e 100644
--- a/src/views/energy/monitoring/energyOverlimitLog/index.vue
+++ b/src/views/energy/monitoring/energyOverlimitLog/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container energyOverlimitLog">
 
     <!-- 搜索工作栏 -->
     <search-bar
@@ -7,14 +7,29 @@
       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>
     <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-    />
+    <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"
@@ -28,6 +43,7 @@
 import { getEnergyOverlimitLogPage } from "@/api/monitoring/energyOverlimitLog";
 import { getEnergyTypeListAll } from "@/api/base/energyType";
 import { publicFormatter } from '@/utils/dict'
+import { parseTime } from '@/utils/ruoyi'
 const tableProps = [
   {
     prop: 'objName',
@@ -65,6 +81,41 @@ const tableProps = [
   {
     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 {
@@ -93,18 +144,20 @@ export default {
           color: 'primary'
         }
       ],
+      activeName: 'auto',
       tableProps,
+      tableProps2,
       tableH: this.tableHeight(260),
-      // 总条数
       total: 0,
-      // 班次基础信息列表
       list: [],
+      list2: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 20,
         energyTypeId: '',
-        indexType: ''
+        indexType: '',
+        method: '1'
       },
       typeList: [
         {id: 1, name: '合并'},
@@ -155,7 +208,47 @@ export default {
         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/group/base/groupTeamScheduling/index.vue b/src/views/group/base/groupTeamScheduling/index.vue
index e4156796..54800965 100644
--- a/src/views/group/base/groupTeamScheduling/index.vue
+++ b/src/views/group/base/groupTeamScheduling/index.vue
@@ -290,7 +290,6 @@ export default {
           break;
         case '2': // 能源
           this.$router.push({
-            // path: '/energy/monitoring/energy-report-search?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
             path: '/energy/base/energy-quantity-realtime?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
           })
           break;
diff --git a/src/views/report/productionShipmentsReport/index.vue b/src/views/report/productionShipmentsReport/index.vue
index f8d7dc14..e296bbb9 100644
--- a/src/views/report/productionShipmentsReport/index.vue
+++ b/src/views/report/productionShipmentsReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2023-12-13 16:36:33
+ * @LastEditTime: 2023-12-13 16:55:27
  * @LastEditors: zhp
  * @Description:
 -->
@@ -30,7 +30,7 @@
             <span v-else>{{ scope.row.glassType }} </span>
           </template>
         </el-table-column>
-        <el-table-column label="投入数㎡">
+        <el-table-column label="规格">
           <el-table-column prop="inputNow" label="本周">
             <template slot-scope="scope">
               <el-input v-if="scope.row.det === true" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
diff --git a/src/views/safetyEnvironmental/environmental/components/lineChart.vue b/src/views/safetyEnvironmental/environmental/components/lineChart.vue
new file mode 100644
index 00000000..05860c12
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/components/lineChart.vue
@@ -0,0 +1,150 @@
+<template>
+  <div
+    id="wasteWaterLine"
+    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(420)
+    }
+  },
+  props: {
+    chartData: {
+      type: Object,
+      required: true,
+      default: () => {
+        return {}
+      }
+    },
+    timeDim: {
+      type: String,
+      default: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.chartHeight = this.tableHeight(420)
+    })
+    this.getChart()
+  },
+  watch: {
+    chartData: function () {
+      this.getChart()
+    }
+  },
+  methods: {
+    getChart() {
+      if (
+        this.chart !== null &&
+        this.chart !== '' &&
+        this.chart !== undefined
+      ) {
+        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
+      }
+      this.chartDom = document.getElementById('wasteWaterLine');
+      this.chart = echarts.init(this.chartDom);
+      if (Object.keys(this.chartData).length === 0) {
+        return false
+      }
+      let legendData = []
+      let xData = []
+      let seriesData = []
+      for (let item in this.chartData) {
+        legendData.push(item)
+        let obj = {}
+        let data = []
+        for (let subItem in this.chartData[item]) {
+          data.push(this.chartData[item][subItem].checkValue)
+        }
+        obj.name = item
+        obj.type = 'line'
+        obj.stack = 'Total'
+        obj.symbol = 'none'
+        obj.data = data
+        seriesData.push(obj)
+      }
+      for (let i = 0; i < this.chartData[legendData[0]].length; i++) {
+        let time = ""
+        if (this.timeDim === '3') {
+          let year = this.chartData[legendData[0]][i].axisTime.slice(0,4)
+          let weak = this.chartData[legendData[0]][i].axisTime.slice(6,8)
+          time = year+' 第 '+weak+' 周'
+        } else {
+          time = this.chartData[legendData[0]][i].axisTime
+        }
+        xData.push(time)
+      }
+      var option = {
+        color: ['#63BDFF', '#7164FF', '#FF6860', '#FF9747', '#B0EB42', '#D680FF', '#0043D2'],
+          tooltip: {
+            trigger: 'axis',
+            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: {
+            data: legendData,
+            right: '2%',
+            icon: 'rect',
+            itemHeight: 8,
+            itemWidth: 8,
+            textStyle: {
+              color: 'auto'
+            }
+          },
+          grid: {
+            left: '3%',
+            right: '2%',
+            bottom: '3%',
+            containLabel: true
+          },
+          xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            data: xData,
+            axisLabel: {
+              rotate: "45"
+            }
+          },
+          yAxis: {
+            type: 'value'
+          },
+          axisPointer: {
+            type: 'line',
+            lineStyle: {
+              color: 'rgba(11, 88, 255, 1)'
+            }
+          },
+          series: seriesData
+        };
+
+        option && this.chart.setOption(option);
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/safetyEnvironmental/environmental/components/searchArea.vue b/src/views/safetyEnvironmental/environmental/components/searchArea.vue
new file mode 100644
index 00000000..4df3357f
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/components/searchArea.vue
@@ -0,0 +1,378 @@
+<template>
+  <div class="searchBarBox divHeight" ref="searchBarRef">
+    <el-form :inline="true" class="demo-form-inline">
+      <el-form-item label="时间维度" required>
+        <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="时间范围" required>
+        <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">查询</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import moment from 'moment'
+export default {
+  name: 'SearchArea',
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        timeDim: null,
+        startTime: null,
+        endTime: null
+      },
+      timeValue: [],// 最大7天只能整点
+      dateValue: [],// 最大30天
+      weekValue1: null,//最多24周
+      weekValue2: null,
+      monthValue: [],//最多24月
+      yearValue1: null,//最多10年
+      yearValue2: null,
+      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.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
+    this.timeValue = [moment().startOf('day'), moment().endOf('day')-59*61*1000]
+  },
+  methods: {
+    // 范围选择器
+    timeSelect() {
+      switch (this.queryParams.timeDim) {
+        case '1':
+          if (!this.timeValue) {
+            this.$modal.msgError('时间范围不能为空')
+            return false
+          }
+          if (this.timeValue[1] - this.timeValue[0] > 7*24*3600000) {
+            this.$modal.msgError('最大时间范围为7天，请重新选择')
+            this.timeValue = []
+          }
+          break
+        case '2':
+          if (!this.dateValue) {
+            this.$modal.msgError('时间范围不能为空')
+            return false
+          }
+          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) {
+            this.$modal.msgError('时间范围不能为空')
+            return false
+          }
+          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() {
+      if (!this.queryParams.timeDim) {
+        this.$modal.msgError('请选择时间维度')
+        return false
+      }
+      switch (this.queryParams.timeDim) {
+        case '1':
+          if (this.timeValue && 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 && 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 && 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 + ''
+      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
+    }
+  }
+}
+</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>
+.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;
+}
+.separateStyle {
+  display: inline-block;
+  width: 1px;
+  height: 24px;
+  background: #E8E8E8;
+  vertical-align: middle;
+  margin: 0 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue b/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
new file mode 100644
index 00000000..5bb80b45
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
@@ -0,0 +1,185 @@
+<template>
+  <div class="app-container vocHis">
+    <!-- 搜索工作栏 -->
+    <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"
+      :row-class-name="tableRowClassName"
+    />
+    <pagination
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
+  </div>
+</template>
+<script>
+import { publicFormatter } from '@/utils/dict'
+import { parseTime } from '@/utils/ruoyi'
+import { environmentalCheckRecordPage, environmentalCheckRecordExport, environmentalCheckPage } from '@/api/safetyEnvironmental/environmental'
+import moment from 'moment'
+const tableProps = [
+  {
+    prop: 'checkName',
+    label: '指标名称'
+  },
+  {
+    prop: 'checkValue',
+    label: '检测数值'
+  },
+  {
+    prop: 'unit',
+    label: '单位',
+    filter: publicFormatter('environment_check_unit')
+  },
+  {
+    prop: 'checkTime',
+    label: '检测时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'origin',
+    label: '来源',
+    filter: (val) => ['手动', '自动'][val]
+  },
+  {
+    prop: 'recordPerson',
+    label: '录入人'
+  },
+  {
+    prop: 'recordTime',
+    label: '录入时间',
+    filter: parseTime,
+    minWidth: 160
+  }
+]
+export default {
+  name: 'VocDetectionHistory',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'select',
+          label: '指标名称',
+          selectOptions: [],
+          param: 'checkId',
+          filterable: true
+        },
+        {
+          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: this.$auth.hasPermi('base:voc:export') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:voc:export') ? 'button' : '',
+          btnName: '导出',
+          name: 'export',
+          color: 'primary',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        checkId: null,
+        checkType: 3,
+        startTime: null,
+        endTime: null
+      },
+      tableProps,
+      list: [],
+      total: 0,
+      tableH: this.tableHeight(260)
+    }
+  },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
+    let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf()
+    this.formConfig[1].defaultSelect = [start, end]
+    this.queryParams.startTime = start
+    this.queryParams.endTime = end
+    this.getSelectList()
+    this.getList()
+  },
+  methods: {
+    buttonClick(val) {
+      this.queryParams.pageNo = 1;
+      this.queryParams.checkId = val.checkId
+      this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
+      this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
+      if (val.btnName === 'search') {
+        this.getList()
+      } else {
+        this.$modal.confirm('是否确认导出').then(() => {
+            return environmentalCheckRecordExport({...this.queryParams});
+          }).then(response => {
+            this.$download.excel(response, '废水检测历史记录.xls');
+          }).catch(() => {})
+      }
+    },
+    getList() {
+      environmentalCheckRecordPage({...this.queryParams}).then(res => {
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+      })
+    },
+    getSelectList() {
+      environmentalCheckPage({
+        pageNo: 1,
+        pageSize: 100,
+        checkType: 3
+      }).then(res => {
+        console.log(res)
+        this.formConfig[0].selectOptions = res.data.list || []
+      })
+    },
+    tableRowClassName({row, rowIndex}) {
+      console.log(row)
+      if (row.markRed) {
+        return 'warning-row'
+      }else {
+        return ''
+      }
+    }
+  }
+}
+</script>
+<style lang='scss'>
+.vocHis {
+  .el-table .warning-row {
+    background: #fee1e1;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/components/vocAdd.vue b/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/components/vocAdd.vue
new file mode 100644
index 00000000..66fd7c8e
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/components/vocAdd.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-form ref="vocAddForm" :rules="rules" label-width="80px" :model="form">
+    <el-row :gutter="20">
+      <el-col :span='12'>
+        <el-form-item label="指标名称" prop="name">
+          <el-input v-model="form.name" :disabled='isEdit'></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="指标编码" prop="code">
+          <el-input v-model="form.code"></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%;" :disabled='form.method == 2'>
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.ENVIRONMENT_CHECK_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="minValue">
+          <el-input-number v-model="form.minValue" placeholder="最小值" :max="9999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="最大值" prop="maxValue">
+          <el-input-number v-model="form.maxValue" placeholder="最大值" :max="9999999" style="width: 100%;"></el-input-number>
+        </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 { environmentalCheckGet, environmentalCheckUpdate, environmentalCheckCreate, getEnvironmentalCheckCode } from '@/api/safetyEnvironmental/environmental'
+export default {
+  name: 'VocAdd',
+  data() {
+    return {
+      form: {
+        id: '',
+        name: '',
+        code: '',
+        unit: '',
+        minValue: null,
+        maxValue: null,
+        remark: '',
+        checkType: 3
+      },
+      isEdit: false,
+      rules: {
+        name: [{ required: true, message: "指标名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "指标编码不能为空", trigger: "blur" }],
+        // unit: [{ required: true, message: "unit不能为空", trigger: "change" }],
+        minValue: [{ required: true, message: "最小值不能为空", trigger: "blur" }],
+        maxValue: [{ required: true, message: "最大值不能为空", trigger: "blur" }]
+      }
+    }
+  },
+  methods: {
+    init(id) {
+      if (id) {
+        this.isEdit = true
+        this.form.id = id
+        environmentalCheckGet({id: this.form.id}).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+          }
+        })
+      } else {
+        this.isEdit = false
+        this.form.id = ''
+        // 编码
+        getEnvironmentalCheckCode().then(res => {
+          this.form.code = res.data || ''
+        })
+      }
+    },
+    submitForm() {
+      this.$refs['vocAddForm'].validate((valid) => {
+        if (valid) {
+          if (this.form.minValue > this.form.maxValue) {
+            this.$modal.msgError('最小值不能大于最大值')
+            return false
+          }
+          console.log(this.form)
+          if (this.isEdit) {
+            //编辑
+            environmentalCheckUpdate({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          } else {
+            environmentalCheckCreate({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.vocAddForm.resetFields()
+      this.isEdit = false
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue b/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
new file mode 100644
index 00000000..356822e0
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
@@ -0,0 +1,205 @@
+<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"
+      width='60%'
+    >
+      <voc-add ref="vocAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import VocAdd from './components/vocAdd'
+import { publicFormatter } from '@/utils/dict'
+import { environmentalCheckPage, environmentalCheckDelete } from '@/api/safetyEnvironmental/environmental'
+const tableProps = [
+  {
+    prop: 'name',
+    label: '指标名称',
+    minWidth: 120,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'code',
+    label: '指示编码',
+    minWidth: 120
+  },
+  {
+    prop: 'unit',
+    label: '单位',
+    filter: publicFormatter('environment_check_unit')
+  },
+  {
+    prop: 'minValue',
+    label: '最小值'
+  },
+  {
+    prop: 'maxValue',
+    label: '最大值'
+  },
+  {
+    prop: 'creator',
+    label: '创建人'
+  },
+  {
+    prop: 'createTime',
+    label: '创建时间',
+    filter: parseTime,
+    minWidth: 160
+  }
+]
+export default {
+  name: 'VocDetectionIndication',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'input',
+          label: '指标名称',
+          placeholder: '指标名称',
+          param: 'name'
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: this.$auth.hasPermi('base:voc:create') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:voc:create') ? 'button' : '',
+          btnName: '新增',
+          name: 'add',
+          color: 'success',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        checkType: 3,
+        name: null
+      },
+      total: 0,
+      tableProps,
+      list: [],
+      tableH: this.tableHeight(260),
+      tableBtn: [
+        this.$auth.hasPermi('base:voc:update')
+          ? {
+              type: 'edit',
+              btnName: '编辑'
+            }
+          : undefined,
+        this.$auth.hasPermi('base:voc:delete')
+          ? {
+              type: 'delete',
+              btnName: '删除'
+            }
+          : undefined
+      ].filter((v)=>v),
+      addOrEditTitle: '',
+      centervisible: false
+    }
+  },
+  components: { VocAdd },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      environmentalCheckPage({...this.queryParams}).then(res => {
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+      })
+    },
+    buttonClick(val) {
+      console.log(val)
+      if (val.btnName === 'search') {
+        this.queryParams.name = val.name
+        this.getList()
+      } else {
+        this.addOrEditTitle = '新增'
+        this.centervisible = true
+        this.$nextTick(() => {
+          this.$refs.vocAdd.init()
+        })
+      }
+    },
+    handleClick(val) {
+      console.log(val)
+      switch (val.type) {
+        case 'edit':
+          this.addOrEditTitle = '编辑'
+          this.centervisible = true
+          this.$nextTick(() => {
+            this.$refs.vocAdd.init(val.data.id)
+          })
+          break
+        default:
+          this.handleDelete(val.data)
+      }
+    },
+    // 删除
+    handleDelete(val) {
+      this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
+        return environmentalCheckDelete({ id: val.id })
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("操作成功");
+      }).catch(() => {});
+    },
+    // 新增
+    handleCancel() {
+      this.$refs.vocAdd.formClear()
+      this.centervisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.vocAdd.submitForm()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getList()
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue b/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue
new file mode 100644
index 00000000..eaf0dccd
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue
@@ -0,0 +1,152 @@
+<template>
+  <div class="voc">
+    <div class="box1">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>检测指标实时数据</span>
+      </div>
+      <div class="itemBox">
+        <div class="itemBox">
+          <div class="itemClass" v-for="(item, index) in realtimeList" :key='index'>
+            <div class="itemSub">
+              <p class="itemNum">{{item.checkValue}}</p>
+              <p class="itemDescribe">
+                <img src="./../../../../../assets/images/detectionData.png" alt="">
+              {{item.name}}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="box2">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>检测指标趋势图</span>
+      </div>
+      <!-- 搜索工作栏 -->
+      <search-area @submit="getTrend"/>
+      <line-chart :chartData="chartData" v-show='Object.keys(chartData).length !== 0' :timeDim="queryParams.timeDim"/>
+      <!-- 没有数据 -->
+      <div class="no-data-bg" v-show='Object.keys(chartData).length === 0'></div>
+    </div>
+  </div>
+</template>
+<script>
+import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
+import LineChart from './../../components/lineChart'
+import SearchArea from './../../components/searchArea'
+export default {
+  name: 'Voc',
+  data(){
+    return {
+      realtimeList:[],
+      queryParams:{
+        checkType: 1,
+        timeDim: null,
+        timeRange: []
+      },
+      chartData: {}
+    }
+  },
+  components: { LineChart, SearchArea },
+  mounted() {
+    this.getMsg()
+  },
+  methods: {
+    getMsg() {
+      environmentalCheckRealtime({checkType: 3}).then(res => {
+        console.log(res)
+        this.realtimeList = res.data || []
+      })
+    },
+    getTrend(params) {
+      console.log(params)
+      this.queryParams.timeDim = params.timeDim
+      this.queryParams.timeRange[0] = params.startTime
+      this.queryParams.timeRange[1] = params.endTime
+      environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
+        console.log(res)
+        if (res.code === 0) {
+          this.chartData = res.data
+        } else {
+          this.chartData = {}
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.voc {
+  background-color: #f2f4f9;
+  .box1 {
+    height: 172px;
+    padding: 12px 16px 0;
+    margin-bottom: 8px;
+    background-color: #fff;
+    border-radius: 9px;
+    .itemBox {
+      display: flex;
+      flex-flow: row nowrap;
+      overflow: auto;
+      .itemClass {
+        width: 198px;
+        height: 88px;
+        // border: 1px solid green;
+        padding: 12px 0px 12px 18px;
+        .itemSub {
+          width: 176px;
+          height: 65px;
+          padding-right: 26px;
+          border-right: 1px solid #E8E8E8;
+          P{
+            margin: 0;
+            img {
+              width: 24px;
+              height: 24px;
+              vertical-align: middle;
+            }
+          }
+          .itemNum {
+            font-size: 32px;
+            font-weight: 600;
+            height: 43px;
+            color: #3E6AF7;
+            text-align: right;
+          }
+          .itemDescribe {
+            font-size: 16px;
+            text-align: right;
+          }
+        }
+      }
+    }
+    .itemClass:last-child > .itemSub{
+      border: none !important;
+    }
+  }
+  .box2 {
+    background-color: #fff;
+    border-radius: 9px;
+    padding: 16px;
+    height: calc(100vh - 308px);
+  }
+  .boxTitle {
+    display: inline-block;
+    font-size: 16px;
+    font-weight: 400;
+    color: #000000;
+    margin:0 10px 20px 0;
+  }
+  .blueTitle {
+    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/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
new file mode 100644
index 00000000..a8b09572
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
@@ -0,0 +1,185 @@
+<template>
+  <div class="app-container wasteGasHis">
+    <!-- 搜索工作栏 -->
+    <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"
+      :row-class-name="tableRowClassName"
+    />
+    <pagination
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
+  </div>
+</template>
+<script>
+import { publicFormatter } from '@/utils/dict'
+import { parseTime } from '@/utils/ruoyi'
+import { environmentalCheckRecordPage, environmentalCheckRecordExport, environmentalCheckPage } from '@/api/safetyEnvironmental/environmental'
+import moment from 'moment'
+const tableProps = [
+  {
+    prop: 'checkName',
+    label: '指标名称'
+  },
+  {
+    prop: 'checkValue',
+    label: '检测数值'
+  },
+  {
+    prop: 'unit',
+    label: '单位',
+    filter: publicFormatter('environment_check_unit')
+  },
+  {
+    prop: 'checkTime',
+    label: '检测时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'origin',
+    label: '来源',
+    filter: (val) => ['手动', '自动'][val]
+  },
+  {
+    prop: 'recordPerson',
+    label: '录入人'
+  },
+  {
+    prop: 'recordTime',
+    label: '录入时间',
+    filter: parseTime,
+    minWidth: 160
+  }
+]
+export default {
+  name: 'WasteGasDetectionHistory',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'select',
+          label: '指标名称',
+          selectOptions: [],
+          param: 'checkId',
+          filterable: true
+        },
+        {
+          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: this.$auth.hasPermi('base:waste-gas:export') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:waste-gas:export') ? 'button' : '',
+          btnName: '导出',
+          name: 'export',
+          color: 'primary',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        checkId: null,
+        checkType: 2,
+        startTime: null,
+        endTime: null
+      },
+      tableProps,
+      list: [],
+      total: 0,
+      tableH: this.tableHeight(260)
+    }
+  },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
+    let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf()
+    this.formConfig[1].defaultSelect = [start, end]
+    this.queryParams.startTime = start
+    this.queryParams.endTime = end
+    this.getSelectList()
+    this.getList()
+  },
+  methods: {
+    buttonClick(val) {
+      this.queryParams.pageNo = 1;
+      this.queryParams.checkId = val.checkId
+      this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
+      this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
+      if (val.btnName === 'search') {
+        this.getList()
+      } else {
+        this.$modal.confirm('是否确认导出').then(() => {
+            return environmentalCheckRecordExport({...this.queryParams});
+          }).then(response => {
+            this.$download.excel(response, '废气检测历史记录.xls');
+          }).catch(() => {})
+      }
+    },
+    getList() {
+      environmentalCheckRecordPage({...this.queryParams}).then(res => {
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+      })
+    },
+    getSelectList() {
+      environmentalCheckPage({
+        pageNo: 1,
+        pageSize: 100,
+        checkType: 2
+      }).then(res => {
+        console.log(res)
+        this.formConfig[0].selectOptions = res.data.list || []
+      })
+    },
+    tableRowClassName({row, rowIndex}) {
+      console.log(row)
+      if (row.markRed) {
+        return 'warning-row'
+      }else {
+        return ''
+      }
+    }
+  }
+}
+</script>
+<style lang='scss'>
+.wasteGasHis {
+  .el-table .warning-row {
+    background: #fee1e1;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/components/wasteGasAdd.vue b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/components/wasteGasAdd.vue
new file mode 100644
index 00000000..c40bdf9f
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/components/wasteGasAdd.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-form ref="wasteGasAddForm" :rules="rules" label-width="80px" :model="form">
+    <el-row :gutter="20">
+      <el-col :span='12'>
+        <el-form-item label="指标名称" prop="name">
+          <el-input v-model="form.name" :disabled='isEdit'></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="指标编码" prop="code">
+          <el-input v-model="form.code"></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%;" :disabled='form.method == 2'>
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.ENVIRONMENT_CHECK_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="minValue">
+          <el-input-number v-model="form.minValue" placeholder="最小值" :max="9999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="最大值" prop="maxValue">
+          <el-input-number v-model="form.maxValue" placeholder="最大值" :max="9999999" style="width: 100%;"></el-input-number>
+        </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 { environmentalCheckGet, environmentalCheckUpdate, environmentalCheckCreate, getEnvironmentalCheckCode } from '@/api/safetyEnvironmental/environmental'
+export default {
+  name: 'WasteGasAdd',
+  data() {
+    return {
+      form: {
+        id: '',
+        name: '',
+        code: '',
+        unit: '',
+        minValue: null,
+        maxValue: null,
+        remark: '',
+        checkType: 2
+      },
+      isEdit: false,
+      rules: {
+        name: [{ required: true, message: "指标名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "指标编码不能为空", trigger: "blur" }],
+        // unit: [{ required: true, message: "unit不能为空", trigger: "change" }],
+        minValue: [{ required: true, message: "最小值不能为空", trigger: "blur" }],
+        maxValue: [{ required: true, message: "最大值不能为空", trigger: "blur" }]
+      }
+    }
+  },
+  methods: {
+    init(id) {
+      if (id) {
+        this.isEdit = true
+        this.form.id = id
+        environmentalCheckGet({id: this.form.id}).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+          }
+        })
+      } else {
+        this.isEdit = false
+        this.form.id = ''
+        // 编码
+        getEnvironmentalCheckCode().then(res => {
+          this.form.code = res.data || ''
+        })
+      }
+    },
+    submitForm() {
+      this.$refs['wasteGasAddForm'].validate((valid) => {
+        if (valid) {
+          if (this.form.minValue > this.form.maxValue) {
+            this.$modal.msgError('最小值不能大于最大值')
+            return false
+          }
+          console.log(this.form)
+          if (this.isEdit) {
+            //编辑
+            environmentalCheckUpdate({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          } else {
+            environmentalCheckCreate({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.wasteGasAddForm.resetFields()
+      this.isEdit = false
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
new file mode 100644
index 00000000..58c113b9
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
@@ -0,0 +1,205 @@
+<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"
+      width='60%'
+    >
+      <waste-gas-add ref="wasteGasAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import WasteGasAdd from './components/wasteGasAdd'
+import { publicFormatter } from '@/utils/dict'
+import { environmentalCheckPage, environmentalCheckDelete } from '@/api/safetyEnvironmental/environmental'
+const tableProps = [
+  {
+    prop: 'name',
+    label: '指标名称',
+    minWidth: 120,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'code',
+    label: '指示编码',
+    minWidth: 120
+  },
+  {
+    prop: 'unit',
+    label: '单位',
+    filter: publicFormatter('environment_check_unit')
+  },
+  {
+    prop: 'minValue',
+    label: '最小值'
+  },
+  {
+    prop: 'maxValue',
+    label: '最大值'
+  },
+  {
+    prop: 'creator',
+    label: '创建人'
+  },
+  {
+    prop: 'createTime',
+    label: '创建时间',
+    filter: parseTime,
+    minWidth: 160
+  }
+]
+export default {
+  name: 'WasteGasDetectionIndication',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'input',
+          label: '指标名称',
+          placeholder: '指标名称',
+          param: 'name'
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: this.$auth.hasPermi('base:waste-gas:create') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:waste-gas:create') ? 'button' : '',
+          btnName: '新增',
+          name: 'add',
+          color: 'success',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        checkType: 2,
+        name: null
+      },
+      total: 0,
+      tableProps,
+      list: [],
+      tableH: this.tableHeight(260),
+      tableBtn: [
+        this.$auth.hasPermi('base:waste-gas:update')
+          ? {
+              type: 'edit',
+              btnName: '编辑'
+            }
+          : undefined,
+        this.$auth.hasPermi('base:waste-gas:delete')
+          ? {
+              type: 'delete',
+              btnName: '删除'
+            }
+          : undefined
+      ].filter((v)=>v),
+      addOrEditTitle: '',
+      centervisible: false
+    }
+  },
+  components: { WasteGasAdd },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      environmentalCheckPage({...this.queryParams}).then(res => {
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+      })
+    },
+    buttonClick(val) {
+      console.log(val)
+      if (val.btnName === 'search') {
+        this.queryParams.name = val.name
+        this.getList()
+      } else {
+        this.addOrEditTitle = '新增'
+        this.centervisible = true
+        this.$nextTick(() => {
+          this.$refs.wasteGasAdd.init()
+        })
+      }
+    },
+    handleClick(val) {
+      console.log(val)
+      switch (val.type) {
+        case 'edit':
+          this.addOrEditTitle = '编辑'
+          this.centervisible = true
+          this.$nextTick(() => {
+            this.$refs.wasteGasAdd.init(val.data.id)
+          })
+          break
+        default:
+          this.handleDelete(val.data)
+      }
+    },
+    // 删除
+    handleDelete(val) {
+      this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
+        return environmentalCheckDelete({ id: val.id })
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("操作成功");
+      }).catch(() => {});
+    },
+    // 新增
+    handleCancel() {
+      this.$refs.wasteGasAdd.formClear()
+      this.centervisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.wasteGasAdd.submitForm()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getList()
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue
new file mode 100644
index 00000000..854cb516
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue
@@ -0,0 +1,152 @@
+<template>
+  <div class="wasteGasManagement">
+    <div class="box1">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>检测指标实时数据</span>
+      </div>
+      <div class="itemBox">
+        <div class="itemBox">
+          <div class="itemClass" v-for="(item, index) in realtimeList" :key='index'>
+            <div class="itemSub">
+              <p class="itemNum">{{item.checkValue}}</p>
+              <p class="itemDescribe">
+                <img src="./../../../../../assets/images/detectionData.png" alt="">
+              {{item.name}}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="box2">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>检测指标趋势图</span>
+      </div>
+      <!-- 搜索工作栏 -->
+      <search-area @submit="getTrend"/>
+      <line-chart :chartData="chartData" v-show='Object.keys(chartData).length !== 0' :timeDim="queryParams.timeDim"/>
+      <!-- 没有数据 -->
+      <div class="no-data-bg" v-show='Object.keys(chartData).length === 0'></div>
+    </div>
+  </div>
+</template>
+<script>
+import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
+import LineChart from './../../components/lineChart'
+import SearchArea from './../../components/searchArea'
+export default {
+  name: 'WasteGasManagement',
+  data(){
+    return {
+      realtimeList:[],
+      queryParams:{
+        checkType: 2,
+        timeDim: null,
+        timeRange: []
+      },
+      chartData: {}
+    }
+  },
+  components: { LineChart, SearchArea },
+  mounted() {
+    this.getMsg()
+  },
+  methods: {
+    getMsg() {
+      environmentalCheckRealtime({checkType: 2}).then(res => {
+        console.log(res)
+        this.realtimeList = res.data || []
+      })
+    },
+    getTrend(params) {
+      console.log(params)
+      this.queryParams.timeDim = params.timeDim
+      this.queryParams.timeRange[0] = params.startTime
+      this.queryParams.timeRange[1] = params.endTime
+      environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
+        console.log(res)
+        if (res.code === 0) {
+          this.chartData = res.data
+        } else {
+          this.chartData = {}
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.wasteGasManagement {
+  background-color: #f2f4f9;
+  .box1 {
+    height: 172px;
+    padding: 12px 16px 0;
+    margin-bottom: 8px;
+    background-color: #fff;
+    border-radius: 9px;
+    .itemBox {
+      display: flex;
+      flex-flow: row nowrap;
+      overflow: auto;
+      .itemClass {
+        width: 198px;
+        height: 88px;
+        // border: 1px solid green;
+        padding: 12px 0px 12px 18px;
+        .itemSub {
+          width: 176px;
+          height: 65px;
+          padding-right: 26px;
+          border-right: 1px solid #E8E8E8;
+          P{
+            margin: 0;
+            img {
+              width: 24px;
+              height: 24px;
+              vertical-align: middle;
+            }
+          }
+          .itemNum {
+            font-size: 32px;
+            font-weight: 600;
+            height: 43px;
+            color: #3E6AF7;
+            text-align: right;
+          }
+          .itemDescribe {
+            font-size: 16px;
+            text-align: right;
+          }
+        }
+      }
+    }
+    .itemClass:last-child > .itemSub{
+      border: none !important;
+    }
+  }
+  .box2 {
+    background-color: #fff;
+    border-radius: 9px;
+    padding: 16px;
+    height: calc(100vh - 308px);
+  }
+  .boxTitle {
+    display: inline-block;
+    font-size: 16px;
+    font-weight: 400;
+    color: #000000;
+    margin:0 10px 20px 0;
+  }
+  .blueTitle {
+    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/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
new file mode 100644
index 00000000..a0c1c1ab
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
@@ -0,0 +1,185 @@
+<template>
+  <div class="app-container wasteWaterHis">
+    <!-- 搜索工作栏 -->
+    <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"
+      :row-class-name="tableRowClassName"
+    />
+    <pagination
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
+  </div>
+</template>
+<script>
+import { publicFormatter } from '@/utils/dict'
+import { parseTime } from '@/utils/ruoyi'
+import { environmentalCheckRecordPage, environmentalCheckRecordExport, environmentalCheckPage } from '@/api/safetyEnvironmental/environmental'
+import moment from 'moment'
+const tableProps = [
+  {
+    prop: 'checkName',
+    label: '指标名称'
+  },
+  {
+    prop: 'checkValue',
+    label: '检测数值'
+  },
+  {
+    prop: 'unit',
+    label: '单位',
+    filter: publicFormatter('environment_check_unit')
+  },
+  {
+    prop: 'checkTime',
+    label: '检测时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'origin',
+    label: '来源',
+    filter: (val) => ['手动', '自动'][val]
+  },
+  {
+    prop: 'recordPerson',
+    label: '录入人'
+  },
+  {
+    prop: 'recordTime',
+    label: '录入时间',
+    filter: parseTime,
+    minWidth: 160
+  }
+]
+export default {
+  name: 'WasteWaterDetectionHistory',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'select',
+          label: '指标名称',
+          selectOptions: [],
+          param: 'checkId',
+          filterable: true
+        },
+        {
+          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: this.$auth.hasPermi('base:waste-water:export') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:waste-water:export') ? 'button' : '',
+          btnName: '导出',
+          name: 'export',
+          color: 'primary',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        checkId: null,
+        checkType: 1,
+        startTime: null,
+        endTime: null
+      },
+      tableProps,
+      list: [],
+      total: 0,
+      tableH: this.tableHeight(260)
+    }
+  },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
+    let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf()
+    this.formConfig[1].defaultSelect = [start, end]
+    this.queryParams.startTime = start
+    this.queryParams.endTime = end
+    this.getSelectList()
+    this.getList()
+  },
+  methods: {
+    buttonClick(val) {
+      this.queryParams.pageNo = 1;
+      this.queryParams.checkId = val.checkId
+      this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
+      this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
+      if (val.btnName === 'search') {
+        this.getList()
+      } else {
+        this.$modal.confirm('是否确认导出').then(() => {
+            return environmentalCheckRecordExport({...this.queryParams});
+          }).then(response => {
+            this.$download.excel(response, '废水检测历史记录.xls');
+          }).catch(() => {})
+      }
+    },
+    getList() {
+      environmentalCheckRecordPage({...this.queryParams}).then(res => {
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+      })
+    },
+    getSelectList() {
+      environmentalCheckPage({
+        pageNo: 1,
+        pageSize: 100,
+        checkType: 1
+      }).then(res => {
+        console.log(res)
+        this.formConfig[0].selectOptions = res.data.list || []
+      })
+    },
+    tableRowClassName({row, rowIndex}) {
+      console.log(row)
+      if (row.markRed) {
+        return 'warning-row'
+      }else {
+        return ''
+      }
+    }
+  }
+}
+</script>
+<style lang='scss'>
+.wasteWaterHis {
+  .el-table .warning-row {
+    background: #fee1e1;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/components/wasteWaterAdd.vue b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/components/wasteWaterAdd.vue
new file mode 100644
index 00000000..df0b2ded
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/components/wasteWaterAdd.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-form ref="wasteWaterAddForm" :rules="rules" label-width="80px" :model="form">
+    <el-row :gutter="20">
+      <el-col :span='12'>
+        <el-form-item label="指标名称" prop="name">
+          <el-input v-model="form.name" :disabled='isEdit'></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="指标编码" prop="code">
+          <el-input v-model="form.code"></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%;" :disabled='form.method == 2'>
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.ENVIRONMENT_CHECK_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="minValue">
+          <el-input-number v-model="form.minValue" placeholder="最小值" :max="9999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="最大值" prop="maxValue">
+          <el-input-number v-model="form.maxValue" placeholder="最大值" :max="9999999" style="width: 100%;"></el-input-number>
+        </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 { environmentalCheckGet, environmentalCheckUpdate, environmentalCheckCreate, getEnvironmentalCheckCode } from '@/api/safetyEnvironmental/environmental'
+export default {
+  name: 'WasteWaterAdd',
+  data() {
+    return {
+      form: {
+        id: '',
+        name: '',
+        code: '',
+        unit: '',
+        minValue: null,
+        maxValue: null,
+        remark: '',
+        checkType: 1
+      },
+      isEdit: false,
+      rules: {
+        name: [{ required: true, message: "指标名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "指标编码不能为空", trigger: "blur" }],
+        // unit: [{ required: true, message: "unit不能为空", trigger: "change" }],
+        minValue: [{ required: true, message: "最小值不能为空", trigger: "blur" }],
+        maxValue: [{ required: true, message: "最大值不能为空", trigger: "blur" }]
+      }
+    }
+  },
+  methods: {
+    init(id) {
+      if (id) {
+        this.isEdit = true
+        this.form.id = id
+        environmentalCheckGet({id: this.form.id}).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+          }
+        })
+      } else {
+        this.isEdit = false
+        this.form.id = ''
+        // 编码
+        getEnvironmentalCheckCode().then(res => {
+          this.form.code = res.data || ''
+        })
+      }
+    },
+    submitForm() {
+      this.$refs['wasteWaterAddForm'].validate((valid) => {
+        if (valid) {
+          if (this.form.minValue > this.form.maxValue) {
+            this.$modal.msgError('最小值不能大于最大值')
+            return false
+          }
+          console.log(this.form)
+          if (this.isEdit) {
+            //编辑
+            environmentalCheckUpdate({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          } else {
+            environmentalCheckCreate({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.wasteWaterAddForm.resetFields()
+      this.isEdit = false
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
new file mode 100644
index 00000000..7a54de38
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
@@ -0,0 +1,205 @@
+<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"
+      width='60%'
+    >
+      <waste-water-add ref="wasteWaterAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import WasteWaterAdd from './components/wasteWaterAdd'
+import { publicFormatter } from '@/utils/dict'
+import { environmentalCheckPage, environmentalCheckDelete } from '@/api/safetyEnvironmental/environmental'
+const tableProps = [
+  {
+    prop: 'name',
+    label: '指标名称',
+    minWidth: 120,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'code',
+    label: '指示编码',
+    minWidth: 120
+  },
+  {
+    prop: 'unit',
+    label: '单位',
+    filter: publicFormatter('environment_check_unit')
+  },
+  {
+    prop: 'minValue',
+    label: '最小值'
+  },
+  {
+    prop: 'maxValue',
+    label: '最大值'
+  },
+  {
+    prop: 'creator',
+    label: '创建人'
+  },
+  {
+    prop: 'createTime',
+    label: '创建时间',
+    filter: parseTime,
+    minWidth: 160
+  }
+]
+export default {
+  name: 'WasteWaterDetectionIndication',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'input',
+          label: '指标名称',
+          placeholder: '指标名称',
+          param: 'name'
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: this.$auth.hasPermi('base:waste-water:create') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:waste-water:create') ? 'button' : '',
+          btnName: '新增',
+          name: 'add',
+          color: 'success',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        checkType: 1,
+        name: null
+      },
+      total: 0,
+      tableProps,
+      list: [],
+      tableH: this.tableHeight(260),
+      tableBtn: [
+        this.$auth.hasPermi('base:waste-water:update')
+          ? {
+              type: 'edit',
+              btnName: '编辑'
+            }
+          : undefined,
+        this.$auth.hasPermi('base:waste-water:delete')
+          ? {
+              type: 'delete',
+              btnName: '删除'
+            }
+          : undefined
+      ].filter((v)=>v),
+      addOrEditTitle: '',
+      centervisible: false
+    }
+  },
+  components: { WasteWaterAdd },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      environmentalCheckPage({...this.queryParams}).then(res => {
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+      })
+    },
+    buttonClick(val) {
+      console.log(val)
+      if (val.btnName === 'search') {
+        this.queryParams.name = val.name
+        this.getList()
+      } else {
+        this.addOrEditTitle = '新增'
+        this.centervisible = true
+        this.$nextTick(() => {
+          this.$refs.wasteWaterAdd.init()
+        })
+      }
+    },
+    handleClick(val) {
+      console.log(val)
+      switch (val.type) {
+        case 'edit':
+          this.addOrEditTitle = '编辑'
+          this.centervisible = true
+          this.$nextTick(() => {
+            this.$refs.wasteWaterAdd.init(val.data.id)
+          })
+          break
+        default:
+          this.handleDelete(val.data)
+      }
+    },
+    // 删除
+    handleDelete(val) {
+      this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
+        return environmentalCheckDelete({ id: val.id })
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("操作成功");
+      }).catch(() => {});
+    },
+    // 新增
+    handleCancel() {
+      this.$refs.wasteWaterAdd.formClear()
+      this.centervisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.wasteWaterAdd.submitForm()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getList()
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue
new file mode 100644
index 00000000..0545cb4c
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue
@@ -0,0 +1,150 @@
+<template>
+  <div class="wasteWaterManagement">
+    <div class="box1">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>检测指标实时数据</span>
+      </div>
+      <div class="itemBox">
+        <div class="itemClass" v-for="(item, index) in realtimeList" :key='index'>
+          <div class="itemSub">
+            <p class="itemNum">{{item.checkValue}}</p>
+            <p class="itemDescribe">
+              <img src="./../../../../../assets/images/detectionData.png" alt="">
+            {{item.name}}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="box2">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>检测指标趋势图</span>
+      </div>
+      <!-- 搜索工作栏 -->
+      <search-area @submit="getTrend"/>
+      <line-chart :chartData="chartData" v-show='Object.keys(chartData).length !== 0' :timeDim="queryParams.timeDim"/>
+      <!-- 没有数据 -->
+      <div class="no-data-bg" v-show='Object.keys(chartData).length === 0'></div>
+    </div>
+  </div>
+</template>
+<script>
+import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
+import LineChart from './../../components/lineChart'
+import SearchArea from './../../components/searchArea'
+export default {
+  name: 'WasteWaterManagement',
+  data(){
+    return {
+      realtimeList:[],
+      queryParams:{
+        checkType: 1,
+        timeDim: null,
+        timeRange: []
+      },
+      chartData: {}
+    }
+  },
+  components: { LineChart, SearchArea },
+  mounted() {
+    this.getMsg()
+  },
+  methods: {
+    getMsg() {
+      environmentalCheckRealtime({checkType: 1}).then(res => {
+        console.log(res)
+        this.realtimeList = res.data || []
+      })
+    },
+    getTrend(params) {
+      console.log(params)
+      this.queryParams.timeDim = params.timeDim
+      this.queryParams.timeRange[0] = params.startTime
+      this.queryParams.timeRange[1] = params.endTime
+      environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
+        console.log(res)
+        if (res.code === 0) {
+          this.chartData = res.data
+        } else {
+          this.chartData = {}
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.wasteWaterManagement {
+  background-color: #f2f4f9;
+  .box1 {
+    height: 172px;
+    padding: 12px 16px 0;
+    margin-bottom: 8px;
+    background-color: #fff;
+    border-radius: 9px;
+    .itemBox {
+      display: flex;
+      flex-flow: row nowrap;
+      overflow: auto;
+      .itemClass {
+        width: 198px;
+        height: 88px;
+        // border: 1px solid green;
+        padding: 12px 0px 12px 18px;
+        .itemSub {
+          width: 176px;
+          height: 65px;
+          padding-right: 26px;
+          border-right: 1px solid #E8E8E8;
+          P{
+            margin: 0;
+            img {
+              width: 24px;
+              height: 24px;
+              vertical-align: middle;
+            }
+          }
+          .itemNum {
+            font-size: 32px;
+            font-weight: 600;
+            height: 43px;
+            color: #3E6AF7;
+            text-align: right;
+          }
+          .itemDescribe {
+            font-size: 16px;
+            text-align: right;
+          }
+        }
+      }
+    }
+    .itemClass:last-child > .itemSub{
+      border: none !important;
+    }
+  }
+  .box2 {
+    background-color: #fff;
+    border-radius: 9px;
+    padding: 16px;
+    height: calc(100vh - 308px);
+  }
+  .boxTitle {
+    display: inline-block;
+    font-size: 16px;
+    font-weight: 400;
+    color: #000000;
+    margin:0 10px 20px 0;
+  }
+  .blueTitle {
+    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/system/dept/index.vue b/src/views/system/dept/index.vue
index 3397a935..9561f92e 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -28,6 +28,7 @@
 
     <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="id" :default-expand-all="isExpandAll"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <el-table-column prop="id" label="部门编码" width="260"></el-table-column>
       <el-table-column prop="name" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="leader" label="负责人" :formatter="userNicknameFormat" width="120"/>
       <el-table-column prop="sort" label="排序" width="200"></el-table-column>
diff --git a/src/views/warehouse/end-material/warehouseGoods/index.vue b/src/views/warehouse/end-material/warehouseGoods/index.vue
index 6b6df36f..6d7c2fd1 100644
--- a/src/views/warehouse/end-material/warehouseGoods/index.vue
+++ b/src/views/warehouse/end-material/warehouseGoods/index.vue
@@ -62,6 +62,7 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '物品编码',
+    width: 200
 	},
 	{
 		prop: 'spec',
diff --git a/src/views/warehouse/end-material/warehouseRealtime/index.vue b/src/views/warehouse/end-material/warehouseRealtime/index.vue
index 828fda98..b294ab4e 100644
--- a/src/views/warehouse/end-material/warehouseRealtime/index.vue
+++ b/src/views/warehouse/end-material/warehouseRealtime/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-11-03 16:37:06
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-24 14:35:01
+ * @LastEditTime: 2023-12-06 15:31:23
  * @Description:
 -->
 <template>
@@ -42,7 +42,7 @@
 					<span>{{ parseTime(scope.row.latestOutTime) }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="操作" width="100">
+			<el-table-column label="操作" width="100" v-if="false">
 				<template v-slot="scope">
 					<el-button
 						size="mini"
@@ -134,16 +134,16 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('end-material:warehouse-realtime:create') ? 'button' : '',
-					btnName: '入库',
-					name: 'add',
-					color: 'primary',
-					plain: true,
-				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('end-material:warehouse-realtime:create') ? 'button' : '',
+				// 	btnName: '入库',
+				// 	name: 'add',
+				// 	color: 'primary',
+				// 	plain: true,
+				// },
 			],
 		};
 	},
diff --git a/src/views/warehouse/end-material/warehouseRealtimeLocation/add-or-updata.vue b/src/views/warehouse/end-material/warehouseRealtimeLocation/add-or-updata.vue
index f52732b4..23254475 100644
--- a/src/views/warehouse/end-material/warehouseRealtimeLocation/add-or-updata.vue
+++ b/src/views/warehouse/end-material/warehouseRealtimeLocation/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:08:09
+ * @LastEditTime: 2023-12-06 15:15:52
  * @Description:
 -->
 <template>
@@ -41,21 +41,23 @@ const tableProps = [
 	{
 		prop: 'num',
 		label: '数量',
+    width: 50
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+    width: 130
 	},
 	{
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
+    width: 150
 	},
 	{
 		prop: 'leftTime',
 		label: '剩余留存时长(天)',
-    width: 150
+    width: 130
 	},
 	{
 		prop: 'remark',
diff --git a/src/views/warehouse/end-material/warehouseRealtimeLocation/index.vue b/src/views/warehouse/end-material/warehouseRealtimeLocation/index.vue
index e88cd8ae..82e90f9a 100644
--- a/src/views/warehouse/end-material/warehouseRealtimeLocation/index.vue
+++ b/src/views/warehouse/end-material/warehouseRealtimeLocation/index.vue
@@ -16,7 +16,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="140"
+				:width="70"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -36,7 +36,7 @@
 			:dialogTitle="addOrEditTitle"
 			:dialogVisible="addOrUpdateVisible"
 			:before-close="handleCancel"
-			width="50%">
+			width="60%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -99,7 +99,7 @@ const tableProps = [
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
-		minWidth: 100,
+    width: 150
 	},
 	{
 		prop: 'remark',
@@ -124,18 +124,18 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`end-material:warehouse-realtime-location:query`)
-					? {
-							type: 'out',
-							btnName: '出库',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`end-material:warehouse-realtime-location:query`)
-					? {
-							type: 'in',
-							btnName: '入库',
-					  }
-					: undefined,
+				// this.$auth.hasPermi(`end-material:warehouse-realtime-location:query`)
+				// 	? {
+				// 			type: 'out',
+				// 			btnName: '出库',
+				// 	  }
+				// 	: undefined,
+				// this.$auth.hasPermi(`end-material:warehouse-realtime-location:query`)
+				// 	? {
+				// 			type: 'in',
+				// 			btnName: '入库',
+				// 	  }
+				// 	: undefined,
 				this.$auth.hasPermi(`end-material:warehouse-realtime-location:query`)
 					? {
 							type: 'detail',
diff --git a/src/views/warehouse/out-material/warehouseGoods/index.vue b/src/views/warehouse/out-material/warehouseGoods/index.vue
index 05ccdc19..ea895f79 100644
--- a/src/views/warehouse/out-material/warehouseGoods/index.vue
+++ b/src/views/warehouse/out-material/warehouseGoods/index.vue
@@ -62,6 +62,7 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '物品编码',
+    width: 200
 	},
 	{
 		prop: 'spec',
diff --git a/src/views/warehouse/out-material/warehouseRealtime/index.vue b/src/views/warehouse/out-material/warehouseRealtime/index.vue
index 930bf067..9a9d15fc 100644
--- a/src/views/warehouse/out-material/warehouseRealtime/index.vue
+++ b/src/views/warehouse/out-material/warehouseRealtime/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-11-03 16:37:06
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-24 14:36:24
+ * @LastEditTime: 2023-12-06 15:31:06
  * @Description:
 -->
 <template>
@@ -42,7 +42,7 @@
 					<span>{{ parseTime(scope.row.latestOutTime) }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="操作" width="100">
+			<el-table-column label="操作" width="100" v-if="false">
 				<template v-slot="scope">
 					<el-button
 						size="mini"
@@ -134,16 +134,16 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('out-material:warehouse-realtime:create') ? 'button' : '',
-					btnName: '入库',
-					name: 'add',
-					color: 'primary',
-					plain: true,
-				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('out-material:warehouse-realtime:create') ? 'button' : '',
+				// 	btnName: '入库',
+				// 	name: 'add',
+				// 	color: 'primary',
+				// 	plain: true,
+				// },
 			],
 		};
 	},
diff --git a/src/views/warehouse/out-material/warehouseRealtimeLocation/add-or-updata.vue b/src/views/warehouse/out-material/warehouseRealtimeLocation/add-or-updata.vue
index 4ec95c67..9b89f45f 100644
--- a/src/views/warehouse/out-material/warehouseRealtimeLocation/add-or-updata.vue
+++ b/src/views/warehouse/out-material/warehouseRealtimeLocation/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:07:43
+ * @LastEditTime: 2023-12-06 15:15:40
  * @Description:
 -->
 <template>
@@ -41,21 +41,23 @@ const tableProps = [
 	{
 		prop: 'num',
 		label: '数量',
+    width: 50
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-		width: 150,
+    width: 130
 	},
 	{
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
+    width: 150
 	},
 	{
 		prop: 'leftTime',
 		label: '剩余留存时长(天)',
-		width: 150,
+    width: 130
 	},
 	{
 		prop: 'remark',
diff --git a/src/views/warehouse/out-material/warehouseRealtimeLocation/index.vue b/src/views/warehouse/out-material/warehouseRealtimeLocation/index.vue
index add9859f..cdea32c4 100644
--- a/src/views/warehouse/out-material/warehouseRealtimeLocation/index.vue
+++ b/src/views/warehouse/out-material/warehouseRealtimeLocation/index.vue
@@ -16,7 +16,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="140"
+				:width="70"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -36,7 +36,7 @@
 			:dialogTitle="addOrEditTitle"
 			:dialogVisible="addOrUpdateVisible"
 			:before-close="handleCancel"
-			width="50%">
+			width="60%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -99,7 +99,7 @@ const tableProps = [
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
-		minWidth: 100,
+    width: 150
 	},
 	{
 		prop: 'remark',
@@ -124,18 +124,18 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`out-material:warehouse-realtime-location:query`)
-					? {
-							type: 'out',
-							btnName: '出库',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`out-material:warehouse-realtime-location:query`)
-					? {
-							type: 'in',
-							btnName: '入库',
-					  }
-					: undefined,
+				// this.$auth.hasPermi(`out-material:warehouse-realtime-location:query`)
+				// 	? {
+				// 			type: 'out',
+				// 			btnName: '出库',
+				// 	  }
+				// 	: undefined,
+				// this.$auth.hasPermi(`out-material:warehouse-realtime-location:query`)
+				// 	? {
+				// 			type: 'in',
+				// 			btnName: '入库',
+				// 	  }
+				// 	: undefined,
 				this.$auth.hasPermi(`out-material:warehouse-realtime-location:query`)
 					? {
 							type: 'detail',
diff --git a/src/views/warehouse/package-material/warehouseGoods/index.vue b/src/views/warehouse/package-material/warehouseGoods/index.vue
index e8bf9161..43d8d803 100644
--- a/src/views/warehouse/package-material/warehouseGoods/index.vue
+++ b/src/views/warehouse/package-material/warehouseGoods/index.vue
@@ -62,6 +62,7 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '物品编码',
+    width: 200
 	},
 	{
 		prop: 'spec',
diff --git a/src/views/warehouse/package-material/warehouseRealtime/index.vue b/src/views/warehouse/package-material/warehouseRealtime/index.vue
index 15bea438..cbbad4a9 100644
--- a/src/views/warehouse/package-material/warehouseRealtime/index.vue
+++ b/src/views/warehouse/package-material/warehouseRealtime/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-11-03 16:37:06
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-24 14:36:08
+ * @LastEditTime: 2023-12-06 15:30:52
  * @Description:
 -->
 <template>
@@ -42,7 +42,7 @@
 					<span>{{ parseTime(scope.row.latestOutTime) }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="操作" width="100">
+			<el-table-column label="操作" width="100" v-if="false">
 				<template v-slot="scope">
 					<el-button
 						size="mini"
@@ -134,16 +134,16 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('pack-material:warehouse-realtime:create') ? 'button' : '',
-					btnName: '入库',
-					name: 'add',
-					color: 'primary',
-					plain: true,
-				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('pack-material:warehouse-realtime:create') ? 'button' : '',
+				// 	btnName: '入库',
+				// 	name: 'add',
+				// 	color: 'primary',
+				// 	plain: true,
+				// },
 			],
 		};
 	},
diff --git a/src/views/warehouse/package-material/warehouseRealtimeLocation/add-or-updata.vue b/src/views/warehouse/package-material/warehouseRealtimeLocation/add-or-updata.vue
index ed426e3e..ea48d2e7 100644
--- a/src/views/warehouse/package-material/warehouseRealtimeLocation/add-or-updata.vue
+++ b/src/views/warehouse/package-material/warehouseRealtimeLocation/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:08:22
+ * @LastEditTime: 2023-12-06 15:15:26
  * @Description:
 -->
 <template>
@@ -41,21 +41,23 @@ const tableProps = [
 	{
 		prop: 'num',
 		label: '数量',
+    width: 50
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+    width: 130
 	},
 	{
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
+    width: 150
 	},
 	{
 		prop: 'leftTime',
 		label: '剩余留存时长(天)',
-    width: 150
+    width: 130
 	},
 	{
 		prop: 'remark',
diff --git a/src/views/warehouse/package-material/warehouseRealtimeLocation/index.vue b/src/views/warehouse/package-material/warehouseRealtimeLocation/index.vue
index 8fd8ca3b..81db0218 100644
--- a/src/views/warehouse/package-material/warehouseRealtimeLocation/index.vue
+++ b/src/views/warehouse/package-material/warehouseRealtimeLocation/index.vue
@@ -16,7 +16,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="140"
+				:width="70"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -36,7 +36,7 @@
 			:dialogTitle="addOrEditTitle"
 			:dialogVisible="addOrUpdateVisible"
 			:before-close="handleCancel"
-			width="50%">
+			width="60%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -99,7 +99,7 @@ const tableProps = [
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
-		minWidth: 100,
+    width: 150
 	},
 	{
 		prop: 'remark',
@@ -124,18 +124,18 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`pack-material:warehouse-realtime-location:query`)
-					? {
-							type: 'out',
-							btnName: '出库',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`pack-material:warehouse-realtime-location:query`)
-					? {
-							type: 'in',
-							btnName: '入库',
-					  }
-					: undefined,
+				// this.$auth.hasPermi(`pack-material:warehouse-realtime-location:query`)
+				// 	? {
+				// 			type: 'out',
+				// 			btnName: '出库',
+				// 	  }
+				// 	: undefined,
+				// this.$auth.hasPermi(`pack-material:warehouse-realtime-location:query`)
+				// 	? {
+				// 			type: 'in',
+				// 			btnName: '入库',
+				// 	  }
+				// 	: undefined,
 				this.$auth.hasPermi(`pack-material:warehouse-realtime-location:query`)
 					? {
 							type: 'detail',
diff --git a/src/views/warehouse/part-material/warehouseGoods/index.vue b/src/views/warehouse/part-material/warehouseGoods/index.vue
index 51365cfb..0e71b1cc 100644
--- a/src/views/warehouse/part-material/warehouseGoods/index.vue
+++ b/src/views/warehouse/part-material/warehouseGoods/index.vue
@@ -62,6 +62,7 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '物品编码',
+    width: 200
 	},
 	{
 		prop: 'spec',
diff --git a/src/views/warehouse/part-material/warehouseRealtime/index.vue b/src/views/warehouse/part-material/warehouseRealtime/index.vue
index 608eaa9b..78d6e1ad 100644
--- a/src/views/warehouse/part-material/warehouseRealtime/index.vue
+++ b/src/views/warehouse/part-material/warehouseRealtime/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-11-03 16:37:06
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-24 14:35:51
+ * @LastEditTime: 2023-12-06 15:30:39
  * @Description:
 -->
 <template>
@@ -42,7 +42,7 @@
 					<span>{{ parseTime(scope.row.latestOutTime) }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="操作" width="100">
+			<el-table-column label="操作" width="100" v-if="false">
 				<template v-slot="scope">
 					<el-button
 						size="mini"
@@ -134,16 +134,16 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('part-material:warehouse-realtime:create') ? 'button' : '',
-					btnName: '入库',
-					name: 'add',
-					color: 'primary',
-					plain: true,
-				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('part-material:warehouse-realtime:create') ? 'button' : '',
+				// 	btnName: '入库',
+				// 	name: 'add',
+				// 	color: 'primary',
+				// 	plain: true,
+				// },
 			],
 		};
 	},
diff --git a/src/views/warehouse/part-material/warehouseRealtimeLocation/add-or-updata.vue b/src/views/warehouse/part-material/warehouseRealtimeLocation/add-or-updata.vue
index cd5726ef..fa9e59c8 100644
--- a/src/views/warehouse/part-material/warehouseRealtimeLocation/add-or-updata.vue
+++ b/src/views/warehouse/part-material/warehouseRealtimeLocation/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:08:31
+ * @LastEditTime: 2023-12-06 15:15:11
  * @Description:
 -->
 <template>
@@ -41,21 +41,23 @@ const tableProps = [
 	{
 		prop: 'num',
 		label: '数量',
+    width: 50
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+    width: 130
 	},
 	{
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
+    width: 150
 	},
 	{
 		prop: 'leftTime',
 		label: '剩余留存时长(天)',
-    width: 150
+    width: 130
 	},
 	{
 		prop: 'remark',
diff --git a/src/views/warehouse/part-material/warehouseRealtimeLocation/index.vue b/src/views/warehouse/part-material/warehouseRealtimeLocation/index.vue
index 140c71e4..111656a3 100644
--- a/src/views/warehouse/part-material/warehouseRealtimeLocation/index.vue
+++ b/src/views/warehouse/part-material/warehouseRealtimeLocation/index.vue
@@ -16,7 +16,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="140"
+				:width="70"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -36,7 +36,7 @@
 			:dialogTitle="addOrEditTitle"
 			:dialogVisible="addOrUpdateVisible"
 			:before-close="handleCancel"
-			width="50%">
+			width="60%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -99,7 +99,7 @@ const tableProps = [
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
-		minWidth: 100,
+    width: 150
 	},
 	{
 		prop: 'remark',
@@ -124,18 +124,18 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`part-material:warehouse-realtime-location:query`)
-					? {
-							type: 'out',
-							btnName: '出库',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`part-material:warehouse-realtime-location:query`)
-					? {
-							type: 'in',
-							btnName: '入库',
-					  }
-					: undefined,
+				// this.$auth.hasPermi(`part-material:warehouse-realtime-location:query`)
+				// 	? {
+				// 			type: 'out',
+				// 			btnName: '出库',
+				// 	  }
+				// 	: undefined,
+				// this.$auth.hasPermi(`part-material:warehouse-realtime-location:query`)
+				// 	? {
+				// 			type: 'in',
+				// 			btnName: '入库',
+				// 	  }
+				// 	: undefined,
 				this.$auth.hasPermi(`part-material:warehouse-realtime-location:query`)
 					? {
 							type: 'detail',
diff --git a/src/views/warehouse/raw-material/warehouseGoods/index.vue b/src/views/warehouse/raw-material/warehouseGoods/index.vue
index eee2ce5a..55817aa3 100644
--- a/src/views/warehouse/raw-material/warehouseGoods/index.vue
+++ b/src/views/warehouse/raw-material/warehouseGoods/index.vue
@@ -62,6 +62,7 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '物品编码',
+    width: 200
 	},
 	{
 		prop: 'spec',
diff --git a/src/views/warehouse/raw-material/warehouseRealtime/index.vue b/src/views/warehouse/raw-material/warehouseRealtime/index.vue
index 480a0304..92ddcdc3 100644
--- a/src/views/warehouse/raw-material/warehouseRealtime/index.vue
+++ b/src/views/warehouse/raw-material/warehouseRealtime/index.vue
@@ -42,7 +42,7 @@
 					<span>{{ parseTime(scope.row.latestOutTime) }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="操作" width="100">
+			<el-table-column label="操作" width="100" v-if="false">
 				<template v-slot="scope">
 					<el-button
 						size="mini"
@@ -134,16 +134,16 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('raw-material:warehouse-realtime:create') ? 'button' : '',
-					btnName: '入库',
-					name: 'add',
-					color: 'primary',
-					plain: true,
-				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('raw-material:warehouse-realtime:create') ? 'button' : '',
+				// 	btnName: '入库',
+				// 	name: 'add',
+				// 	color: 'primary',
+				// 	plain: true,
+				// },
 			],
 		};
 	},
diff --git a/src/views/warehouse/raw-material/warehouseRealtimeLocation/add-or-updata.vue b/src/views/warehouse/raw-material/warehouseRealtimeLocation/add-or-updata.vue
index a60998a8..ef6f7bdc 100644
--- a/src/views/warehouse/raw-material/warehouseRealtimeLocation/add-or-updata.vue
+++ b/src/views/warehouse/raw-material/warehouseRealtimeLocation/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 16:08:41
+ * @LastEditTime: 2023-12-06 15:14:12
  * @Description:
 -->
 <template>
@@ -41,21 +41,23 @@ const tableProps = [
 	{
 		prop: 'num',
 		label: '数量',
+    width: 50
 	},
 	{
 		prop: 'allowTime',
 		label: '允许留存时长(天)',
-    width: 150
+    width: 130
 	},
 	{
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
+    width: 150
 	},
 	{
 		prop: 'leftTime',
 		label: '剩余留存时长(天)',
-    width: 150
+    width: 130
 	},
 	{
 		prop: 'remark',
diff --git a/src/views/warehouse/raw-material/warehouseRealtimeLocation/index.vue b/src/views/warehouse/raw-material/warehouseRealtimeLocation/index.vue
index fbf68610..9706243e 100644
--- a/src/views/warehouse/raw-material/warehouseRealtimeLocation/index.vue
+++ b/src/views/warehouse/raw-material/warehouseRealtimeLocation/index.vue
@@ -16,7 +16,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="140"
+				:width="70"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -36,7 +36,7 @@
 			:dialogTitle="addOrEditTitle"
 			:dialogVisible="addOrUpdateVisible"
 			:before-close="handleCancel"
-			width="50%">
+			width="60%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -99,7 +99,7 @@ const tableProps = [
 		prop: 'inTime',
 		label: '入库时间',
 		filter: parseTime,
-		minWidth: 100,
+    width: 150
 	},
 	{
 		prop: 'remark',
@@ -124,18 +124,18 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`raw-material:warehouse-realtime-location:query`)
-					? {
-							type: 'out',
-							btnName: '出库',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`raw-material:warehouse-realtime-location:query`)
-					? {
-							type: 'in',
-							btnName: '入库',
-					  }
-					: undefined,
+				// this.$auth.hasPermi(`raw-material:warehouse-realtime-location:query`)
+				// 	? {
+				// 			type: 'out',
+				// 			btnName: '出库',
+				// 	  }
+				// 	: undefined,
+				// this.$auth.hasPermi(`raw-material:warehouse-realtime-location:query`)
+				// 	? {
+				// 			type: 'in',
+				// 			btnName: '入库',
+				// 	  }
+				// 	: undefined,
 				this.$auth.hasPermi(`raw-material:warehouse-realtime-location:query`)
 					? {
 							type: 'detail',
diff --git a/src/views/warehouse/warehouse-info/add-or-updata1.vue b/src/views/warehouse/warehouse-info/add-or-updata1.vue
index 6303ae55..88f24477 100644
--- a/src/views/warehouse/warehouse-info/add-or-updata1.vue
+++ b/src/views/warehouse/warehouse-info/add-or-updata1.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:20:31
+ * @LastEditTime: 2023-12-05 14:05:08
  * @Description:
 -->
 <template>
@@ -92,7 +92,7 @@ export default {
 				updateURL: updateWarehouse,
 				infoURL: getWarehouse,
 			},
-			nameList: ['warehouse_type', 'warehouse_good_type'],
+			nameList: ['warehouse_type', 'material_type'],
 			dataForm: {
 				id: undefined,
 				name: undefined,
diff --git a/yarn.lock b/yarn.lock
index fe09180f..031dc711 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -41,46 +41,45 @@
     "@antv/x6-geometry" "^2.0.5"
     "utility-types" "^3.10.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.13":
-  "integrity" "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w=="
-  "resolved" "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.22.13.tgz"
-  "version" "7.22.13"
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.5":
+  "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"
   dependencies:
-    "@babel/highlight" "^7.22.13"
-    "chalk" "^2.4.2"
+    "@babel/highlight" "^7.22.5"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.2":
-  "integrity" "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.23.2.tgz"
-  "version" "7.23.2"
+"@babel/compat-data@^7.22.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
+  "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"
 
 "@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.0.0-0 || ^8.0.0-0 <8.0.0", "@babel/core@^7.11.0", "@babel/core@^7.12.0", "@babel/core@^7.13.0", "@babel/core@^7.4.0 || ^8.0.0-0 <8.0.0":
-  "integrity" "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/core/-/core-7.23.2.tgz"
-  "version" "7.23.2"
+  "integrity" "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w=="
+  "resolved" "https://registry.npmmirror.com/@babel/core/-/core-7.22.9.tgz"
+  "version" "7.22.9"
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-module-transforms" "^7.23.0"
-    "@babel/helpers" "^7.23.2"
-    "@babel/parser" "^7.23.0"
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.2"
-    "@babel/types" "^7.23.0"
-    "convert-source-map" "^2.0.0"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.9"
+    "@babel/helper-module-transforms" "^7.22.9"
+    "@babel/helpers" "^7.22.6"
+    "@babel/parser" "^7.22.7"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.8"
+    "@babel/types" "^7.22.5"
+    "convert-source-map" "^1.7.0"
     "debug" "^4.1.0"
     "gensync" "^1.0.0-beta.2"
-    "json5" "^2.2.3"
+    "json5" "^2.2.2"
     "semver" "^6.3.1"
 
-"@babel/generator@^7.23.0":
-  "integrity" "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g=="
-  "resolved" "https://registry.npmmirror.com/@babel/generator/-/generator-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/generator@^7.22.7", "@babel/generator@^7.22.9":
+  "integrity" "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw=="
+  "resolved" "https://registry.npmmirror.com/@babel/generator/-/generator-7.22.9.tgz"
+  "version" "7.22.9"
   dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.22.5"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     "jsesc" "^2.5.1"
@@ -93,32 +92,32 @@
     "@babel/types" "^7.22.5"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
-  "integrity" "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz"
-  "version" "7.22.15"
+  "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"
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.9.6":
-  "integrity" "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.22.9", "@babel/helper-compilation-targets@^7.9.6":
+  "integrity" "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw=="
+  "resolved" "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz"
+  "version" "7.22.9"
   dependencies:
     "@babel/compat-data" "^7.22.9"
-    "@babel/helper-validator-option" "^7.22.15"
+    "@babel/helper-validator-option" "^7.22.5"
     "browserslist" "^4.21.9"
     "lru-cache" "^5.1.1"
     "semver" "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.11", "@babel/helper-create-class-features-plugin@^7.22.15", "@babel/helper-create-class-features-plugin@^7.22.5":
-  "integrity" "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.5", "@babel/helper-create-class-features-plugin@^7.22.6":
+  "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"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
     "@babel/helper-environment-visitor" "^7.22.5"
     "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
     "@babel/helper-optimise-call-expression" "^7.22.5"
     "@babel/helper-replace-supers" "^7.22.9"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
@@ -126,18 +125,18 @@
     "semver" "^6.3.1"
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
-  "integrity" "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz"
-  "version" "7.22.15"
+  "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"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
     "regexpu-core" "^5.3.1"
     "semver" "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.4.3":
-  "integrity" "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz"
-  "version" "0.4.3"
+"@babel/helper-define-polyfill-provider@^0.4.2":
+  "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"
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -145,18 +144,18 @@
     "lodash.debounce" "^4.0.8"
     "resolve" "^1.14.2"
 
-"@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5":
-  "integrity" "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz"
-  "version" "7.22.20"
+"@babel/helper-environment-visitor@^7.22.5":
+  "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"
 
-"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
-  "integrity" "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/helper-function-name@^7.22.5":
+  "integrity" "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ=="
+  "resolved" "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz"
+  "version" "7.22.5"
   dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
 "@babel/helper-hoist-variables@^7.22.5":
   "integrity" "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw=="
@@ -165,30 +164,30 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.22.15":
-  "integrity" "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/helper-member-expression-to-functions@^7.22.5":
+  "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"
   dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.8.3":
-  "integrity" "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.8.3":
+  "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"
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.23.0":
-  "integrity" "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9":
+  "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"
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.22.5"
 
 "@babel/helper-optimise-call-expression@^7.22.5":
   "integrity" "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw=="
@@ -202,22 +201,22 @@
   "resolved" "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz"
   "version" "7.22.5"
 
-"@babel/helper-remap-async-to-generator@^7.22.20", "@babel/helper-remap-async-to-generator@^7.22.5":
-  "integrity" "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz"
-  "version" "7.22.20"
+"@babel/helper-remap-async-to-generator@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-wrap-function" "^7.22.20"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-wrap-function" "^7.22.9"
 
-"@babel/helper-replace-supers@^7.22.20", "@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
-  "integrity" "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz"
-  "version" "7.22.20"
+"@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
+  "integrity" "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg=="
+  "resolved" "https://registry.npmmirror.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz"
+  "version" "7.22.9"
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
     "@babel/helper-optimise-call-expression" "^7.22.5"
 
 "@babel/helper-simple-access@^7.22.5":
@@ -246,41 +245,41 @@
   "resolved" "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz"
   "version" "7.22.5"
 
-"@babel/helper-validator-identifier@^7.22.20":
-  "integrity" "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"
-  "version" "7.22.20"
+"@babel/helper-validator-identifier@^7.22.5":
+  "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"
 
-"@babel/helper-validator-option@^7.22.15":
-  "integrity" "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/helper-validator-option@^7.22.5":
+  "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"
 
-"@babel/helper-wrap-function@^7.22.20":
-  "integrity" "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw=="
-  "resolved" "https://registry.npmmirror.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz"
-  "version" "7.22.20"
+"@babel/helper-wrap-function@^7.22.9":
+  "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"
   dependencies:
     "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.22.19"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helpers@^7.23.2":
-  "integrity" "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.23.2.tgz"
-  "version" "7.23.2"
+"@babel/helpers@^7.22.6":
+  "integrity" "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA=="
+  "resolved" "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.22.6.tgz"
+  "version" "7.22.6"
   dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.2"
-    "@babel/types" "^7.23.0"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/highlight@^7.22.13":
-  "integrity" "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg=="
-  "resolved" "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.22.20.tgz"
-  "version" "7.22.20"
+"@babel/highlight@^7.22.5":
+  "integrity" "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw=="
+  "resolved" "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.22.5.tgz"
+  "version" "7.22.5"
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
-    "chalk" "^2.4.2"
+    "@babel/helper-validator-identifier" "^7.22.5"
+    "chalk" "^2.0.0"
     "js-tokens" "^4.0.0"
 
 "@babel/parser@^7.18.4", "@babel/parser@^7.7.0", "@babel/parser@7.18.4":
@@ -288,31 +287,41 @@
   "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.18.4.tgz"
   "version" "7.18.4"
 
-"@babel/parser@^7.22.15":
-  "integrity" "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
-  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/parser@^7.20.15":
+  "integrity" "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
+  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
+  "version" "7.22.7"
 
-"@babel/parser@^7.23.0":
-  "integrity" "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
-  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/parser@^7.21.3":
+  "integrity" "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
+  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
+  "version" "7.22.7"
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.15":
-  "integrity" "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/parser@^7.22.5":
+  "integrity" "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
+  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
+  "version" "7.22.7"
+
+"@babel/parser@^7.22.7":
+  "integrity" "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
+  "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.7.tgz"
+  "version" "7.22.7"
+
+"@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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.15":
-  "integrity" "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.22.15"
+    "@babel/plugin-transform-optional-chaining" "^7.22.5"
 
 "@babel/plugin-proposal-class-properties@^7.8.3":
   "integrity" "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="
@@ -323,21 +332,29 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-decorators@^7.8.3":
-  "integrity" "sha512-eR0gJQc830fJVGz37oKLvt9W9uUIQSAovUl0e9sJ3YeO09dlcoBVYD3CLrjCj4qHdXmfiyTyFt8yeQYSN5fxLg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.2.tgz"
-  "version" "7.23.2"
+  "integrity" "sha512-omXqPF7Onq4Bb7wHxXjM3jSMSJvUUbvDvmmds7KI5n9Cq6Ln5I05I1W2nRlRof1rGdiUxJrxwe285WF96XlBXQ=="
+  "resolved" "https://registry.npmmirror.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.7.tgz"
+  "version" "7.22.7"
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-create-class-features-plugin" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-replace-supers" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/plugin-syntax-decorators" "^7.22.10"
+    "@babel/plugin-syntax-decorators" "^7.22.5"
 
 "@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
   "integrity" "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w=="
   "resolved" "https://registry.npmmirror.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz"
   "version" "7.21.0-placeholder-for-preset-env.2"
 
+"@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"
+  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"
@@ -359,10 +376,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.22.10":
-  "integrity" "sha512-z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.10.tgz"
-  "version" "7.22.10"
+"@babel/plugin-syntax-decorators@^7.22.5":
+  "integrity" "sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA=="
+  "resolved" "https://registry.npmmirror.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz"
+  "version" "7.22.5"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -486,14 +503,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-async-generator-functions@^7.23.2":
-  "integrity" "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz"
-  "version" "7.23.2"
+"@babel/plugin-transform-async-generator-functions@^7.22.7":
+  "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"
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-environment-visitor" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.20"
+    "@babel/helper-remap-async-to-generator" "^7.22.5"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
 "@babel/plugin-transform-async-to-generator@^7.22.5":
@@ -512,10 +529,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoping@^7.23.0":
-  "integrity" "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/plugin-transform-block-scoping@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -527,27 +544,27 @@
     "@babel/helper-create-class-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-class-static-block@^7.22.11":
-  "integrity" "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-class-static-block@^7.22.5":
+  "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"
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.11"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-transform-classes@^7.22.15":
-  "integrity" "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/plugin-transform-classes@^7.22.6":
+  "integrity" "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ=="
+  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz"
+  "version" "7.22.6"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-environment-visitor" "^7.22.5"
     "@babel/helper-function-name" "^7.22.5"
     "@babel/helper-optimise-call-expression" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.9"
+    "@babel/helper-replace-supers" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
     "globals" "^11.1.0"
 
@@ -559,14 +576,14 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/template" "^7.22.5"
 
-"@babel/plugin-transform-destructuring@^7.23.0":
-  "integrity" "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/plugin-transform-destructuring@^7.22.5":
+  "integrity" "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ=="
+  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz"
+  "version" "7.22.5"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^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"
@@ -581,10 +598,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dynamic-import@^7.22.11":
-  "integrity" "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-dynamic-import@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
@@ -597,18 +614,18 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-export-namespace-from@^7.22.11":
-  "integrity" "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-export-namespace-from@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.22.15":
-  "integrity" "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/plugin-transform-for-of@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -621,10 +638,10 @@
     "@babel/helper-function-name" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-json-strings@^7.22.11":
-  "integrity" "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-json-strings@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
@@ -636,10 +653,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-logical-assignment-operators@^7.22.11":
-  "integrity" "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-logical-assignment-operators@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
@@ -651,32 +668,32 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.23.0":
-  "integrity" "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/plugin-transform-modules-amd@^7.22.5":
+  "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"
   dependencies:
-    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-module-transforms" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.23.0":
-  "integrity" "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/plugin-transform-modules-commonjs@^7.22.5":
+  "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"
   dependencies:
-    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-module-transforms" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.23.0":
-  "integrity" "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/plugin-transform-modules-systemjs@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-module-transforms" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.22.5"
 
 "@babel/plugin-transform-modules-umd@^7.22.5":
   "integrity" "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ=="
@@ -701,32 +718,32 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11":
-  "integrity" "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-transform-numeric-separator@^7.22.11":
-  "integrity" "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-numeric-separator@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-transform-object-rest-spread@^7.22.15":
-  "integrity" "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/plugin-transform-object-rest-spread@^7.22.5":
+  "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"
   dependencies:
-    "@babel/compat-data" "^7.22.9"
-    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.22.15"
+    "@babel/plugin-transform-parameters" "^7.22.5"
 
 "@babel/plugin-transform-object-super@^7.22.5":
   "integrity" "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw=="
@@ -736,27 +753,27 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-replace-supers" "^7.22.5"
 
-"@babel/plugin-transform-optional-catch-binding@^7.22.11":
-  "integrity" "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-optional-catch-binding@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-optional-chaining@^7.22.15", "@babel/plugin-transform-optional-chaining@^7.23.0":
-  "integrity" "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/plugin-transform-optional-chaining@^7.22.5", "@babel/plugin-transform-optional-chaining@^7.22.6":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.22.15":
-  "integrity" "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/plugin-transform-parameters@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -768,13 +785,13 @@
     "@babel/helper-create-class-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-private-property-in-object@^7.22.11":
-  "integrity" "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz"
-  "version" "7.22.11"
+"@babel/plugin-transform-private-property-in-object@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.11"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
@@ -785,13 +802,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-regenerator@^7.22.10":
-  "integrity" "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz"
-  "version" "7.22.10"
+"@babel/plugin-transform-regenerator@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
-    "regenerator-transform" "^0.15.2"
+    "regenerator-transform" "^0.15.1"
 
 "@babel/plugin-transform-reserved-words@^7.22.5":
   "integrity" "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA=="
@@ -801,15 +818,15 @@
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-runtime@^7.11.0":
-  "integrity" "sha512-XOntj6icgzMS58jPVtQpiuF6ZFWxQiJavISGx5KGjRj+3gqZr8+N6Kx+N9BApWzgS+DOjIZfXXj0ZesenOWDyA=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.2.tgz"
-  "version" "7.23.2"
+  "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"
   dependencies:
-    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-module-imports" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "babel-plugin-polyfill-corejs2" "^0.4.6"
-    "babel-plugin-polyfill-corejs3" "^0.8.5"
-    "babel-plugin-polyfill-regenerator" "^0.5.3"
+    "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":
@@ -848,10 +865,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-escapes@^7.22.10":
-  "integrity" "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg=="
-  "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz"
-  "version" "7.22.10"
+"@babel/plugin-transform-unicode-escapes@^7.22.5":
+  "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"
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -880,16 +897,16 @@
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/preset-env@^7.11.0":
-  "integrity" "sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ=="
-  "resolved" "https://registry.npmmirror.com/@babel/preset-env/-/preset-env-7.23.2.tgz"
-  "version" "7.23.2"
+  "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"
   dependencies:
-    "@babel/compat-data" "^7.23.2"
-    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.9"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.15"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.15"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.15"
+    "@babel/helper-validator-option" "^7.22.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.5"
     "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
@@ -910,67 +927,69 @@
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
     "@babel/plugin-transform-arrow-functions" "^7.22.5"
-    "@babel/plugin-transform-async-generator-functions" "^7.23.2"
+    "@babel/plugin-transform-async-generator-functions" "^7.22.7"
     "@babel/plugin-transform-async-to-generator" "^7.22.5"
     "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
-    "@babel/plugin-transform-block-scoping" "^7.23.0"
+    "@babel/plugin-transform-block-scoping" "^7.22.5"
     "@babel/plugin-transform-class-properties" "^7.22.5"
-    "@babel/plugin-transform-class-static-block" "^7.22.11"
-    "@babel/plugin-transform-classes" "^7.22.15"
+    "@babel/plugin-transform-class-static-block" "^7.22.5"
+    "@babel/plugin-transform-classes" "^7.22.6"
     "@babel/plugin-transform-computed-properties" "^7.22.5"
-    "@babel/plugin-transform-destructuring" "^7.23.0"
+    "@babel/plugin-transform-destructuring" "^7.22.5"
     "@babel/plugin-transform-dotall-regex" "^7.22.5"
     "@babel/plugin-transform-duplicate-keys" "^7.22.5"
-    "@babel/plugin-transform-dynamic-import" "^7.22.11"
+    "@babel/plugin-transform-dynamic-import" "^7.22.5"
     "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
-    "@babel/plugin-transform-export-namespace-from" "^7.22.11"
-    "@babel/plugin-transform-for-of" "^7.22.15"
+    "@babel/plugin-transform-export-namespace-from" "^7.22.5"
+    "@babel/plugin-transform-for-of" "^7.22.5"
     "@babel/plugin-transform-function-name" "^7.22.5"
-    "@babel/plugin-transform-json-strings" "^7.22.11"
+    "@babel/plugin-transform-json-strings" "^7.22.5"
     "@babel/plugin-transform-literals" "^7.22.5"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.22.11"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.22.5"
     "@babel/plugin-transform-member-expression-literals" "^7.22.5"
-    "@babel/plugin-transform-modules-amd" "^7.23.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.23.0"
+    "@babel/plugin-transform-modules-amd" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
+    "@babel/plugin-transform-modules-systemjs" "^7.22.5"
     "@babel/plugin-transform-modules-umd" "^7.22.5"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
     "@babel/plugin-transform-new-target" "^7.22.5"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.11"
-    "@babel/plugin-transform-numeric-separator" "^7.22.11"
-    "@babel/plugin-transform-object-rest-spread" "^7.22.15"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.5"
+    "@babel/plugin-transform-numeric-separator" "^7.22.5"
+    "@babel/plugin-transform-object-rest-spread" "^7.22.5"
     "@babel/plugin-transform-object-super" "^7.22.5"
-    "@babel/plugin-transform-optional-catch-binding" "^7.22.11"
-    "@babel/plugin-transform-optional-chaining" "^7.23.0"
-    "@babel/plugin-transform-parameters" "^7.22.15"
+    "@babel/plugin-transform-optional-catch-binding" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.6"
+    "@babel/plugin-transform-parameters" "^7.22.5"
     "@babel/plugin-transform-private-methods" "^7.22.5"
-    "@babel/plugin-transform-private-property-in-object" "^7.22.11"
+    "@babel/plugin-transform-private-property-in-object" "^7.22.5"
     "@babel/plugin-transform-property-literals" "^7.22.5"
-    "@babel/plugin-transform-regenerator" "^7.22.10"
+    "@babel/plugin-transform-regenerator" "^7.22.5"
     "@babel/plugin-transform-reserved-words" "^7.22.5"
     "@babel/plugin-transform-shorthand-properties" "^7.22.5"
     "@babel/plugin-transform-spread" "^7.22.5"
     "@babel/plugin-transform-sticky-regex" "^7.22.5"
     "@babel/plugin-transform-template-literals" "^7.22.5"
     "@babel/plugin-transform-typeof-symbol" "^7.22.5"
-    "@babel/plugin-transform-unicode-escapes" "^7.22.10"
+    "@babel/plugin-transform-unicode-escapes" "^7.22.5"
     "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
     "@babel/plugin-transform-unicode-regex" "^7.22.5"
     "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
-    "@babel/preset-modules" "0.1.6-no-external-plugins"
-    "@babel/types" "^7.23.0"
-    "babel-plugin-polyfill-corejs2" "^0.4.6"
-    "babel-plugin-polyfill-corejs3" "^0.8.5"
-    "babel-plugin-polyfill-regenerator" "^0.5.3"
+    "@babel/preset-modules" "^0.1.5"
+    "@babel/types" "^7.22.5"
+    "babel-plugin-polyfill-corejs2" "^0.4.4"
+    "babel-plugin-polyfill-corejs3" "^0.8.2"
+    "babel-plugin-polyfill-regenerator" "^0.5.1"
     "core-js-compat" "^3.31.0"
     "semver" "^6.3.1"
 
-"@babel/preset-modules@0.1.6-no-external-plugins":
-  "integrity" "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA=="
-  "resolved" "https://registry.npmmirror.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz"
-  "version" "0.1.6-no-external-plugins"
+"@babel/preset-modules@^0.1.5":
+  "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"
   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"
 
@@ -980,44 +999,44 @@
   "version" "0.8.0"
 
 "@babel/runtime@^7.11.0", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4":
-  "integrity" "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg=="
-  "resolved" "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.23.2.tgz"
-  "version" "7.23.2"
+  "integrity" "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ=="
+  "resolved" "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.6.tgz"
+  "version" "7.22.6"
   dependencies:
-    "regenerator-runtime" "^0.14.0"
+    "regenerator-runtime" "^0.13.11"
 
-"@babel/template@^7.22.15", "@babel/template@^7.22.5":
-  "integrity" "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w=="
-  "resolved" "https://registry.npmmirror.com/@babel/template/-/template-7.22.15.tgz"
-  "version" "7.22.15"
+"@babel/template@^7.22.5":
+  "integrity" "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw=="
+  "resolved" "https://registry.npmmirror.com/@babel/template/-/template-7.22.5.tgz"
+  "version" "7.22.5"
   dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/parser" "^7.22.15"
-    "@babel/types" "^7.22.15"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/traverse@^7.22.5", "@babel/traverse@^7.23.2", "@babel/traverse@^7.7.0":
-  "integrity" "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw=="
-  "resolved" "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.23.2.tgz"
-  "version" "7.23.2"
+"@babel/traverse@^7.22.5", "@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8", "@babel/traverse@^7.7.0":
+  "integrity" "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw=="
+  "resolved" "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.22.8.tgz"
+  "version" "7.22.8"
   dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.7"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.0"
-    "@babel/types" "^7.23.0"
+    "@babel/parser" "^7.22.7"
+    "@babel/types" "^7.22.5"
     "debug" "^4.1.0"
     "globals" "^11.1.0"
 
-"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  "integrity" "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg=="
-  "resolved" "https://registry.npmmirror.com/@babel/types/-/types-7.23.0.tgz"
-  "version" "7.23.0"
+"@babel/types@^7.22.5", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  "integrity" "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA=="
+  "resolved" "https://registry.npmmirror.com/@babel/types/-/types-7.22.5.tgz"
+  "version" "7.22.5"
   dependencies:
     "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.22.5"
     "to-fast-properties" "^2.0.0"
 
 "@bpmn-io/diagram-js-ui@^0.2.2":
@@ -1109,10 +1128,10 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@^3.1.0":
-  "integrity" "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="
-  "resolved" "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz"
-  "version" "3.1.1"
+"@jridgewell/resolve-uri@3.1.0":
+  "integrity" "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
+  "resolved" "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
+  "version" "3.1.0"
 
 "@jridgewell/set-array@^1.0.1":
   "integrity" "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
@@ -1127,18 +1146,23 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
+"@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"
 
+"@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"
+
 "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  "integrity" "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q=="
-  "resolved" "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz"
-  "version" "0.3.20"
+  "integrity" "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA=="
+  "resolved" "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz"
+  "version" "0.3.18"
   dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   "integrity" "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="
@@ -1211,32 +1235,32 @@
   "version" "1.0.2"
 
 "@types/body-parser@*":
-  "integrity" "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA=="
-  "resolved" "https://registry.npmmirror.com/@types/body-parser/-/body-parser-1.19.4.tgz"
-  "version" "1.19.4"
+  "integrity" "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="
+  "resolved" "https://registry.npmmirror.com/@types/body-parser/-/body-parser-1.19.2.tgz"
+  "version" "1.19.2"
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
 
 "@types/connect-history-api-fallback@*":
-  "integrity" "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q=="
-  "resolved" "https://registry.npmmirror.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz"
-  "version" "1.5.2"
+  "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"
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/node" "*"
 
 "@types/connect@*":
-  "integrity" "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q=="
-  "resolved" "https://registry.npmmirror.com/@types/connect/-/connect-3.4.37.tgz"
-  "version" "3.4.37"
+  "integrity" "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="
+  "resolved" "https://registry.npmmirror.com/@types/connect/-/connect-3.4.35.tgz"
+  "version" "3.4.35"
   dependencies:
     "@types/node" "*"
 
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
-  "integrity" "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ=="
-  "resolved" "https://registry.npmmirror.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz"
-  "version" "4.17.39"
+  "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"
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -1244,9 +1268,9 @@
     "@types/send" "*"
 
 "@types/express@*":
-  "integrity" "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw=="
-  "resolved" "https://registry.npmmirror.com/@types/express/-/express-4.17.20.tgz"
-  "version" "4.17.20"
+  "integrity" "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="
+  "resolved" "https://registry.npmmirror.com/@types/express/-/express-4.17.17.tgz"
+  "version" "4.17.17"
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
@@ -1262,21 +1286,21 @@
     "@types/node" "*"
 
 "@types/http-errors@*":
-  "integrity" "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA=="
-  "resolved" "https://registry.npmmirror.com/@types/http-errors/-/http-errors-2.0.3.tgz"
-  "version" "2.0.3"
+  "integrity" "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ=="
+  "resolved" "https://registry.npmmirror.com/@types/http-errors/-/http-errors-2.0.1.tgz"
+  "version" "2.0.1"
 
 "@types/http-proxy@^1.17.5":
-  "integrity" "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw=="
-  "resolved" "https://registry.npmmirror.com/@types/http-proxy/-/http-proxy-1.17.13.tgz"
-  "version" "1.17.13"
+  "integrity" "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA=="
+  "resolved" "https://registry.npmmirror.com/@types/http-proxy/-/http-proxy-1.17.11.tgz"
+  "version" "1.17.11"
   dependencies:
     "@types/node" "*"
 
 "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
-  "integrity" "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw=="
-  "resolved" "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.14.tgz"
-  "version" "7.0.14"
+  "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"
 
 "@types/json5@^0.0.29":
   "integrity" "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
@@ -1284,9 +1308,9 @@
   "version" "0.0.29"
 
 "@types/mime@*", "@types/mime@^1":
-  "integrity" "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw=="
-  "resolved" "https://registry.npmmirror.com/@types/mime/-/mime-1.3.4.tgz"
-  "version" "1.3.4"
+  "integrity" "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+  "resolved" "https://registry.npmmirror.com/@types/mime/-/mime-1.3.2.tgz"
+  "version" "1.3.2"
 
 "@types/minimatch@*":
   "integrity" "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
@@ -1294,73 +1318,71 @@
   "version" "5.1.2"
 
 "@types/minimist@^1.2.0":
-  "integrity" "sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ=="
-  "resolved" "https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.4.tgz"
-  "version" "1.2.4"
+  "integrity" "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="
+  "resolved" "https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.2.tgz"
+  "version" "1.2.2"
 
 "@types/node@*":
-  "integrity" "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ=="
-  "resolved" "https://registry.npmmirror.com/@types/node/-/node-20.8.7.tgz"
-  "version" "20.8.7"
-  dependencies:
-    "undici-types" "~5.25.1"
+  "integrity" "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg=="
+  "resolved" "https://registry.npmmirror.com/@types/node/-/node-20.4.5.tgz"
+  "version" "20.4.5"
 
 "@types/normalize-package-data@^2.4.0":
-  "integrity" "sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg=="
-  "resolved" "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz"
-  "version" "2.4.3"
+  "integrity" "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="
+  "resolved" "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"
+  "version" "2.4.1"
 
 "@types/q@^1.5.1":
-  "integrity" "sha512-HBPgtzp44867rkL+IzQ3560/E/BlobwCjeXsuKqogrcE99SKgZR4tvBBCuNJZMhUFMz26M7cjKWZg785lllwpA=="
-  "resolved" "https://registry.npmmirror.com/@types/q/-/q-1.5.7.tgz"
-  "version" "1.5.7"
+  "integrity" "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
+  "resolved" "https://registry.npmmirror.com/@types/q/-/q-1.5.5.tgz"
+  "version" "1.5.5"
 
 "@types/qs@*":
-  "integrity" "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg=="
-  "resolved" "https://registry.npmmirror.com/@types/qs/-/qs-6.9.9.tgz"
-  "version" "6.9.9"
+  "integrity" "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
+  "resolved" "https://registry.npmmirror.com/@types/qs/-/qs-6.9.7.tgz"
+  "version" "6.9.7"
 
 "@types/raf@^3.4.0":
-  "integrity" "sha512-sM4HyDVlDFl4goOXPF+g9nNHJFZQGot+HgySjM4cRjqXzjdatcEvYrtG4Ia8XumR9T6k8G2tW9B7hnUj51Uf0A=="
-  "resolved" "https://registry.npmmirror.com/@types/raf/-/raf-3.4.2.tgz"
-  "version" "3.4.2"
+  "integrity" "sha512-1jJ3OO8FXHCcuVXCuO1EMC/MjDuT6/cxgsMw/UebkO9afnL99Y5QTpUjk7+flK4G5FzBVJEgDKL5eFtoxJs9MQ=="
+  "resolved" "https://registry.npmmirror.com/@types/raf/-/raf-3.4.1.tgz"
+  "version" "3.4.1"
 
 "@types/range-parser@*":
-  "integrity" "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA=="
-  "resolved" "https://registry.npmmirror.com/@types/range-parser/-/range-parser-1.2.6.tgz"
-  "version" "1.2.6"
+  "integrity" "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
+  "resolved" "https://registry.npmmirror.com/@types/range-parser/-/range-parser-1.2.4.tgz"
+  "version" "1.2.4"
 
 "@types/send@*":
-  "integrity" "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug=="
-  "resolved" "https://registry.npmmirror.com/@types/send/-/send-0.17.3.tgz"
-  "version" "0.17.3"
+  "integrity" "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q=="
+  "resolved" "https://registry.npmmirror.com/@types/send/-/send-0.17.1.tgz"
+  "version" "0.17.1"
   dependencies:
     "@types/mime" "^1"
     "@types/node" "*"
 
 "@types/serve-static@*":
-  "integrity" "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw=="
-  "resolved" "https://registry.npmmirror.com/@types/serve-static/-/serve-static-1.15.4.tgz"
-  "version" "1.15.4"
+  "integrity" "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw=="
+  "resolved" "https://registry.npmmirror.com/@types/serve-static/-/serve-static-1.15.2.tgz"
+  "version" "1.15.2"
   dependencies:
     "@types/http-errors" "*"
     "@types/mime" "*"
     "@types/node" "*"
 
 "@types/source-list-map@*":
-  "integrity" "sha512-Kdfm7Sk5VX8dFW7Vbp18+fmAatBewzBILa1raHYxrGEFXT0jNl9x3LWfuW7bTbjEKFNey9Dfkj/UzT6z/NvRlg=="
-  "resolved" "https://registry.npmmirror.com/@types/source-list-map/-/source-list-map-0.1.4.tgz"
-  "version" "0.1.4"
+  "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"
 
 "@types/tapable@^1":
-  "integrity" "sha512-q8F20SdXG5fdVJQ5yxsVlH+f+oekP42QeHv4s5KlrxTMT0eopXn7ol1rhxMcksf8ph7XNv811iVDE2hOpUvEPg=="
-  "resolved" "https://registry.npmmirror.com/@types/tapable/-/tapable-1.0.10.tgz"
-  "version" "1.0.10"
+  "integrity" "sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ=="
+  "resolved" "https://registry.npmmirror.com/@types/tapable/-/tapable-1.0.8.tgz"
+  "version" "1.0.8"
 
 "@types/uglify-js@*":
-  "integrity" "sha512-ToldSfJ6wxO21cakcz63oFD1GjqQbKzhZCD57eH7zWuYT5UEZvfUoqvrjX5d+jB9g4a/sFO0n6QSVzzn5sMsjg=="
-  "resolved" "https://registry.npmmirror.com/@types/uglify-js/-/uglify-js-3.17.3.tgz"
-  "version" "3.17.3"
+  "integrity" "sha512-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g=="
+  "resolved" "https://registry.npmmirror.com/@types/uglify-js/-/uglify-js-3.17.1.tgz"
+  "version" "3.17.1"
   dependencies:
     "source-map" "^0.6.1"
 
@@ -1376,18 +1398,18 @@
     "http-proxy-middleware" "^1.0.0"
 
 "@types/webpack-sources@*":
-  "integrity" "sha512-acCzhuVe+UJy8abiSFQWXELhhNMZjQjQKpLNEi1pKGgKXZj0ul614ATcx4kkhunPost6Xw+aCq8y8cn1/WwAiA=="
-  "resolved" "https://registry.npmmirror.com/@types/webpack-sources/-/webpack-sources-3.2.2.tgz"
-  "version" "3.2.2"
+  "integrity" "sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg=="
+  "resolved" "https://registry.npmmirror.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz"
+  "version" "3.2.0"
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
     "source-map" "^0.7.3"
 
 "@types/webpack@^4", "@types/webpack@^4.0.0":
-  "integrity" "sha512-XRC6HLGHtNfN8/xWeu1YUQV1GSE+28q8lSqvcJ+0xt/zW9Wmn4j9pCSvaXPyRlCKrl5OuqECQNEJUy2vo8oWqg=="
-  "resolved" "https://registry.npmmirror.com/@types/webpack/-/webpack-4.41.35.tgz"
-  "version" "4.41.35"
+  "integrity" "sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g=="
+  "resolved" "https://registry.npmmirror.com/@types/webpack/-/webpack-4.41.33.tgz"
+  "version" "4.41.33"
   dependencies:
     "@types/node" "*"
     "@types/tapable" "^1"
@@ -1410,17 +1432,17 @@
     "mux.js" "6.0.1"
     "video.js" "^6 || ^7"
 
-"@videojs/http-streaming@3.6.0":
-  "integrity" "sha512-dK98DFM7D3j8BIGVk6Htaw5A32ciPLDiKyMlcQaxVbxDzH7DtLpkldIRlf92No8lbh0u6VS0EF9q2vv0nDwkOg=="
-  "resolved" "https://registry.npmmirror.com/@videojs/http-streaming/-/http-streaming-3.6.0.tgz"
-  "version" "3.6.0"
+"@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"
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@videojs/vhs-utils" "4.0.0"
     "aes-decrypter" "4.0.1"
     "global" "^4.4.0"
     "m3u8-parser" "^7.1.0"
-    "mpd-parser" "^1.2.2"
+    "mpd-parser" "^1.1.1"
     "mux.js" "7.0.0"
     "video.js" "^7 || ^8"
 
@@ -1696,38 +1718,38 @@
     "semver" "^6.1.0"
     "strip-ansi" "^6.0.0"
 
-"@vue/compiler-core@3.3.6":
-  "integrity" "sha512-2JNjemwaNwf+MkkatATVZi7oAH1Hx0B04DdPH3ZoZ8vKC1xZVP7nl4HIsk8XYd3r+/52sqqoz9TWzYc3yE9dqA=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.3.6.tgz"
-  "version" "3.3.6"
+"@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"
   dependencies:
-    "@babel/parser" "^7.23.0"
-    "@vue/shared" "3.3.6"
+    "@babel/parser" "^7.21.3"
+    "@vue/shared" "3.3.4"
     "estree-walker" "^2.0.2"
     "source-map-js" "^1.0.2"
 
-"@vue/compiler-dom@3.3.6":
-  "integrity" "sha512-1MxXcJYMHiTPexjLAJUkNs/Tw2eDf2tY3a0rL+LfuWyiKN2s6jvSwywH3PWD8bKICjfebX3GWx2Os8jkRDq3Ng=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.3.6.tgz"
-  "version" "3.3.6"
+"@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"
   dependencies:
-    "@vue/compiler-core" "3.3.6"
-    "@vue/shared" "3.3.6"
+    "@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-/Kms6du2h1VrXFreuZmlvQej8B1zenBqIohP0690IUBkJjsFvJxY0crcvVRJ0UhMgSR9dewB+khdR1DfbpArJA=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.3.6.tgz"
-  "version" "3.3.6"
+  "integrity" "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ=="
+  "resolved" "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz"
+  "version" "3.3.4"
   dependencies:
-    "@babel/parser" "^7.23.0"
-    "@vue/compiler-core" "3.3.6"
-    "@vue/compiler-dom" "3.3.6"
-    "@vue/compiler-ssr" "3.3.6"
-    "@vue/reactivity-transform" "3.3.6"
-    "@vue/shared" "3.3.6"
+    "@babel/parser" "^7.20.15"
+    "@vue/compiler-core" "3.3.4"
+    "@vue/compiler-dom" "3.3.4"
+    "@vue/compiler-ssr" "3.3.4"
+    "@vue/reactivity-transform" "3.3.4"
+    "@vue/shared" "3.3.4"
     "estree-walker" "^2.0.2"
-    "magic-string" "^0.30.5"
-    "postcss" "^8.4.31"
+    "magic-string" "^0.30.0"
+    "postcss" "^8.1.10"
     "source-map-js" "^1.0.2"
 
 "@vue/compiler-sfc@2.7.14":
@@ -1739,13 +1761,13 @@
     "postcss" "^8.4.14"
     "source-map" "^0.6.1"
 
-"@vue/compiler-ssr@3.3.6":
-  "integrity" "sha512-QTIHAfDCHhjXlYGkUg5KH7YwYtdUM1vcFl/FxFDlD6d0nXAmnjizka3HITp8DGudzHndv2PjKVS44vqqy0vP4w=="
-  "resolved" "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.3.6.tgz"
-  "version" "3.3.6"
+"@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"
   dependencies:
-    "@vue/compiler-dom" "3.3.6"
-    "@vue/shared" "3.3.6"
+    "@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=="
@@ -1775,21 +1797,21 @@
   "resolved" "https://registry.npmmirror.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz"
   "version" "1.1.2"
 
-"@vue/reactivity-transform@3.3.6":
-  "integrity" "sha512-RlJl4dHfeO7EuzU1iJOsrlqWyJfHTkJbvYz/IOJWqu8dlCNWtxWX377WI0VsbAgBizjwD+3ZjdnvSyyFW1YVng=="
-  "resolved" "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.3.6.tgz"
-  "version" "3.3.6"
+"@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"
   dependencies:
-    "@babel/parser" "^7.23.0"
-    "@vue/compiler-core" "3.3.6"
-    "@vue/shared" "3.3.6"
+    "@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.5"
+    "magic-string" "^0.30.0"
 
-"@vue/shared@3.3.6":
-  "integrity" "sha512-Xno5pEqg8SVhomD0kTSmfh30ZEmV/+jZtyh39q6QflrjdJCXah5lrnOLi9KB6a5k5aAHXMXjoMnxlzUkCNfWLQ=="
-  "resolved" "https://registry.npmmirror.com/@vue/shared/-/shared-3.3.6.tgz"
-  "version" "3.3.6"
+"@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"
 
 "@vue/web-component-wrapper@^1.2.0":
   "integrity" "sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="
@@ -2014,7 +2036,7 @@
   "resolved" "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz"
   "version" "1.3.1"
 
-"aes-decrypter@^4.0.1", "aes-decrypter@4.0.1":
+"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"
@@ -2041,6 +2063,16 @@
     "global" "^4.4.0"
     "pkcs7" "^1.0.4"
 
+"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"
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.5"
+    "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"
@@ -2214,14 +2246,14 @@
   "version" "1.1.1"
 
 "array-includes@^3.1.6":
-  "integrity" "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ=="
-  "resolved" "https://registry.npmmirror.com/array-includes/-/array-includes-3.1.7.tgz"
-  "version" "3.1.7"
+  "integrity" "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw=="
+  "resolved" "https://registry.npmmirror.com/array-includes/-/array-includes-3.1.6.tgz"
+  "version" "3.1.6"
   dependencies:
     "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "get-intrinsic" "^1.2.1"
+    "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":
@@ -2241,57 +2273,45 @@
   "resolved" "https://registry.npmmirror.com/array-unique/-/array-unique-0.3.2.tgz"
   "version" "0.3.2"
 
-"array.prototype.findlastindex@^1.2.2":
-  "integrity" "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA=="
-  "resolved" "https://registry.npmmirror.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz"
-  "version" "1.2.3"
-  dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "es-shim-unscopables" "^1.0.0"
-    "get-intrinsic" "^1.2.1"
-
 "array.prototype.flat@^1.3.1":
-  "integrity" "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA=="
-  "resolved" "https://registry.npmmirror.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz"
-  "version" "1.3.2"
+  "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"
   dependencies:
     "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    "define-properties" "^1.1.4"
+    "es-abstract" "^1.20.4"
     "es-shim-unscopables" "^1.0.0"
 
 "array.prototype.flatmap@^1.3.1":
-  "integrity" "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ=="
-  "resolved" "https://registry.npmmirror.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz"
-  "version" "1.3.2"
+  "integrity" "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ=="
+  "resolved" "https://registry.npmmirror.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz"
+  "version" "1.3.1"
   dependencies:
     "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    "define-properties" "^1.1.4"
+    "es-abstract" "^1.20.4"
     "es-shim-unscopables" "^1.0.0"
 
-"array.prototype.reduce@^1.0.6":
-  "integrity" "sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg=="
-  "resolved" "https://registry.npmmirror.com/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz"
-  "version" "1.0.6"
+"array.prototype.reduce@^1.0.5":
+  "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"
   dependencies:
     "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    "define-properties" "^1.1.4"
+    "es-abstract" "^1.20.4"
     "es-array-method-boxes-properly" "^1.0.0"
     "is-string" "^1.0.7"
 
-"arraybuffer.prototype.slice@^1.0.2":
-  "integrity" "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw=="
-  "resolved" "https://registry.npmmirror.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz"
-  "version" "1.0.2"
+"arraybuffer.prototype.slice@^1.0.1":
+  "integrity" "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw=="
+  "resolved" "https://registry.npmmirror.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
     "array-buffer-byte-length" "^1.0.0"
     "call-bind" "^1.0.2"
     "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
     "get-intrinsic" "^1.2.1"
     "is-array-buffer" "^3.0.2"
     "is-shared-array-buffer" "^1.0.2"
@@ -2319,12 +2339,12 @@
   "version" "1.0.0"
 
 "assert@^1.1.1":
-  "integrity" "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A=="
-  "resolved" "https://registry.npmmirror.com/assert/-/assert-1.5.1.tgz"
-  "version" "1.5.1"
+  "integrity" "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="
+  "resolved" "https://registry.npmmirror.com/assert/-/assert-1.5.0.tgz"
+  "version" "1.5.0"
   dependencies:
-    "object.assign" "^4.1.4"
-    "util" "^0.10.4"
+    "object-assign" "^4.1.1"
+    "util" "0.10.3"
 
 "assign-symbols@^1.0.0":
   "integrity" "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw=="
@@ -2445,29 +2465,29 @@
   dependencies:
     "object.assign" "^4.1.0"
 
-"babel-plugin-polyfill-corejs2@^0.4.6":
-  "integrity" "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q=="
-  "resolved" "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz"
-  "version" "0.4.6"
+"babel-plugin-polyfill-corejs2@^0.4.4":
+  "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"
   dependencies:
     "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.4.3"
+    "@babel/helper-define-polyfill-provider" "^0.4.2"
     "semver" "^6.3.1"
 
-"babel-plugin-polyfill-corejs3@^0.8.5":
-  "integrity" "sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA=="
-  "resolved" "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz"
-  "version" "0.8.5"
+"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"
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.3"
-    "core-js-compat" "^3.32.2"
+    "@babel/helper-define-polyfill-provider" "^0.4.2"
+    "core-js-compat" "^3.31.0"
 
-"babel-plugin-polyfill-regenerator@^0.5.3":
-  "integrity" "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw=="
-  "resolved" "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz"
-  "version" "0.5.3"
+"babel-plugin-polyfill-regenerator@^0.5.1":
+  "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"
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.3"
+    "@babel/helper-define-polyfill-provider" "^0.4.2"
 
 "babel-runtime@^6.9.2", "babel-runtime@6.x":
   "integrity" "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g=="
@@ -2772,15 +2792,15 @@
   dependencies:
     "pako" "~1.0.5"
 
-"browserslist@^4.0.0", "browserslist@^4.12.0", "browserslist@^4.21.9", "browserslist@^4.22.1", "browserslist@>= 4.21.0":
-  "integrity" "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ=="
-  "resolved" "https://registry.npmmirror.com/browserslist/-/browserslist-4.22.1.tgz"
-  "version" "4.22.1"
+"browserslist@^4.0.0", "browserslist@^4.12.0", "browserslist@^4.21.9", "browserslist@>= 4.21.0":
+  "integrity" "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg=="
+  "resolved" "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.9.tgz"
+  "version" "4.21.9"
   dependencies:
-    "caniuse-lite" "^1.0.30001541"
-    "electron-to-chromium" "^1.4.535"
-    "node-releases" "^2.0.13"
-    "update-browserslist-db" "^1.0.13"
+    "caniuse-lite" "^1.0.30001503"
+    "electron-to-chromium" "^1.4.431"
+    "node-releases" "^2.0.12"
+    "update-browserslist-db" "^1.0.11"
 
 "btoa@^1.2.1":
   "integrity" "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
@@ -2903,14 +2923,13 @@
     "neo-async" "^2.6.1"
     "schema-utils" "^2.0.0"
 
-"call-bind@^1.0.0", "call-bind@^1.0.2", "call-bind@^1.0.4":
-  "integrity" "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ=="
-  "resolved" "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.5.tgz"
-  "version" "1.0.5"
+"call-bind@^1.0.0", "call-bind@^1.0.2":
+  "integrity" "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="
+  "resolved" "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz"
+  "version" "1.0.2"
   dependencies:
-    "function-bind" "^1.1.2"
-    "get-intrinsic" "^1.2.1"
-    "set-function-length" "^1.1.1"
+    "function-bind" "^1.1.1"
+    "get-intrinsic" "^1.0.2"
 
 "call-me-maybe@^1.0.1":
   "integrity" "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ=="
@@ -2974,10 +2993,10 @@
     "lodash.memoize" "^4.1.2"
     "lodash.uniq" "^4.5.0"
 
-"caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001109", "caniuse-lite@^1.0.30001541":
-  "integrity" "sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg=="
-  "resolved" "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz"
-  "version" "1.0.30001551"
+"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"
 
 "canvg@^3.0.10", "canvg@^3.0.6":
   "integrity" "sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q=="
@@ -3022,6 +3041,15 @@
     "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"
+  dependencies:
+    "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"
@@ -3204,9 +3232,9 @@
     "yargs" "^16.0.0"
 
 "cli-spinners@^2.0.0":
-  "integrity" "sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ=="
-  "resolved" "https://registry.npmmirror.com/cli-spinners/-/cli-spinners-2.9.1.tgz"
-  "version" "2.9.1"
+  "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-truncate@^2.1.0":
   "integrity" "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="
@@ -3551,10 +3579,10 @@
   "resolved" "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz"
   "version" "1.0.5"
 
-"convert-source-map@^2.0.0":
-  "integrity" "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
-  "resolved" "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz"
-  "version" "2.0.0"
+"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"
 
 "cookie-signature@1.0.6":
   "integrity" "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
@@ -3601,12 +3629,12 @@
     "serialize-javascript" "^4.0.0"
     "webpack-log" "^2.0.0"
 
-"core-js-compat@^3.31.0", "core-js-compat@^3.32.2", "core-js-compat@^3.6.5":
-  "integrity" "sha512-6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ=="
-  "resolved" "https://registry.npmmirror.com/core-js-compat/-/core-js-compat-3.33.1.tgz"
-  "version" "3.33.1"
+"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"
   dependencies:
-    "browserslist" "^4.22.1"
+    "browserslist" "^4.21.9"
 
 "core-js@^2.4.0":
   "integrity" "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
@@ -3614,9 +3642,9 @@
   "version" "2.6.12"
 
 "core-js@^3.26.0", "core-js@^3.6.0", "core-js@^3.6.5", "core-js@^3.8.3":
-  "integrity" "sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q=="
-  "resolved" "https://registry.npmmirror.com/core-js/-/core-js-3.33.1.tgz"
-  "version" "3.33.1"
+  "integrity" "sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ=="
+  "resolved" "https://registry.npmmirror.com/core-js/-/core-js-3.31.1.tgz"
+  "version" "3.31.1"
 
 "core-util-is@~1.0.0", "core-util-is@1.0.2":
   "integrity" "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
@@ -3678,18 +3706,7 @@
     "shebang-command" "^1.2.0"
     "which" "^1.2.9"
 
-"cross-spawn@^6.0.0":
-  "integrity" "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="
-  "resolved" "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-6.0.5.tgz"
-  "version" "6.0.5"
-  dependencies:
-    "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@^6.0.5":
+"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"
@@ -4032,21 +4049,11 @@
   dependencies:
     "clone" "^1.0.2"
 
-"define-data-property@^1.0.1", "define-data-property@^1.1.1":
-  "integrity" "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ=="
-  "resolved" "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.1.tgz"
-  "version" "1.1.1"
-  dependencies:
-    "get-intrinsic" "^1.2.1"
-    "gopd" "^1.0.1"
-    "has-property-descriptors" "^1.0.0"
-
 "define-properties@^1.1.2", "define-properties@^1.1.3", "define-properties@^1.1.4", "define-properties@^1.2.0":
-  "integrity" "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg=="
-  "resolved" "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.1.tgz"
-  "version" "1.2.1"
+  "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"
   dependencies:
-    "define-data-property" "^1.0.1"
     "has-property-descriptors" "^1.0.0"
     "object-keys" "^1.1.1"
 
@@ -4132,9 +4139,9 @@
     "min-dom" "^3.1.3"
 
 "diagram-js@*", "diagram-js@^12.3.0":
-  "integrity" "sha512-jrX+NFUPVcCdrUD11Fo1frwWHF9FWys4r/lhi8M4CBuQ8eSePkOq5osFhc6tUoXZawS3sjhbNvd2AYAZZBUjnQ=="
-  "resolved" "https://registry.npmmirror.com/diagram-js/-/diagram-js-12.5.0.tgz"
-  "version" "12.5.0"
+  "integrity" "sha512-13FdUkX+HsAnOmfiFtmdPUB3qImsy3ulwLWJ4qZCCY3p4GyTTWSDfsFnowr34CDtBIfpo4HVF9HGIRh9z/a6+A=="
+  "resolved" "https://registry.npmmirror.com/diagram-js/-/diagram-js-12.4.0.tgz"
+  "version" "12.4.0"
   dependencies:
     "@bpmn-io/diagram-js-ui" "^0.2.2"
     "clsx" "^2.0.0"
@@ -4404,10 +4411,10 @@
   "resolved" "https://registry.npmmirror.com/ejs/-/ejs-2.7.4.tgz"
   "version" "2.7.4"
 
-"electron-to-chromium@^1.4.535":
-  "integrity" "sha512-dg5gj5qOgfZNkPNeyKBZQAQitIQ/xwfIDmEQJHCbXaD9ebTZxwJXUsDYcBlAvZGZLi+/354l35J1wkmP6CqYaw=="
-  "resolved" "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.563.tgz"
-  "version" "1.4.563"
+"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"
 
 "element-ui@2.15.12":
   "integrity" "sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg=="
@@ -4527,18 +4534,18 @@
   dependencies:
     "stackframe" "^1.3.4"
 
-"es-abstract@^1.17.2", "es-abstract@^1.22.1":
-  "integrity" "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA=="
-  "resolved" "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.22.2.tgz"
-  "version" "1.22.2"
+"es-abstract@^1.17.2", "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"
   dependencies:
     "array-buffer-byte-length" "^1.0.0"
-    "arraybuffer.prototype.slice" "^1.0.2"
+    "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.6"
+    "function.prototype.name" "^1.1.5"
     "get-intrinsic" "^1.2.1"
     "get-symbol-description" "^1.0.0"
     "globalthis" "^1.0.3"
@@ -4554,23 +4561,23 @@
     "is-regex" "^1.1.4"
     "is-shared-array-buffer" "^1.0.2"
     "is-string" "^1.0.7"
-    "is-typed-array" "^1.1.12"
+    "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.1"
-    "safe-array-concat" "^1.0.1"
+    "regexp.prototype.flags" "^1.5.0"
+    "safe-array-concat" "^1.0.0"
     "safe-regex-test" "^1.0.0"
-    "string.prototype.trim" "^1.2.8"
-    "string.prototype.trimend" "^1.0.7"
-    "string.prototype.trimstart" "^1.0.7"
+    "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.11"
+    "which-typed-array" "^1.1.10"
 
 "es-array-method-boxes-properly@^1.0.0":
   "integrity" "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
@@ -4639,13 +4646,13 @@
     "get-stdin" "^6.0.0"
 
 "eslint-import-resolver-node@^0.3.7":
-  "integrity" "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g=="
-  "resolved" "https://registry.npmmirror.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz"
-  "version" "0.3.9"
+  "integrity" "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA=="
+  "resolved" "https://registry.npmmirror.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz"
+  "version" "0.3.7"
   dependencies:
     "debug" "^3.2.7"
-    "is-core-module" "^2.13.0"
-    "resolve" "^1.22.4"
+    "is-core-module" "^2.11.0"
+    "resolve" "^1.22.1"
 
 "eslint-loader@^2.2.1":
   "integrity" "sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg=="
@@ -4658,7 +4665,7 @@
     "object-hash" "^1.1.4"
     "rimraf" "^2.6.1"
 
-"eslint-module-utils@^2.8.0":
+"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"
@@ -4666,27 +4673,25 @@
     "debug" "^3.2.7"
 
 "eslint-plugin-import@^2.22.1", "eslint-plugin-import@^2.26.0":
-  "integrity" "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A=="
-  "resolved" "https://registry.npmmirror.com/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz"
-  "version" "2.28.1"
+  "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"
   dependencies:
     "array-includes" "^3.1.6"
-    "array.prototype.findlastindex" "^1.2.2"
     "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.8.0"
+    "eslint-module-utils" "^2.7.4"
     "has" "^1.0.3"
-    "is-core-module" "^2.13.0"
+    "is-core-module" "^2.11.0"
     "is-glob" "^4.0.3"
     "minimatch" "^3.1.2"
-    "object.fromentries" "^2.0.6"
-    "object.groupby" "^1.0.0"
     "object.values" "^1.1.6"
-    "semver" "^6.3.1"
-    "tsconfig-paths" "^3.14.2"
+    "resolve" "^1.22.1"
+    "semver" "^6.3.0"
+    "tsconfig-paths" "^3.14.1"
 
 "eslint-plugin-prettier@^3.1.0":
   "integrity" "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g=="
@@ -4725,9 +4730,9 @@
     "estraverse" "^4.1.1"
 
 "eslint-scope@^7.1.1":
-  "integrity" "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg=="
-  "resolved" "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.2.2.tgz"
-  "version" "7.2.2"
+  "integrity" "sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA=="
+  "resolved" "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.2.1.tgz"
+  "version" "7.2.1"
   dependencies:
     "esrecurse" "^4.3.0"
     "estraverse" "^5.2.0"
@@ -4757,9 +4762,9 @@
   "version" "2.1.0"
 
 "eslint-visitor-keys@^3.3.0", "eslint-visitor-keys@^3.4.1":
-  "integrity" "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="
-  "resolved" "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz"
-  "version" "3.4.3"
+  "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@^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=="
@@ -5135,6 +5140,11 @@
   "resolved" "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz"
   "version" "2.0.5"
 
+"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"
+
 "filesize@^3.6.1":
   "integrity" "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="
   "resolved" "https://registry.npmmirror.com/filesize/-/filesize-3.6.1.tgz"
@@ -5256,9 +5266,9 @@
     "readable-stream" "^2.3.6"
 
 "follow-redirects@^1.0.0", "follow-redirects@^1.14.9":
-  "integrity" "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q=="
-  "resolved" "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.3.tgz"
-  "version" "1.15.3"
+  "integrity" "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
+  "resolved" "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz"
+  "version" "1.15.2"
 
 "for-each@^0.3.3":
   "integrity" "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="
@@ -5365,27 +5375,27 @@
   "resolved" "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
   "version" "1.0.0"
 
-"function-bind@^1.1.1", "function-bind@^1.1.2":
-  "integrity" "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-  "resolved" "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz"
-  "version" "1.1.2"
+"function-bind@^1.1.1":
+  "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+  "resolved" "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz"
+  "version" "1.1.1"
 
-"function.prototype.name@^1.1.6":
-  "integrity" "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg=="
-  "resolved" "https://registry.npmmirror.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz"
-  "version" "1.1.6"
+"function.prototype.name@^1.1.5":
+  "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"
   dependencies:
     "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "functions-have-names" "^1.2.3"
+    "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"
 
-"functions-have-names@^1.2.3":
+"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"
@@ -5506,7 +5516,15 @@
   "resolved" "https://registry.npmmirror.com/global-object/-/global-object-1.0.0.tgz"
   "version" "1.0.0"
 
-"global@^4.3.0", "global@^4.3.1", "global@^4.4.0", "global@~4.4.0", "global@4.4.0":
+"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"
+  dependencies:
+    "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"
@@ -5522,14 +5540,6 @@
     "min-document" "^2.19.0"
     "process" "~0.5.1"
 
-"global@4.3.2":
-  "integrity" "sha512-/4AybdwIDU4HkCUbJkZdWpe4P6vuw/CUtu+0I1YlLIPe7OlUO7KNJ+q/rO70CW2/NW6Jc6I62++Hzsf5Alu6rQ=="
-  "resolved" "https://registry.npmmirror.com/global/-/global-4.3.2.tgz"
-  "version" "4.3.2"
-  dependencies:
-    "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"
@@ -5724,9 +5734,11 @@
     "kind-of" "^4.0.0"
 
 "has@^1.0.0", "has@^1.0.3":
-  "integrity" "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ=="
-  "resolved" "https://registry.npmmirror.com/has/-/has-1.0.4.tgz"
-  "version" "1.0.4"
+  "integrity" "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="
+  "resolved" "https://registry.npmmirror.com/has/-/has-1.0.3.tgz"
+  "version" "1.0.3"
+  dependencies:
+    "function-bind" "^1.1.1"
 
 "hash-base@^3.0.0":
   "integrity" "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="
@@ -6105,6 +6117,11 @@
   "resolved" "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz"
   "version" "2.0.4"
 
+"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.3":
   "integrity" "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
   "resolved" "https://registry.npmmirror.com/inherits/-/inherits-2.0.3.tgz"
@@ -6275,10 +6292,10 @@
     "rgb-regex" "^1.0.1"
     "rgba-regex" "^1.0.0"
 
-"is-core-module@^2.13.0":
-  "integrity" "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ=="
-  "resolved" "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.13.0.tgz"
-  "version" "2.13.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"
   dependencies:
     "has" "^1.0.3"
 
@@ -6510,7 +6527,7 @@
   dependencies:
     "has-symbols" "^1.0.2"
 
-"is-typed-array@^1.1.10", "is-typed-array@^1.1.12", "is-typed-array@^1.1.9":
+"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"
@@ -6717,7 +6734,7 @@
   dependencies:
     "minimist" "^1.2.0"
 
-"json5@^2.1.2", "json5@^2.2.3":
+"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"
@@ -6813,19 +6830,19 @@
   "version" "2.0.6"
 
 "launch-editor-middleware@^2.2.1":
-  "integrity" "sha512-Fg/xYhf7ARmRp40n18wIfJyuAMEjXo67Yull7uF7d0OJ3qA4EYJISt1XfPPn69IIJ5jKgQwzcg6DqHYo95LL/g=="
-  "resolved" "https://registry.npmmirror.com/launch-editor-middleware/-/launch-editor-middleware-2.6.1.tgz"
-  "version" "2.6.1"
+  "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"
   dependencies:
-    "launch-editor" "^2.6.1"
+    "launch-editor" "^2.6.0"
 
-"launch-editor@^2.2.1", "launch-editor@^2.6.1":
-  "integrity" "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw=="
-  "resolved" "https://registry.npmmirror.com/launch-editor/-/launch-editor-2.6.1.tgz"
-  "version" "2.6.1"
+"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"
   dependencies:
     "picocolors" "^1.0.0"
-    "shell-quote" "^1.8.1"
+    "shell-quote" "^1.7.3"
 
 "levn@^0.3.0", "levn@~0.3.0":
   "integrity" "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="
@@ -7089,10 +7106,10 @@
     "@videojs/vhs-utils" "^3.0.5"
     "global" "^4.4.0"
 
-"magic-string@^0.30.5":
-  "integrity" "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA=="
-  "resolved" "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.5.tgz"
-  "version" "0.30.5"
+"magic-string@^0.30.0":
+  "integrity" "sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA=="
+  "resolved" "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.1.tgz"
+  "version" "0.30.1"
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
@@ -7575,7 +7592,7 @@
     "@xmldom/xmldom" "^0.8.3"
     "global" "^4.4.0"
 
-"mpd-parser@^1.0.1", "mpd-parser@^1.2.2":
+"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"
@@ -7739,7 +7756,7 @@
     "util" "^0.11.0"
     "vm-browserify" "^1.0.1"
 
-"node-releases@^2.0.13":
+"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"
@@ -7773,12 +7790,7 @@
   dependencies:
     "remove-trailing-separator" "^1.0.1"
 
-"normalize-path@^3.0.0":
-  "integrity" "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
-  "resolved" "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz"
-  "version" "3.0.0"
-
-"normalize-path@~3.0.0":
+"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"
@@ -7883,9 +7895,9 @@
   "version" "1.3.1"
 
 "object-inspect@^1.12.2", "object-inspect@^1.12.3", "object-inspect@^1.9.0":
-  "integrity" "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
-  "resolved" "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.1.tgz"
-  "version" "1.13.1"
+  "integrity" "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
+  "resolved" "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz"
+  "version" "1.12.3"
 
 "object-is@^1.0.1":
   "integrity" "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="
@@ -7923,44 +7935,25 @@
     "object-keys" "^1.1.1"
 
 "object.entries@^1.1.2":
-  "integrity" "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA=="
-  "resolved" "https://registry.npmmirror.com/object.entries/-/object.entries-1.1.7.tgz"
-  "version" "1.1.7"
+  "integrity" "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w=="
+  "resolved" "https://registry.npmmirror.com/object.entries/-/object.entries-1.1.6.tgz"
+  "version" "1.1.6"
   dependencies:
     "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-
-"object.fromentries@^2.0.6":
-  "integrity" "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA=="
-  "resolved" "https://registry.npmmirror.com/object.fromentries/-/object.fromentries-2.0.7.tgz"
-  "version" "2.0.7"
-  dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    "define-properties" "^1.1.4"
+    "es-abstract" "^1.20.4"
 
 "object.getownpropertydescriptors@^2.0.3", "object.getownpropertydescriptors@^2.1.0":
-  "integrity" "sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g=="
-  "resolved" "https://registry.npmmirror.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz"
-  "version" "2.1.7"
+  "integrity" "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ=="
+  "resolved" "https://registry.npmmirror.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz"
+  "version" "2.1.6"
   dependencies:
-    "array.prototype.reduce" "^1.0.6"
+    "array.prototype.reduce" "^1.0.5"
     "call-bind" "^1.0.2"
     "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    "es-abstract" "^1.21.2"
     "safe-array-concat" "^1.0.0"
 
-"object.groupby@^1.0.0":
-  "integrity" "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ=="
-  "resolved" "https://registry.npmmirror.com/object.groupby/-/object.groupby-1.0.1.tgz"
-  "version" "1.0.1"
-  dependencies:
-    "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
-    "get-intrinsic" "^1.2.1"
-
 "object.pick@^1.3.0":
   "integrity" "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="
   "resolved" "https://registry.npmmirror.com/object.pick/-/object.pick-1.3.0.tgz"
@@ -7969,13 +7962,13 @@
     "isobject" "^3.0.1"
 
 "object.values@^1.1.0", "object.values@^1.1.6":
-  "integrity" "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng=="
-  "resolved" "https://registry.npmmirror.com/object.values/-/object.values-1.1.7.tgz"
-  "version" "1.1.7"
+  "integrity" "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw=="
+  "resolved" "https://registry.npmmirror.com/object.values/-/object.values-1.1.6.tgz"
+  "version" "1.1.6"
   dependencies:
     "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    "define-properties" "^1.1.4"
+    "es-abstract" "^1.20.4"
 
 "obuf@^1.0.0", "obuf@^1.1.2":
   "integrity" "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
@@ -8832,10 +8825,10 @@
     "picocolors" "^0.2.1"
     "source-map" "^0.6.1"
 
-"postcss@^8.4.14", "postcss@^8.4.31", "postcss@>4 <9":
-  "integrity" "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.31.tgz"
-  "version" "8.4.31"
+"postcss@^8.1.10", "postcss@^8.4.14", "postcss@>4 <9":
+  "integrity" "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ=="
+  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz"
+  "version" "8.4.27"
   dependencies:
     "nanoid" "^3.3.6"
     "picocolors" "^1.0.0"
@@ -9029,7 +9022,7 @@
   "resolved" "https://registry.npmmirror.com/qrcode.vue/-/qrcode.vue-1.7.0.tgz"
   "version" "1.7.0"
 
-"qs@^6.11.2":
+"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"
@@ -9191,9 +9184,9 @@
     "picomatch" "^2.2.1"
 
 "regenerate-unicode-properties@^10.1.0":
-  "integrity" "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q=="
-  "resolved" "https://registry.npmmirror.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz"
-  "version" "10.1.1"
+  "integrity" "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ=="
+  "resolved" "https://registry.npmmirror.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"
+  "version" "10.1.0"
   dependencies:
     "regenerate" "^1.4.2"
 
@@ -9207,20 +9200,15 @@
   "resolved" "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"
   "version" "0.11.1"
 
-"regenerator-runtime@^0.13.7":
+"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.14.0":
-  "integrity" "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
-  "resolved" "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz"
-  "version" "0.14.0"
-
-"regenerator-transform@^0.15.2":
-  "integrity" "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg=="
-  "resolved" "https://registry.npmmirror.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz"
-  "version" "0.15.2"
+"regenerator-transform@^0.15.1":
+  "integrity" "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg=="
+  "resolved" "https://registry.npmmirror.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz"
+  "version" "0.15.1"
   dependencies:
     "@babel/runtime" "^7.8.4"
 
@@ -9232,14 +9220,14 @@
     "extend-shallow" "^3.0.2"
     "safe-regex" "^1.1.0"
 
-"regexp.prototype.flags@^1.2.0", "regexp.prototype.flags@^1.5.1":
-  "integrity" "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg=="
-  "resolved" "https://registry.npmmirror.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz"
-  "version" "1.5.1"
+"regexp.prototype.flags@^1.2.0", "regexp.prototype.flags@^1.5.0":
+  "integrity" "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA=="
+  "resolved" "https://registry.npmmirror.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz"
+  "version" "1.5.0"
   dependencies:
     "call-bind" "^1.0.2"
     "define-properties" "^1.2.0"
-    "set-function-name" "^2.0.0"
+    "functions-have-names" "^1.2.3"
 
 "regexpp@^2.0.1":
   "integrity" "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
@@ -9364,12 +9352,12 @@
   "resolved" "https://registry.npmmirror.com/resolve-url/-/resolve-url-0.2.1.tgz"
   "version" "0.2.1"
 
-"resolve@^1.10.0", "resolve@^1.12.0", "resolve@^1.14.2", "resolve@^1.22.4":
-  "integrity" "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw=="
-  "resolved" "https://registry.npmmirror.com/resolve/-/resolve-1.22.8.tgz"
-  "version" "1.22.8"
+"resolve@^1.10.0", "resolve@^1.12.0", "resolve@^1.14.2", "resolve@^1.22.1":
+  "integrity" "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g=="
+  "resolved" "https://registry.npmmirror.com/resolve/-/resolve-1.22.2.tgz"
+  "version" "1.22.2"
   dependencies:
-    "is-core-module" "^2.13.0"
+    "is-core-module" "^2.11.0"
     "path-parse" "^1.0.7"
     "supports-preserve-symlinks-flag" "^1.0.0"
 
@@ -9491,13 +9479,13 @@
   dependencies:
     "tslib" "^2.1.0"
 
-"safe-array-concat@^1.0.0", "safe-array-concat@^1.0.1":
-  "integrity" "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q=="
-  "resolved" "https://registry.npmmirror.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz"
-  "version" "1.0.1"
+"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"
   dependencies:
     "call-bind" "^1.0.2"
-    "get-intrinsic" "^1.2.1"
+    "get-intrinsic" "^1.2.0"
     "has-symbols" "^1.0.3"
     "isarray" "^2.0.5"
 
@@ -9567,12 +9555,7 @@
   dependencies:
     "chokidar" ">=3.0.0 <4.0.0"
 
-"sax@^1.2.4":
-  "integrity" "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
-  "resolved" "https://registry.npmmirror.com/sax/-/sax-1.3.0.tgz"
-  "version" "1.3.0"
-
-"sax@~1.2.4":
+"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"
@@ -9764,25 +9747,6 @@
   "resolved" "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz"
   "version" "2.0.0"
 
-"set-function-length@^1.1.1":
-  "integrity" "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ=="
-  "resolved" "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.1.1.tgz"
-  "version" "1.1.1"
-  dependencies:
-    "define-data-property" "^1.1.1"
-    "get-intrinsic" "^1.2.1"
-    "gopd" "^1.0.1"
-    "has-property-descriptors" "^1.0.0"
-
-"set-function-name@^2.0.0":
-  "integrity" "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA=="
-  "resolved" "https://registry.npmmirror.com/set-function-name/-/set-function-name-2.0.1.tgz"
-  "version" "2.0.1"
-  dependencies:
-    "define-data-property" "^1.0.1"
-    "functions-have-names" "^1.2.3"
-    "has-property-descriptors" "^1.0.0"
-
 "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"
@@ -9840,7 +9804,7 @@
   "resolved" "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz"
   "version" "3.0.0"
 
-"shell-quote@^1.8.1":
+"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"
@@ -10067,9 +10031,9 @@
     "spdx-license-ids" "^3.0.0"
 
 "spdx-license-ids@^3.0.0":
-  "integrity" "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="
-  "resolved" "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz"
-  "version" "3.0.16"
+  "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"
 
 "spdy-transport@^3.0.0":
   "integrity" "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="
@@ -10114,9 +10078,9 @@
     "frac" "~1.1.2"
 
 "sshpk@^1.7.0":
-  "integrity" "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ=="
-  "resolved" "https://registry.npmmirror.com/sshpk/-/sshpk-1.18.0.tgz"
-  "version" "1.18.0"
+  "integrity" "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="
+  "resolved" "https://registry.npmmirror.com/sshpk/-/sshpk-1.17.0.tgz"
+  "version" "1.17.0"
   dependencies:
     "asn1" "~0.2.3"
     "assert-plus" "^1.0.0"
@@ -10256,32 +10220,32 @@
     "emoji-regex" "^9.2.2"
     "strip-ansi" "^7.0.1"
 
-"string.prototype.trim@^1.2.8":
-  "integrity" "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ=="
-  "resolved" "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz"
-  "version" "1.2.8"
+"string.prototype.trim@^1.2.7":
+  "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"
   dependencies:
     "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    "define-properties" "^1.1.4"
+    "es-abstract" "^1.20.4"
 
-"string.prototype.trimend@^1.0.7":
-  "integrity" "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA=="
-  "resolved" "https://registry.npmmirror.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz"
-  "version" "1.0.7"
+"string.prototype.trimend@^1.0.6":
+  "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"
   dependencies:
     "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    "define-properties" "^1.1.4"
+    "es-abstract" "^1.20.4"
 
-"string.prototype.trimstart@^1.0.7":
-  "integrity" "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg=="
-  "resolved" "https://registry.npmmirror.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz"
-  "version" "1.0.7"
+"string.prototype.trimstart@^1.0.6":
+  "integrity" "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="
+  "resolved" "https://registry.npmmirror.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"
+  "version" "1.0.6"
   dependencies:
     "call-bind" "^1.0.2"
-    "define-properties" "^1.2.0"
-    "es-abstract" "^1.22.1"
+    "define-properties" "^1.1.4"
+    "es-abstract" "^1.20.4"
 
 "strip-ansi@^3.0.0":
   "integrity" "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="
@@ -10516,9 +10480,9 @@
   "version" "1.1.3"
 
 "tar@^6.0.2":
-  "integrity" "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ=="
-  "resolved" "https://registry.npmmirror.com/tar/-/tar-6.2.0.tgz"
-  "version" "6.2.0"
+  "integrity" "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A=="
+  "resolved" "https://registry.npmmirror.com/tar/-/tar-6.1.15.tgz"
+  "version" "6.1.15"
   dependencies:
     "chownr" "^2.0.0"
     "fs-minipass" "^2.0.0"
@@ -10582,9 +10546,9 @@
     "source-map-support" "~0.5.12"
 
 "terser@^5.3.4":
-  "integrity" "sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw=="
-  "resolved" "https://registry.npmmirror.com/terser/-/terser-5.22.0.tgz"
-  "version" "5.22.0"
+  "integrity" "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA=="
+  "resolved" "https://registry.npmmirror.com/terser/-/terser-5.19.2.tgz"
+  "version" "5.19.2"
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     "acorn" "^8.8.2"
@@ -10763,7 +10727,7 @@
   "resolved" "https://registry.npmmirror.com/ts-pnp/-/ts-pnp-1.2.0.tgz"
   "version" "1.2.0"
 
-"tsconfig-paths@^3.14.2":
+"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"
@@ -10897,11 +10861,6 @@
     "has-symbols" "^1.0.3"
     "which-boxed-primitive" "^1.0.2"
 
-"undici-types@~5.25.1":
-  "integrity" "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA=="
-  "resolved" "https://registry.npmmirror.com/undici-types/-/undici-types-5.25.3.tgz"
-  "version" "5.25.3"
-
 "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"
@@ -10992,10 +10951,10 @@
   "resolved" "https://registry.npmmirror.com/upath/-/upath-1.2.0.tgz"
   "version" "1.2.0"
 
-"update-browserslist-db@^1.0.13":
-  "integrity" "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg=="
-  "resolved" "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz"
-  "version" "1.0.13"
+"update-browserslist-db@^1.0.11":
+  "integrity" "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA=="
+  "resolved" "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz"
+  "version" "1.0.11"
   dependencies:
     "escalade" "^3.1.1"
     "picocolors" "^1.0.0"
@@ -11047,12 +11006,12 @@
   "version" "2.2.5"
 
 "url@^0.11.0":
-  "integrity" "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw=="
-  "resolved" "https://registry.npmmirror.com/url/-/url-0.11.3.tgz"
-  "version" "0.11.3"
+  "integrity" "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA=="
+  "resolved" "https://registry.npmmirror.com/url/-/url-0.11.1.tgz"
+  "version" "0.11.1"
   dependencies:
     "punycode" "^1.4.1"
-    "qs" "^6.11.2"
+    "qs" "^6.11.0"
 
 "use@^3.1.0":
   "integrity" "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
@@ -11082,13 +11041,6 @@
     "define-properties" "^1.1.2"
     "object.getownpropertydescriptors" "^2.0.3"
 
-"util@^0.10.4":
-  "integrity" "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="
-  "resolved" "https://registry.npmmirror.com/util/-/util-0.10.4.tgz"
-  "version" "0.10.4"
-  dependencies:
-    "inherits" "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"
@@ -11096,6 +11048,13 @@
   dependencies:
     "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"
+  dependencies:
+    "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"
@@ -11134,9 +11093,9 @@
   "version" "9.0.1"
 
 "v8-compile-cache@^2.0.3":
-  "integrity" "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw=="
-  "resolved" "https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz"
-  "version" "2.4.0"
+  "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"
 
 "validate-npm-package-license@^3.0.1":
   "integrity" "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="
@@ -11227,12 +11186,12 @@
     "xhr" "2.4.0"
 
 "video.js@^7 || ^8", "video.js@^8", "video.js@^8.5.2":
-  "integrity" "sha512-uoX0Me0UyJuW3cB8IT0VLpEim5HwUutrXTxuQqYxPeahVr5EfFOP2IjUAlnvACpb6eA/pbmO6d4TpZXuXD+blQ=="
-  "resolved" "https://registry.npmmirror.com/video.js/-/video.js-8.6.0.tgz"
-  "version" "8.6.0"
+  "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"
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@videojs/http-streaming" "3.6.0"
+    "@videojs/http-streaming" "3.5.3"
     "@videojs/vhs-utils" "^4.0.0"
     "@videojs/xhr" "2.6.0"
     "aes-decrypter" "^4.0.1"
@@ -11348,9 +11307,9 @@
   "version" "0.5.8"
 
 "vue-eslint-parser@^9.0.1":
-  "integrity" "sha512-q7tWyCVaV9f8iQyIA5Mkj/S6AoJ9KBN8IeUSf3XEmBrOtxOZnfTg5s4KClbZBCK3GtnT/+RyCLZyDHuZwTuBjg=="
-  "resolved" "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-9.3.2.tgz"
-  "version" "9.3.2"
+  "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"
   dependencies:
     "debug" "^4.3.4"
     "eslint-scope" "^7.1.1"
@@ -11375,9 +11334,9 @@
     "loader-utils" "^2.0.0"
 
 "vue-loader@^15.9.2":
-  "integrity" "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q=="
-  "resolved" "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz"
-  "version" "15.11.1"
+  "integrity" "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA=="
+  "resolved" "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz"
+  "version" "15.10.1"
   dependencies:
     "@vue/component-compiler-utils" "^3.1.0"
     "hash-sum" "^1.0.2"
@@ -11601,9 +11560,9 @@
     "source-map" "~0.6.1"
 
 "webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.36.0 || ^5.0.0", "webpack@^4.4.0", "webpack@>=2", "webpack@>=2.0.0 <5.0.0", "webpack@>=4.0.0":
-  "integrity" "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ=="
-  "resolved" "https://registry.npmmirror.com/webpack/-/webpack-4.47.0.tgz"
-  "version" "4.47.0"
+  "integrity" "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="
+  "resolved" "https://registry.npmmirror.com/webpack/-/webpack-4.46.0.tgz"
+  "version" "4.46.0"
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
@@ -11664,13 +11623,13 @@
   "resolved" "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz"
   "version" "2.0.1"
 
-"which-typed-array@^1.1.11":
-  "integrity" "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow=="
-  "resolved" "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.13.tgz"
-  "version" "1.1.13"
+"which-typed-array@^1.1.10", "which-typed-array@^1.1.11":
+  "integrity" "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew=="
+  "resolved" "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.11.tgz"
+  "version" "1.1.11"
   dependencies:
     "available-typed-arrays" "^1.0.5"
-    "call-bind" "^1.0.4"
+    "call-bind" "^1.0.2"
     "for-each" "^0.3.3"
     "gopd" "^1.0.1"
     "has-tostringtag" "^1.0.0"
@@ -11750,14 +11709,7 @@
   dependencies:
     "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"
-  dependencies:
-    "async-limiter" "~1.0.0"
-
-"ws@^6.2.1":
+"ws@^6.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"