From 4e48eae2a7c0c654c3005d83824126962e017861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Mon, 4 Dec 2023 14:14:34 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DialogForm/index.vue           |   5 +-
 src/components/Editor/index.vue               |  12 +-
 .../Verifition/Verify/VerifySlide.vue         |   1 -
 src/mixins/lb/basicPageMixin.js               |   6 +-
 src/router/index.js                           |   2 +-
 src/views/base/custom/index.vue               |  12 +-
 .../base/packagingPrintLog/add-or-updata.vue  |  43 ++-
 .../packagingPrintModel/add-or-updata.vue     |  39 +-
 src/views/base/packagingPrintModel/index.vue  |   9 +-
 .../base/packagingPrintType/add-or-updata.vue |  40 +-
 src/views/base/packagingPrintType/index.vue   |   5 +-
 .../AlarmGroup/components/BasicDrawer.vue     |  10 +-
 .../BindGroup/components/BasicDrawer.vue      |   6 +-
 .../equipment/base/config/BindGroup/index.vue |   2 +-
 .../config/DataCollection/TableConfig.vue     |  33 +-
 .../DataCollection/components/BasicDrawer.vue |   8 +-
 .../base/inspection/Record/addRecord.vue      |   4 +-
 .../base/inspection/Record/index.vue          |   3 +-
 .../equipment/base/maintain/Monitor/index.vue |  31 +-
 .../equipment/base/maintain/Record/index.vue  |  69 ++--
 .../base/repair/CustomDialogForm.vue          | 357 +++++++++---------
 src/views/equipment/base/repair/index.vue     |  40 +-
 .../processEquValueBom/add-or-updata.vue      |  99 +++--
 .../qualityInspectionBoxBtn/dialogForm.vue    |  72 +---
 .../qualityInspectionBoxBtn/index.vue         |   2 +-
 .../base/qualityInspectionDet/index.vue       |   2 +-
 .../base/qualityScrapLog/detail-or-updata.vue | 132 +++----
 .../quality/base/qualityScrapLog/index.vue    |   2 +-
 .../base/qualityScrapType/add-or-updata.vue   |  13 +-
 .../quality/monitoring/currentData/index.vue  |   4 +
 .../monitoring/materielDateFrom/index.vue     |  10 +-
 .../monitoring/processTraceability/index.vue  |   4 +-
 .../qualityInspectionRecord/dialogForm.vue    |   3 +-
 .../qualityInspectionRecord/index.vue         |  43 ++-
 .../rawMaterialTraceability/index.vue         |   4 +-
 .../monitoring/statisticalData/index.vue      |   2 +-
 36 files changed, 591 insertions(+), 538 deletions(-)

diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue
index c780edba..0c4fcff1 100644
--- a/src/components/DialogForm/index.vue
+++ b/src/components/DialogForm/index.vue
@@ -142,9 +142,6 @@ function findMaxLabelWidth(rows) {
 			if (!opt.label) return 0;
 			if (opt.label.length > max) {
 				max = opt.label.length;
-				if (opt.label.includes('(')) {
-					max = max - 3
-				}
 			}
 		});
 	});
@@ -242,7 +239,7 @@ export default {
 		size: {
 			type: String,
 			default: '',
-		}
+		},
 	},
 	data() {
 		return {
diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index 046e334a..1b0d68c1 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -83,7 +83,7 @@ export default {
 					],
 				},
 				placeholder: '请输入内容',
-				// readOnly: false,
+				readOnly: true,
 			},
 		};
 	},
@@ -123,13 +123,11 @@ export default {
 			const editor = this.$refs.editor;
 			this.Quill = new Quill(editor, this.options);
 			// 取消自动聚焦 start
-			this.Quill?.enable(false);
 			this.$nextTick(() => {
-				this.Quill?.enable(true);
 				this.Quill?.blur();
-				// if (!this.readOnly) {
-				// 	this.Quill?.enable();
-				// }
+				if (!this.readOnly) {
+					this.Quill?.enable();
+				}
 			});
 			// 如果设置了上传地址则自定义图片上传事件
 			if (this.type === 'url') {
@@ -198,7 +196,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style>
 .editor-wrapper {
 	position: relative;
   cursor: not-allowed;
diff --git a/src/components/Verifition/Verify/VerifySlide.vue b/src/components/Verifition/Verify/VerifySlide.vue
index 52f7e859..a1cac7d7 100644
--- a/src/components/Verifition/Verify/VerifySlide.vue
+++ b/src/components/Verifition/Verify/VerifySlide.vue
@@ -360,7 +360,6 @@ export default {
         ts: Date.now(), // 现在的时间戳
       }
       reqGet(data).then(res => {
-        console.log(1)
         if (res.repCode === '0000') {
           this.backImgBase = res.repData.originalImageBase64
           this.blockBackImgBase = res.repData.jigsawImageBase64
diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js
index 51b89d80..532b615c 100644
--- a/src/mixins/lb/basicPageMixin.js
+++ b/src/mixins/lb/basicPageMixin.js
@@ -28,7 +28,7 @@ export default {
 			// tableBtn: [], // 占位
 			// searchBarFormConfig: [], // 占位
 			// // 弹窗表单配置
-			// dialogFormConfig: [], // 
+			// dialogFormConfig: [], //
 			updateUrl: '',
 			addUrl: '',
 			pageUrl: '',
@@ -119,9 +119,9 @@ export default {
 							this.queryParams['startTime'] = btn.timeVal[0];
 							this.queryParams['endTime'] = btn.timeVal[1];
 							return;
-						}
+            }
 						this.queryParams[key] = btn[key] || null;
-					});
+          });
 					this.handleQuery();
 					break;
 				case 'add':
diff --git a/src/router/index.js b/src/router/index.js
index 0686616c..40189532 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -104,7 +104,7 @@ export const constantRoutes = [
     // this generates a separate chunk (about.[hash].js) for this route
     // which is lazy-loaded when the route is visited.
     component: () => import(/* webpackChunkName: "about" */ '@/views/OperationalOverview/coldBoard.vue')
-  }, 
+  },
      {
     path: '/processingBoard',
     name: 'processingBoard',
diff --git a/src/views/base/custom/index.vue b/src/views/base/custom/index.vue
index 97c816dc..c8de9091 100644
--- a/src/views/base/custom/index.vue
+++ b/src/views/base/custom/index.vue
@@ -273,12 +273,20 @@ export default {
           $('.hiprint-printTemplate').empty()
           // const templates = this.$ls.get('KEY_TEMPLATES', {})
           const template = provider.value
-          // console.log(template)
+        // console.log(template)
+        if (this.modelData) {
           hiprintTemplate = new hiprint.PrintTemplate({
-            template: this.modelData != '' ? JSON.parse(this.modelData) : {},
+            template: JSON.parse(this.modelData),
             settingContainer: '#PrintElementOptionSetting',
             paginationContainer: '.hiprint-printPagination'
           })
+        } else {
+          hiprintTemplate = new hiprint.PrintTemplate({
+            template:{},
+            settingContainer: '#PrintElementOptionSetting',
+            paginationContainer: '.hiprint-printPagination'
+          })
+          }
         // }
         hiprintTemplate.design('#hiprint-printTemplate')
         // console.log(hiprintTemplate)
diff --git a/src/views/base/packagingPrintLog/add-or-updata.vue b/src/views/base/packagingPrintLog/add-or-updata.vue
index 6b1d63b4..625ac6cc 100644
--- a/src/views/base/packagingPrintLog/add-or-updata.vue
+++ b/src/views/base/packagingPrintLog/add-or-updata.vue
@@ -1,18 +1,18 @@
 <!--
  * @Author: zhp
  * @Date: 2023-10-17 16:50:19
- * @LastEditTime: 2023-10-30 10:47:13
+ * @LastEditTime: 2023-12-01 16:48:53
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
-  <el-dialog :visible.sync="visible" :show-close="false" :wrapper-closable="false" width="40%">
+  <el-dialog class="baseDialog" :visible.sync="visible" :show-close="false" :wrapper-closable="false" width="40%" show-close="true">
     <small-title slot="title" :no-padding="true">
       {{ !dataForm.id ? '新增' : '编辑' }}
     </small-title>
-
+<!--
     <div class="content">
-      <div class="visual-part">
+      <div class="visual-part"> -->
         <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"
           @keyup.enter.native="dataFormSubmit">
           <el-row :gutter="20">
@@ -96,8 +96,8 @@
 						:page-sizes="[5, 10, 15]"
 						@pagination="getList" />
 				</div> -->
-      </div>
-    </div>
+      <!-- </div> -->
+    <!-- </div> -->
 
     <!-- <div style="position: absolute; bottom: 24px; right: 24px">
 			<el-button style="margin-right: 10px" @click="goback()">返回</el-button>
@@ -416,3 +416,34 @@ export default {
 	padding: 18px;
 }
 </style> -->
+<style>
+
+.baseDialog .el-dialog__header {
+  font-size: 16px;
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: 500;
+  padding: 13px 24px;
+  border-bottom: 1px solid #e9e9e9;
+}
+.baseDialog .el-dialog__header .titleStyle::before{
+  content: '';
+  display: inline-block;
+  width: 4px;
+  height: 16px;
+  background-color: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8px;
+  position: relative;
+  top: 2px;
+}
+.baseDialog .el-dialog__body {
+  padding-left: 24px;
+  padding-right: 24px;
+}
+.baseDialog .btnTextStyle {
+  letter-spacing:6px;
+  padding: 9px 10px 9px 16px;
+  font-size: 14px;
+}
+
+</style>
diff --git a/src/views/base/packagingPrintModel/add-or-updata.vue b/src/views/base/packagingPrintModel/add-or-updata.vue
index 9e66ebe9..d22f295f 100644
--- a/src/views/base/packagingPrintModel/add-or-updata.vue
+++ b/src/views/base/packagingPrintModel/add-or-updata.vue
@@ -1,12 +1,12 @@
 <!--
  * @Author: zhp
  * @Date: 2023-10-17 16:50:19
- * @LastEditTime: 2023-10-30 10:41:07
+ * @LastEditTime: 2023-12-04 13:43:19
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
-  <el-dialog :visible.sync="visible" :show-close="false" :wrapper-closable="false" width="30%">
+  <el-dialog class="baseDialog" :visible.sync="visible" :show-close="false" :wrapper-closable="false" width="30%" show-close="true">
     <small-title slot="title" :no-padding="true">
       {{ !dataForm.id ? '新增' : '编辑' }}
     </small-title>
@@ -46,7 +46,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="模板设计" prop="content">
-                <el-button type="primary" @click="btnClickDesign()">模板设计</el-button>
+                <el-button  icon="el-icon-edit" @click="btnClickDesign()">模板设计</el-button>
               </el-form-item>
             </el-col>
             <!-- <el-col :span="12">
@@ -439,3 +439,36 @@ export default {
 	padding: 18px;
 }
 </style> -->
+<style>
+
+
+.baseDialog .el-dialog__header {
+  font-size: 16px;
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: 500;
+  padding: 13px 24px;
+  border-bottom: 1px solid #e9e9e9;
+}
+.baseDialog .el-dialog__header .titleStyle::before{
+  content: '';
+  display: inline-block;
+  width: 4px;
+  height: 16px;
+  background-color: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8px;
+  position: relative;
+  top: 2px;
+}
+.baseDialog .el-dialog__body {
+  padding-left: 24px;
+  padding-right: 24px;
+}
+.baseDialog .btnTextStyle {
+  letter-spacing:6px;
+  padding: 9px 10px 9px 16px;
+  font-size: 14px;
+}
+
+
+</style>
diff --git a/src/views/base/packagingPrintModel/index.vue b/src/views/base/packagingPrintModel/index.vue
index 92fa73ec..6e5992d1 100644
--- a/src/views/base/packagingPrintModel/index.vue
+++ b/src/views/base/packagingPrintModel/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 14:40:07
+ * @LastEditTime: 2023-12-04 13:38:45
  * @Description:
 -->
 <template>
@@ -71,7 +71,7 @@ export default {
       modelShow:false,
       tableBtn: [
         {
-          type: 'print',
+          type: 'detail',
           btnName: '查看',
         },
         this.$auth.hasPermi(`base:packaging-print-model:update`)
@@ -121,11 +121,12 @@ export default {
 				// 	name: 'reset',
 				// },
 				{
-					type: 'separate',
+          type: 'label',
+          label:'标签模板',
 				},
 				{
           type: this.$auth.hasPermi('base:packaging-print-model:create') ? 'button' : '',
-					btnName: '新增模板',
+					btnName: '新增',
 					name: 'add',
 					color: 'success',
 					plain: true,
diff --git a/src/views/base/packagingPrintType/add-or-updata.vue b/src/views/base/packagingPrintType/add-or-updata.vue
index 469b5622..0948dc22 100644
--- a/src/views/base/packagingPrintType/add-or-updata.vue
+++ b/src/views/base/packagingPrintType/add-or-updata.vue
@@ -1,19 +1,19 @@
 <!--
  * @Author: zhp
  * @Date: 2023-10-17 16:50:19
- * @LastEditTime: 2023-10-18 16:07:39
+ * @LastEditTime: 2023-12-04 13:45:45
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
-  <el-dialog :visible.sync="visible" :show-close="false" :wrapper-closable="false" width="40%">
+  <el-dialog class="baseDialog" :visible.sync="visible" :show-close="false" :wrapper-closable="false" width="40%" show-close="true">
     <small-title slot="title" :no-padding="true">
       {{ !dataForm.id ? '新增' : '编辑' }}
     </small-title>
 
     <div class="content">
       <div class="visual-part">
-        <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"
+        <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="auto"
           @keyup.enter.native="dataFormSubmit">
           <el-row :gutter="20">
             <el-col :span="12">
@@ -345,3 +345,37 @@ export default {
 	padding: 18px;
 }
 </style> -->
+<style>
+
+
+.baseDialog .el-dialog__header {
+  font-size: 16px;
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: 500;
+  padding: 13px 24px;
+  border-bottom: 1px solid #e9e9e9;
+}
+.baseDialog .el-dialog__header .titleStyle::before{
+  content: '';
+  display: inline-block;
+  width: 4px;
+  height: 16px;
+  background-color: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8px;
+  position: relative;
+  top: 2px;
+}
+.baseDialog .el-dialog__body {
+  padding-left: 24px;
+  padding-right: 24px;
+}
+.baseDialog .btnTextStyle {
+  letter-spacing:6px;
+  padding: 9px 10px 9px 16px;
+  font-size: 14px;
+}
+
+
+
+</style>
diff --git a/src/views/base/packagingPrintType/index.vue b/src/views/base/packagingPrintType/index.vue
index 740d250a..0cb35009 100644
--- a/src/views/base/packagingPrintType/index.vue
+++ b/src/views/base/packagingPrintType/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 14:36:33
+ * @LastEditTime: 2023-12-04 13:44:01
  * @Description:
 -->
 <template>
@@ -122,7 +122,8 @@ export default {
 				// 	name: 'reset',
 				// },
 				{
-					type: 'separate',
+          type: 'label',
+          label: '标签类型'
 				},
 				{
           type: this.$auth.hasPermi('base:packaging-print-type:create') ? 'button' : '',
diff --git a/src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue b/src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue
index 84f0d9cf..079f999e 100644
--- a/src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue
+++ b/src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue
@@ -9,8 +9,7 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="mode.includes('detail') ? true : false"
-		:before-close="handleCancel"
+		:wrapper-closable="false"
 		class="drawer"
 		custom-class="mes-drawer"
 		:size="size || '50%'"
@@ -130,12 +129,13 @@
 				</section>
 			</div>
 
-			<div v-if="!mode.includes('detail')" class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">取消</el-button>
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">返回</el-button>
 				<el-button
 					type="primary"
+					v-if="!mode.includes('detail')"
 					@click="handleSave">
-					确定
+					保存
 				</el-button>
 			</div>
 		</div>
diff --git a/src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue b/src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue
index f5a87fbf..036fd885 100644
--- a/src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue
+++ b/src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue
@@ -9,8 +9,7 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="mode.includes('detail') ? true : false"
-		:before-close="handleCancel"
+		:wrapper-closable="false"
 		class="drawer"
 		custom-class="mes-drawer"
 		:size="size || '50%'"
@@ -129,10 +128,11 @@
 				</section>
 			</div>
 
-			<div v-if="!mode.includes('detail')" class="drawer-body__footer">
+			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
 				<el-button
 					type="primary"
+					v-if="!mode.includes('detail')"
 					@click="handleCancel">
 					确定
 				</el-button>
diff --git a/src/views/equipment/base/config/BindGroup/index.vue b/src/views/equipment/base/config/BindGroup/index.vue
index 03cd2c9d..81c2295d 100644
--- a/src/views/equipment/base/config/BindGroup/index.vue
+++ b/src/views/equipment/base/config/BindGroup/index.vue
@@ -34,7 +34,7 @@
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
-			width="30%"
+			width="700px"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
diff --git a/src/views/equipment/base/config/DataCollection/TableConfig.vue b/src/views/equipment/base/config/DataCollection/TableConfig.vue
index 1037d075..2f9dda7a 100644
--- a/src/views/equipment/base/config/DataCollection/TableConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/TableConfig.vue
@@ -25,7 +25,6 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="90"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -42,7 +41,7 @@
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
-			width="45%"
+			width="700px"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
@@ -128,7 +127,7 @@ export default {
 				// 	width: 180,
 				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				// },
-				{ prop: 'code', label: '编码', showOverflowtooltip: true },
+				{ prop: 'code', label: '编码' },
 				{ prop: 'plcTableName', label: '关联表名' },
 				{ prop: 'name', label: '标识名称' },
 				{ prop: 'enName', label: '英文名称' },
@@ -137,7 +136,7 @@ export default {
 					label: '是否采集',
 					subcomponent: switchBtn,
 				},
-				{ prop: 'description', label: '描述', showOverflowtooltip: true },
+				{ prop: 'description', label: '描述' },
 			],
 			searchBarFormConfig: [
 				{
@@ -214,28 +213,16 @@ export default {
 					},
 				],
 				[
-					// {
-					// 	switch: true,
-					// 	label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
-					// 	prop: 'collection',
-					// 	bind: {
-          //     'active-value': 1,
-					// 		'inactive-value': 0,
-          //     value: 1,
-					// 	},
-					// },
 					{
-						select: true,
-						options: [
-							{ label: '否', value: 0 },
-							{ label: '是', value: 1 }
-						],
-						label: '是否采集',
+						switch: true,
+						label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
 						prop: 'collection',
 						bind: {
-							clearable: true, filterable: true
-						}
-					}
+                            'active-value': 1,
+							'inactive-value': 0,
+                            value: 1,
+						},
+					},
 				],
 				[
 					{
diff --git a/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue b/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue
index 4ac442ce..a2f09855 100644
--- a/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue
+++ b/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue
@@ -9,8 +9,7 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="mode.includes('detail') ? true : false"
-		:before-close="handleCancel"
+		:wrapper-closable="false"
 		class="drawer"
 		custom-class="mes-drawer"
 		:size="size || '50%'"
@@ -148,12 +147,13 @@
 				</section>
 			</div>
 
-			<div v-if="!mode.includes('detail')" class="drawer-body__footer">
+			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
 				<el-button
 					type="primary"
+					v-if="!mode.includes('detail')"
 					@click="handleSave">
-					确定
+					保存
 				</el-button>
 			</div>
 		</div>
diff --git a/src/views/equipment/base/inspection/Record/addRecord.vue b/src/views/equipment/base/inspection/Record/addRecord.vue
index f420896b..ebac0548 100644
--- a/src/views/equipment/base/inspection/Record/addRecord.vue
+++ b/src/views/equipment/base/inspection/Record/addRecord.vue
@@ -12,8 +12,7 @@
 		:show-close="false"
 		:wrapper-closable="isdetail"
 		class="drawer"
-		size="60%"
-		@closed="$emit('destroy')">
+		size="60%">
 		<small-title slot="title" :no-padding="true">
 			{{ isdetail ? '查看详情' : !dataForm.id ? '新增' : '编辑' }}
 		</small-title>
@@ -266,7 +265,6 @@ export default {
 							this.fileName = this.dataForm.files[0].fileName
 						}
 						this.setConfig()
-						this.setInspectionContet()
           });
 				} else {
 					// if (this.urlOptions.isGetCode) {
diff --git a/src/views/equipment/base/inspection/Record/index.vue b/src/views/equipment/base/inspection/Record/index.vue
index 4d822298..5dcee26b 100644
--- a/src/views/equipment/base/inspection/Record/index.vue
+++ b/src/views/equipment/base/inspection/Record/index.vue
@@ -49,8 +49,7 @@
 		<addRecord
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getList"
-			@destroy="addOrUpdateVisible = false" />
+			@refreshDataList="getList" />
 	</div>
 </template>
 
diff --git a/src/views/equipment/base/maintain/Monitor/index.vue b/src/views/equipment/base/maintain/Monitor/index.vue
index c2e3f957..e5b5038c 100644
--- a/src/views/equipment/base/maintain/Monitor/index.vue
+++ b/src/views/equipment/base/maintain/Monitor/index.vue
@@ -49,7 +49,7 @@
 
 <script>
 import { publicFormatter } from '@/utils/dict';
-// import moment from 'moment';
+import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record'
 import { parseTime } from '@/utils/ruoyi'
@@ -67,7 +67,7 @@ const remainBox = {
 		color() {
 			if (this.value) {
 				const v = +this.value;
-				return v < 0 ? '#FF5454' : v >= 0 && v < 2 ? '#FFD767' : '#37D97F';
+				return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green';
 			}
 			return 'unset';
 		},
@@ -78,10 +78,9 @@ const remainBox = {
 				style={`background: ${
 					this.color
 				}; position:absolute; inset: 0; padding: 0 10px; display: flex; align-items: center; color: ${
-					// this.color == 'red' ? '#fff' : 'unset'
-					'#fff'
+					this.color == 'red' ? '#fff' : 'unset'
 				}`}>
-				{ this.injectData[this.injectData.prop]?.toFixed(0) || '' }
+				{this.injectData[this.injectData.prop] || ''}
 			</div>
 		);
 	},
@@ -122,35 +121,30 @@ export default {
 				// 	width: 180,
 				// 	filter: parseTime(createTime),
 				// },
-				{ prop: 'name', label: '保养计划', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'sectionName', label: '工段名', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'equipmentCode', label: '设备编码', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'name', label: '保养计划' },
+				{ prop: 'lineName', label: '产线名' },
+				{ prop: 'sectionName', label: '工段名' },
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'equipmentCode', label: '设备编码' },
 				{ prop: 'maintenancePeriod', label: '保养频率' },
 				{
 					prop: 'maintainType',
 					label: '保养类型',
-					showOverflowtooltip: true,
 					filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
 				},
 				{
 					prop: 'lastMaintainTime',
 					label: '上次保养时间',
 					filter: parseTime,
-					minWidth: 150,
-					showOverflowtooltip: true
 				},
-				{ prop: 'nextMaintainTime', label: '计划下次保养时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'nextMaintainTime', label: '计划下次保养时间', filter: parseTime },
 				{
 					prop: 'remainDays',
 					label: '距离保养时间(天)',
 					subcomponent: remainBox,
-					minWidth: 150,
-					// showOverflowtooltip: true
 				},
-				{ prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn, width: 100 },
-				{ prop: 'opt2', label: '保养记录', name: '查看详情', subcomponent: btn, width: 100 },
+				{ prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn },
+				{ prop: 'opt2', label: '保养记录', name: '查看详情', subcomponent: btn },
 			],
 			searchBarFormConfig: [
 				{
@@ -182,7 +176,6 @@ export default {
 						: '',
 					btnName: '导出',
 					name: 'export',
-					plain: true,
 					color: 'warning',
 				},
 			],
diff --git a/src/views/equipment/base/maintain/Record/index.vue b/src/views/equipment/base/maintain/Record/index.vue
index f33df532..e2f57037 100644
--- a/src/views/equipment/base/maintain/Record/index.vue
+++ b/src/views/equipment/base/maintain/Record/index.vue
@@ -99,24 +99,23 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 150,
+					width: 180,
 					filter: timeFilter,
 				},
-				{ prop: 'maintainOrderNumber', label: '设备保养单号', width: 110, showOverflowtooltip: true },
-				{ prop: 'startTime', label: '开始时间', filter: timeFilter, minWidth: 150, showOverflowtooltip: true },
-				{ prop: 'endTime', label: '结束时间', filter: timeFilter, minWidth: 150, showOverflowtooltip: true },
-				{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'maintainWorker', label: '保养人员', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'maintainOrderNumber', label: '设备保养单号' },
+				{ prop: 'startTime', label: '开始时间', filter: timeFilter },
+				{ prop: 'endTime', label: '结束时间', filter: timeFilter },
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'maintainWorker', label: '保养人员' },
 				{
 					prop: 'relatePlan',
 					label: '是否计划保养',
-					width: 120,
 					filter: (v) => (v != null ? ['', '是', '否'][v] : ''),
 				},
-				{ prop: 'planName', label: '保养计划名称', minWidth: 120, showOverflowtooltip: true },
-				{ prop: 'maintainDuration', label: '计划保养用时(h)', minWidth: 130, showOverflowtooltip: true },
-				{ prop: 'timeUsed', label: '实际保养用时(h)', minWidth: 130 },
-				{ prop: 'remark', label: '备注', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'planName', label: '保养计划名称' },
+				{ prop: 'maintainDuration', label: '计划保养用时(h)' },
+				{ prop: 'timeUsed', label: '实际保养用时(h)' },
+				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{
@@ -163,15 +162,6 @@ export default {
 				{
 					type: 'separate',
 				},
-				{
-					type: this.$auth.hasPermi('equipment:maintain-record:export')
-						? 'button'
-						: '',
-					btnName: '导出',
-					name: 'export',
-					plain: true,
-					color: 'warning',
-				},
 				{
 					type: this.$auth.hasPermi('equipment:maintain-record:create')
 						? 'button'
@@ -181,6 +171,14 @@ export default {
 					plain: true,
 					color: 'success',
 				},
+				{
+					type: this.$auth.hasPermi('equipment:maintain-record:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+				},
 			],
 			rows: [
 				[
@@ -215,29 +213,17 @@ export default {
 					},
 				],
 				[
-					// {
-					// 	switch: true,
-					// 	label: '是否计划保养',
-					// 	prop: 'relatePlan',
-					// 	bind: {
-					// 		'active-value': 1,
-					// 		'inactive-value': 2,
-					// 	},
-					// 	rules: [{ required: true, message: '是否计划保养不能为空', trigger: 'blur' }],
-					// },
 					{
-						select: true,
-						options: [
-							{ label: '是', value: 1 },
-							{ label: '否', value: 2 }
-						],
+						switch: true,
 						label: '是否计划保养',
 						prop: 'relatePlan',
 						bind: {
-							clearable: true, filterable: true
+							'active-value': 1,
+							'inactive-value': 2,
 						},
 						rules: [{ required: true, message: '是否计划保养不能为空', trigger: 'blur' }],
 					},
+					{},
 					{
 						select: true,
 						label: '所属计划',
@@ -248,11 +234,6 @@ export default {
 							clearable: true,
 						},
 					},
-					{
-						input: true,
-						label: '保养用时',
-						prop: 'timeUsed',
-					},
 				],
 				[
 					{
@@ -279,7 +260,11 @@ export default {
 							clearable: true,
 						},
 					},
-					{}
+					{
+						input: true,
+						label: '保养用时',
+						prop: 'timeUsed',
+					},
 				],
 
 				[
diff --git a/src/views/equipment/base/repair/CustomDialogForm.vue b/src/views/equipment/base/repair/CustomDialogForm.vue
index 7649f3ee..5de4775f 100644
--- a/src/views/equipment/base/repair/CustomDialogForm.vue
+++ b/src/views/equipment/base/repair/CustomDialogForm.vue
@@ -9,168 +9,166 @@
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="disabled"
+		:wrapper-closable="false"
 		class="drawer"
-		custom-class="mes-drawer"
-		size="65%"
-		@closed="$emit('destroy')">
+		size="60%">
 		<small-title slot="title" :no-padding="true">
 			{{ disabled ? '查看详情' : !dataForm.maintenanceStatus ? '修改' : '完成' }}
 		</small-title>
-		<div class="drawer-body flex">
-			<div class="drawer-body__content">
-				<el-form
-					ref="form"
-					:model="dataForm"
-					label-width="100px"
-					label-position="top"
-					v-loading="formLoading">
-					<el-row :gutter="20">
-						<el-col :span="8">
-							<el-form-item label="维修单号" prop="repairOrderNumber">
-								<span>{{ dataForm.repairOrderNumber }}</span>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="设备名称" prop="equipmentName">
-								<span>{{ dataForm.equipmentName }}</span>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="维修工" prop="repairman">
-								<span>{{ dataForm.repairman }}</span>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row :gutter="20">
-						<el-col :span="8">
-							<el-form-item label="故障发生时间" prop="faultTime">
-								<span>{{ parseTime(dataForm.faultTime) }}</span>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="故障级别" prop="faultLevel">
-								<span>{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}</span>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="联系方式" prop="repairmanPhone">
-								<span>{{ dataForm.repairmanPhone }}</span>
-							</el-form-item>
-						</el-col>
-					</el-row>
+		<el-form
+			ref="form"
+			:model="dataForm"
+			label-width="100px"
+			label-position="top"
+			v-loading="formLoading">
+			<el-row :gutter="20">
+				<el-col :span="8">
+					<el-form-item label="维修单号" prop="repairOrderNumber">
+						<span>{{ dataForm.repairOrderNumber }}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="设备名称" prop="equipmentName">
+						<span>{{ dataForm.equipmentName }}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="维修工" prop="repairman">
+						<span>{{ dataForm.repairman }}</span>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="8">
+					<el-form-item label="故障发生时间" prop="faultTime">
+						<span>{{ parseTime(dataForm.faultTime) }}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="故障级别" prop="faultLevel">
+						<span>{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="联系方式" prop="repairmanPhone">
+						<span>{{ dataForm.repairmanPhone }}</span>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
+				{{ '可编辑信息' }}
+			</small-title>
+			<el-row :gutter="20">
+				<el-col :span="8">
+					<el-form-item
+						label="维修开始时间"
+						prop="maintenanceStartTime"
+						:rules="[{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }]">
+						<el-date-picker
+							v-model="dataForm.maintenanceStartTime"
+							type="datetime"
+							:disabled="disabled"
+							placeholder="请选择维修开始时间"
+							value-format="timestamp" />
+					</el-form-item>
+				</el-col>
 
-					<el-divider style="margin-top: -10px" />
-					
-					<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
-						{{ '设备维修信息' }}
-					</small-title>
-					<el-row :gutter="20">
-						<el-col :span="6">
-							<el-form-item
-								label="维修开始时间"
-								prop="maintenanceStartTime"
-								:rules="[{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }]">
-								<el-date-picker
-									v-model="dataForm.maintenanceStartTime"
-									type="datetime"
-									:disabled="disabled"
-									placeholder="请选择维修开始时间"
-									value-format="timestamp" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item
-								label="维修结束时间"
-								prop="maintenanceFinishTime"
-								:rules="[{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }]">
-								<el-date-picker
-									v-model="dataForm.maintenanceFinishTime"
-									type="datetime"
-									:disabled="disabled"
-									placeholder="请选择维修开始时间"
-									value-format="timestamp" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item
-								label="维修方式"
-								prop="repairMode"
-								:rules="[{ required: true, message: '维修方式不能为空', trigger: 'blur' }]">
-								<el-select
-									:disabled="disabled"
-									v-model="dataForm.repairMode"
-									placeholder="请选择维修方式">
-									<el-option
-										v-for="opt in getDictDatas('repair-mode')"
-										:key="opt.value"
-										:label="opt.label"
-										:value="opt.value" />
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="故障类型" prop="faultType">
-								<el-select
-									:disabled="disabled"
-									v-model="dataForm.faultType"
-									placeholder="请选择故障类型">
-									<el-option
-										v-for="opt in getDictDatas('fault-type')"
-										:key="opt.value"
-										:label="opt.label"
-										:value="opt.value" />
-								</el-select>
-							</el-form-item>
-						</el-col>
-					</el-row>
+				<el-col :span="8">
+					<el-form-item
+						label="维修结束时间"
+						prop="maintenanceFinishTime"
+						:rules="[{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }]">
+						<el-date-picker
+							v-model="dataForm.maintenanceFinishTime"
+							type="datetime"
+							:disabled="disabled"
+							placeholder="请选择维修开始时间"
+							value-format="timestamp" />
+					</el-form-item>
+				</el-col>
 
-					<el-row :gutter="20">
-						<el-col>
-							<el-form-item
-								label="故障明细"
-								prop="faultDetail"
-								:rules="[{ required: true, message: '故障明细不能为空', trigger: 'blur' }]">
-								<!-- // 富文本 -->
-								<editor v-model="dataForm.faultDetail" :read-only="disabled" :min-height="150"/>
-							</el-form-item>
-						</el-col>
-					</el-row>
+				<el-col :span="8">
+					<el-form-item
+						label="维修方式"
+						prop="repairMode"
+						:rules="[{ required: true, message: '维修方式不能为空', trigger: 'blur' }]">
+						<el-select
+							:disabled="disabled"
+							v-model="dataForm.repairMode"
+							placeholder="请选择维修方式">
+							<el-option
+								v-for="opt in getDictDatas('repair-mode')"
+								:key="opt.value"
+								:label="opt.label"
+								:value="opt.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="8">
+					<el-form-item label="故障类型" prop="faultType">
+						<el-select
+							:disabled="disabled"
+							v-model="dataForm.faultType"
+							placeholder="请选择故障类型">
+							<el-option
+								v-for="opt in getDictDatas('fault-type')"
+								:key="opt.value"
+								:label="opt.label"
+								:value="opt.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
 
-					<el-row :gutter="20">
-						<el-col>
-							<el-form-item label="维修记录" prop="maintenanceDetail">
-								<!-- // 富文本 -->
-								<editor v-model="dataForm.maintenanceDetail" :read-only="disabled" :min-height="150"/>
-							</el-form-item>
-						</el-col>
-					</el-row>
+			<el-row :gutter="20">
+				<el-col>
+					<el-form-item
+						label="故障明细"
+						prop="faultDetail"
+						:rules="[{ required: true, message: '故障明细不能为空', trigger: 'blur' }]">
+						<!-- // 富文本 -->
+						<editor v-model="dataForm.faultDetail" :read-only="disabled" :min-height="380"/>
+					</el-form-item>
+				</el-col>
+			</el-row>
 
-					<el-row :gutter="20">
-						<el-col>
-							<el-form-item label="维修附件" prop="file">
-								<FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="disabled" @name="setFileName" />
-							</el-form-item>
-						</el-col>
-					</el-row>
+			<el-row :gutter="20">
+				<el-col>
+					<el-form-item label="维修记录" prop="maintenanceDetail">
+						<!-- // 富文本 -->
+						<editor v-model="dataForm.maintenanceDetail" :read-only="disabled" :min-height="380"/>
+					</el-form-item>
+				</el-col>
+			</el-row>
 
-					<el-row :gutter="20">
-						<el-col>
-							<el-form-item label="备注" prop="remark">
-								<el-input
-									v-model="dataForm.remark"
-									:placeholder="`请输入备注`"
-									:disabled="disabled" />
-							</el-form-item>
-						</el-col>
-					</el-row>
-				</el-form>
+			<el-row :gutter="20">
+				<el-col>
+					<el-form-item label="维修附件" prop="file">
+						<FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="disabled" @name="setFileName" />
+					</el-form-item>
+				</el-col>
+			</el-row>
 
-				<div v-if="!disabled" class="drawer-body__footer">
-					<el-button style="" @click="goback()">取消</el-button>
-					<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-				</div>
-			</div>
+			<el-row :gutter="20">
+				<el-col>
+					<el-form-item label="备注" prop="remark">
+						<el-input
+							v-model="dataForm.remark"
+							:placeholder="`请输入备注`"
+							:disabled="disabled" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+
+		<div class="drawer-body__footer">
+			<el-button style="" @click="goback()">{{ disabled ? '返回' : '取消' }}</el-button>
+			<!-- <el-button v-if="disabled" type="primary" @click="goEdit()">
+				编辑
+			</el-button> -->
+			<el-button v-if="!disabled" type="primary" @click="dataFormSubmit()">确定</el-button>
 		</div>
 	</el-drawer>
 </template>
@@ -302,39 +300,56 @@ export default {
 </script>
 
 <style scoped>
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
 .drawer >>> .el-drawer {
 	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
 }
 
 .drawer >>> .el-drawer__header {
 	margin: 0;
 	padding: 32px 32px 24px;
 	border-bottom: 1px solid #dcdfe6;
-	margin-bottom: 0px;
 }
-
-.small-title::before {
-	content: '';
-	display: inline-block;
-	vertical-align: top;
-	width: 4px;
-	height: 22px;
-	border-radius: 1px;
-	margin-right: 8px;
-	background-color: #0b58ff;
-}
-
-.drawer-body {
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
 	display: flex;
 	flex-direction: column;
-	height: 100%;
 }
 
-.drawer-body__content {
+.drawer >>> .content {
+	padding: 30px 24px;
 	flex: 1;
-	/* background: #eee; */
-	padding: 20px 30px;
-	overflow-y: auto;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
 }
 
 .drawer-body__footer {
diff --git a/src/views/equipment/base/repair/index.vue b/src/views/equipment/base/repair/index.vue
index fe7c4768..dc94ed7c 100644
--- a/src/views/equipment/base/repair/index.vue
+++ b/src/views/equipment/base/repair/index.vue
@@ -17,7 +17,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="120"
+				:width="180"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -48,8 +48,7 @@
 		<CustomDialogForm
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getList"
-			@destroy="addOrUpdateVisible = false" />
+			@refreshDataList="getList" />
 	</div>
 </template>
 
@@ -70,6 +69,12 @@ export default {
 			addOrUpdateVisible: false,
 			searchBarKeys: ['maintenanceStatus', 'createTime', 'equipmentId'],
 			tableBtn: [
+				this.$auth.hasPermi('equipment:repair:update')
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
 				this.$auth.hasPermi('equipment:repair:finish')
 					? {
 							type: 'finish',
@@ -78,16 +83,10 @@ export default {
 					: undefined,
 				this.$auth.hasPermi('equipment:repair:update')
 					? {
-							type: 'detail',
-							btnName: '详情',
+							type: 'edit',
+							btnName: '修改',
 					  }
 					: undefined,
-				// this.$auth.hasPermi('equipment:repair:update')
-				// 	? {
-				// 			type: 'edit',
-				// 			btnName: '修改',
-				// 	  }
-				// 	: undefined,
 				this.$auth.hasPermi('equipment:repair:delete')
 					? {
 							type: 'delete',
@@ -100,31 +99,29 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 150,
+					width: 180,
 					filter: parseTime,
 				},
-				{ prop: 'repairOrderNumber', label: '设备维修单号', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'maintenanceStartTime', label: '开始时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'repairOrderNumber', label: '设备维修单号' },
+				{ prop: 'maintenanceStartTime', label: '开始时间', filter: parseTime },
 				{
 					prop: 'maintenanceFinishTime',
 					label: '结束时间',
 					filter: parseTime,
-					minWidth: 150,
-					showOverflowtooltip: true
 				},
 				{
 					prop: 'maintenanceStatus',
 					label: '维修状态',
 					filter: (v) => (v != null ? ['未完成', '完成', '进行中'][v] : ''),
 				},
-				{ prop: 'maintenanceDuration', label: '维修时长(h)', width: 110 },
+				{ prop: 'maintenanceDuration', label: '维修时长(h)' },
 				{ prop: 'lineName', label: '产线' },
 				{ prop: 'sectionName', label: '工段' },
-				{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'maintenanceDetail', label: '维修明细' },
-				{ prop: 'repairman', label: '维修工', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'repairmanPhone', label: '联系方式', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'remark', label: '备注', minWidth: 120, showOverflowtooltip: true },
+				{ prop: 'repairman', label: '维修工' },
+				{ prop: 'repairmanPhone', label: '联系方式' },
+				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{
@@ -179,7 +176,6 @@ export default {
 					type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',
 					btnName: '导出',
 					name: 'export',
-					plain: true,
 					color: 'warning',
 				},
 			],
diff --git a/src/views/extend/processEquValueBom/add-or-updata.vue b/src/views/extend/processEquValueBom/add-or-updata.vue
index 3abaf2e4..2e37f62e 100644
--- a/src/views/extend/processEquValueBom/add-or-updata.vue
+++ b/src/views/extend/processEquValueBom/add-or-updata.vue
@@ -1,13 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
-<<<<<<< HEAD
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-28 10:09:20
-=======
- * @LastEditors: DY
- * @LastEditTime: 2023-11-27 16:37:17
->>>>>>> projects/mes-test
+ * @LastEditTime: 2023-12-04 14:02:52
  * @Description:
 -->
 <template>
@@ -19,8 +14,8 @@
       <div class="visual-part">
         <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
           label-width="100px" label-position="top">
-          <el-row :gutter="20">
-            <el-col :span="12">
+          <el-row :gutter="24">
+            <el-col :span="8">
               <el-form-item label="设备名称" prop="equipmentId">
                 <el-select v-model="dataForm.equipmentId" filterable :disabled="isdetail" style="width: 100%"
                   @change="getCode" placeholder="请选择设备名称">
@@ -28,53 +23,55 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
               <el-form-item label="设备编码" prop="equipmentCode">
                 <el-input v-model="dataForm.equipmentCode" clearable :disabled="isdetail" placeholder="请输入设备编码" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
+            <el-col :span="8">
               <el-form-item label="参数Bom编码" prop="code">
                 <el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入参数Bom编码" />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="8">
               <el-form-item label="设备参数BOM名称" prop="name">
                 <el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入设备参数BOM名称" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
+            <el-col :span="8">
               <el-form-item label="当前状态" prop="enabled">
-                <el-switch v-model="dataForm.enabled" :active-value="1" :inactive-value="0" />
+                <!-- <el-switch v-model="dataForm.enabled" :active-value="1" :inactive-value="0" /> -->
+                <el-select v-model="dataForm.enabled" filterable :disabled="isdetail" style="width: 100%"
+                  placeholder="请选择当前状态">
+                  <el-option v-for="dict in enableList" :key=" dict.id" :label="dict.name" :value="dict.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="备注" prop="remark">
+                <el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
-          </el-form-item>
+
         </el-form>
       </div>
-      <div v-if="!isdetail" class="drawer-body__footer">
-        <el-button style="" @click="goback()">取消</el-button>
-        <el-button v-if="isdetail" type="primary" @click="goEdit()">
-          编辑
-        </el-button>
-        <el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
-      </div>
+      <!-- <div v-if="!isdetail" class="drawer-body__footer">
+
+      </div> -->
 
       <div class="attr-list" v-if="idAttrShow">
         <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
           设备参数
+          <el-button type="success" plain="true" @click="addNew()" icon="el-icon-plus">新增</el-button>
         </small-title>
 
         <div v-if="!isdetail" class="action_btn">
           <template>
             <span style="display: inline-block;">
-              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
+
             </span>
           </template>
         </div>
@@ -85,14 +82,12 @@
         </base-table>
         <pagination v-show="listQuery.total > 0" :total="listQuery.total" :page.sync="listQuery.pageNo"
           :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
-
-        <div class="drawer-body__footer">
-          <el-button type="primary" @click="goback()">关闭</el-button>
-        </div>
       </div>
-
     </div>
-
+    <div class="drawer-body__footer">
+      <el-button style="" @click="goback()">取消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+    </div>
     <attr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :product-id="dataForm.id" @refreshDataList="getList" />
   </el-drawer>
 </template>
@@ -173,7 +168,17 @@ export default {
 			tableBtn,
 			tableProps,
 			topBtnConfig,
-			addOrUpdateVisible: false,
+      addOrUpdateVisible: false,
+      enableList: [
+        {
+          id: 0,
+          name: '停用'
+        },
+        {
+          id: 1,
+          name:'启用'
+        }
+      ],
 			urlOptions: {
 			  isGetCode: false,
         // codeURL: getCode,
@@ -274,7 +279,29 @@ export default {
 			} else {
 				this.addNew(raw.data.id);
 			}
-		},
+    },
+    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.idAttrShow = true;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
 		getList() {
 			// 获取产品属性列表
       processEquValueBomDetPage({
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue b/src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue
index 0cae68d9..90f29484 100644
--- a/src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue
@@ -37,70 +37,7 @@
         ]">
           <el-input v-model="dataForm.buttonId" @change="$emit('update', dataForm)" placeholder="请输入整数" />
         </el-form-item>
-				<el-form-item
-					label="产线"
-					prop="productionLineId"
-					:rules="[
-						{ required: true, message: '产线不能为空', trigger: 'blur' },
-					]">
-					<el-select
-						v-model="dataForm.productionLineId"
-						placeholder="请选择产线"
-						filterable
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="工段"
-					prop="sectionId"
-					:rules="[
-						{ required: true, message: '工段不能为空', trigger: 'blur' },
-					]">
-					<el-select
-						v-model="dataForm.sectionId"
-						placeholder="请选择工段"
-						filterable
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in workshopSectionList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="按钮盒识别码"
-					prop="buttonId"
-					:rules="[
-						{
-							required: true,
-							message: '按钮盒识别码不能为空',
-							trigger: 'blur',
-						},
-						{
-							type: 'number',
-							message: '请输入整数',
-							trigger: 'blur',
-							transform: (val) => Number.isInteger(Number(val)) && Number(val),
-						},
-					]">
-					<el-input
-						v-model="dataForm.buttonId"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入整数" />
-				</el-form-item>
-			</el-col>
-
+      </el-col>
       <el-col :span="12">
         <el-form-item label="按钮值" prop="keyValue" :rules="[
         	{ required: true, message: '不能为空', trigger: 'blur' },
@@ -121,8 +58,9 @@
       </el-col>
 
       <el-col :span="12">
-        <el-form-item label="检测内容" prop="inspectionDetId">
-          <el-select v-model="dataForm.inspectionDetId" placeholder="请选择检测内容" filterable
+        <el-form-item label="检测内容" prop="inspectionDetContent"
+          :rules="[{ required: true, message: '不能为空', trigger: 'change' }]">
+          <el-select v-model="dataForm.inspectionDetContent" placeholder="请选择检测内容" filterable
             @change="$emit('update', dataForm)">
             <el-option v-for="opt in inspectionDetList" :key="opt.value" :label="opt.label" :value="opt.value" />
           </el-select>
@@ -206,7 +144,7 @@ export default {
       if (res.code == 0) {
         this.inspectionDetList = res.data.map((item) => ({
           label: item.content,
-          value: item.id,
+          value: item.content,
         }));
       }
       this.formLoading = false;
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
index a169cd13..2947331d 100644
--- a/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
@@ -222,7 +222,7 @@ export default {
 			form: {
 				id: null,
 				buttonId: null,
-        inspectionDetId: null,
+        inspectionDetContent: null,
         productionLineId: null,
 				sectionId: null,
 				model: null,
diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue
index 602f9fb2..881414c3 100644
--- a/src/views/quality/base/qualityInspectionDet/index.vue
+++ b/src/views/quality/base/qualityInspectionDet/index.vue
@@ -15,7 +15,7 @@
       @pagination="getList" />
 
     <!-- 对话框(添加 / 修改) -->
-    <base-dialog :dialogTitle="title" :dialogVisible="open" width="40%" @close="cancel" @cancel="cancel"
+    <base-dialog :dialogTitle="title" :dialogVisible="open" width="30%" @close="cancel" @cancel="cancel"
       @confirm="submitForm">
       <DialogForm v-if="open" ref="form" v-model="form" :rows="[
       	[
diff --git a/src/views/quality/base/qualityScrapLog/detail-or-updata.vue b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
index a689f27f..ae115c5d 100644
--- a/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
@@ -1,12 +1,12 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2023-11-07 19:38:13
+ * @LastEditTime: 2023-12-01 10:58:25
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
-  <el-dialog :visible.sync="dialogVisible" width="50%" :before-close="handleClose">
+  <el-dialog :visible.sync="visible" width="50%">
     <small-title slot="title" :no-padding="true">
       {{ '详情' }}
     </small-title>
@@ -118,7 +118,7 @@ export default {
           name: '自动',
         }
       ],
-      dialogVisible:false,
+      visible:false,
 			dataForm: {
         id: undefined,
         logTime: undefined,
@@ -144,79 +144,79 @@ export default {
 		};
 	},
 	mounted() {
-		// this.getDict()
+		this.getDict()
     console.log('我看看', this.dataForm)
     this.getCurrentTime()
 	},
   methods: {
-    init() {
-      this.dialogVisible = true
-    },
+    // init() {
+    //   this.dialogVisible = true
+    // },
     getCurrentTime() {
       // new Date().Format("yyyy-MM-dd HH:mm:ss")
       this.dataForm.logTime = new Date()
       // this.dataForm.logTime = year + "-" + month + "-" + day;
       console.log(this.dataForm.logTime);
     },
-		// async getDict() {
-		// 	// 物料列表
-    //   const res = await getList()
-    //   this.typeList = res.data
-    //   getWorkOrderList().then((res) => {
-    //     console.log(res);
-    //     // console.log(response);
-    //     this.workOrderList = res.data.map((item) => {
-    //       return {
-    //         name: item.name,
-    //         id: item.id
-    //       }
-    //     })
-    //     // console.log(this.formConfig[0].selectOptions);
-    //     // this.listQuery.total = response.data.total;
-    //   })
-    //   getLineList().then((res) => {
-    //     console.log(res);
-    //     // console.log(response);
-    //     this.lineList = res.data.map((item) => {
-    //       return {
-    //         name: item.name,
-    //         id: item.id
-    //       }
-    //     })
-    //     // console.log(this.formConfig[0].selectOptions);
-    //     // this.listQuery.total = response.data.total;
-    //   })
-    //   getDetList().then((res) => {
-    //     console.log(res);
-    //     // console.log(response);
-    //     this.workOrderList = res.data.map((item) => {
-    //       return {
-    //         name: item.name,
-    //         id: item.id
-    //       }
-    //     })
-    //     // console.log(this.formConfig[0].selectOptions);
-    //     // this.listQuery.total = response.data.total;
-    //   })
-    //   getTeamList().then((res) => {
-    //     console.log(res);
-    //     // console.log(response);
-    //     this.teamList = res.data.map((item) => {
-    //       return {
-    //         name: item.name,
-    //         id: item.id
-    //       }
-    //     })
-    //     // console.log(this.formConfig[0].selectOptions);
-    //     // this.listQuery.total = response.data.total;
-    //   })
-		// },
-		// setMaterialCode() {
-		// 	const chooseM = this.materialList.filter(item => {
-		// 		return item.id === this.dataForm.materialId
-		// 	})
-		// 	this.dataForm.materialCode = chooseM[0].code
-		// }
+		async getDict() {
+			// 物料列表
+      const res = await getList()
+      this.typeList = res.data
+      getWorkOrderList().then((res) => {
+        console.log(res);
+        // console.log(response);
+        this.workOrderList = res.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+        // console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+      getLineList().then((res) => {
+        console.log(res);
+        // console.log(response);
+        this.lineList = res.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+        // console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+      getDetList().then((res) => {
+        console.log(res);
+        // console.log(response);
+        this.workOrderList = res.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+        // console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+      getTeamList().then((res) => {
+        console.log(res);
+        // console.log(response);
+        this.teamList = res.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+        // console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+		},
+		setMaterialCode() {
+			const chooseM = this.materialList.filter(item => {
+				return item.id === this.dataForm.materialId
+			})
+			this.dataForm.materialCode = chooseM[0].code
+		}
 	},
 };
 </script>
diff --git a/src/views/quality/base/qualityScrapLog/index.vue b/src/views/quality/base/qualityScrapLog/index.vue
index 5237cb8d..b88d1891 100644
--- a/src/views/quality/base/qualityScrapLog/index.vue
+++ b/src/views/quality/base/qualityScrapLog/index.vue
@@ -40,7 +40,7 @@ const tableProps = [
     label: '工单'
   },
   {
-    prop: 'teamId',
+    prop: 'teamName',
     label: '班组'
   },
 	{
diff --git a/src/views/quality/base/qualityScrapType/add-or-updata.vue b/src/views/quality/base/qualityScrapType/add-or-updata.vue
index 6ef00826..a0b602e0 100644
--- a/src/views/quality/base/qualityScrapType/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapType/add-or-updata.vue
@@ -1,19 +1,20 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2023-11-24 08:42:18
+ * @LastEditTime: 2023-12-01 16:33:41
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
-  <el-form :model="dataForm"  :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()">
+  <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+    label-width="110px">
     <el-row :gutter="24">
       <el-col :span="12">
         <el-form-item label="报废类型编码" prop="code">
           <el-input v-model="dataForm.code" placeholder="请输入报废类型编码" />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="11">
         <el-form-item label="报废类型" prop="name">
           <el-input v-model="dataForm.name" placeholder="请输入报废类型" />
         </el-form-item>
@@ -21,12 +22,12 @@
     </el-row>
     <el-row :gutter="24">
       <el-col :span="12">
-        <el-form-item label="描述类型" prop="description">
+        <el-form-item label="描述类型" prop="description" label-width="110px">
           <el-input v-model="dataForm.description" clearable placeholder="描述类型" />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <el-form-item label="备注" prop="remark">
+      <el-col :span="11">
+        <el-form-item label="备注" prop="remark" label-width="110px">
           <el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
         </el-form-item>
       </el-col>
diff --git a/src/views/quality/monitoring/currentData/index.vue b/src/views/quality/monitoring/currentData/index.vue
index 0125ab85..c74ea2ac 100644
--- a/src/views/quality/monitoring/currentData/index.vue
+++ b/src/views/quality/monitoring/currentData/index.vue
@@ -307,6 +307,10 @@ export default {
             type: 'category',
             data: arrXAxis
           },
+          grid: {
+            left: '5%',
+            top:'2%'
+          },
           yAxis: {
             type: 'value'
           },
diff --git a/src/views/quality/monitoring/materielDateFrom/index.vue b/src/views/quality/monitoring/materielDateFrom/index.vue
index 07efb7d2..4929b7e8 100644
--- a/src/views/quality/monitoring/materielDateFrom/index.vue
+++ b/src/views/quality/monitoring/materielDateFrom/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-24 10:55:54
+ * @LastEditTime: 2023-12-01 16:41:40
  * @Description:
 -->
 <template>
@@ -57,7 +57,8 @@ const tableProps = [
   },
   {
     prop: 'userName',
-    label: '操作人'
+    label: '操作人',
+    showOverflowtooltip: true
   },
   {
     prop: 'source',
@@ -128,7 +129,7 @@ export default {
         },
         {
           type: 'button',
-          btnName: '搜索',
+          btnName: '查询',
           name: 'search',
           color: 'primary',
         },
@@ -161,7 +162,8 @@ export default {
           type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
         	btnName: '导出',
         	name: 'export',
-        	color: 'warning',
+          color: 'primary',
+          plain: true
         },
       ],
     };
diff --git a/src/views/quality/monitoring/processTraceability/index.vue b/src/views/quality/monitoring/processTraceability/index.vue
index 413e6889..531ce856 100644
--- a/src/views/quality/monitoring/processTraceability/index.vue
+++ b/src/views/quality/monitoring/processTraceability/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-28 10:51:44
+ * @LastEditTime: 2023-12-01 16:43:10
  * @Description:
 -->
 <template>
@@ -134,7 +134,7 @@ export default {
         },
         {
           type: 'button',
-          btnName: '搜索',
+          btnName: '查询',
           name: 'search',
           color: 'primary',
         },
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
index 9199e2fc..c25e4690 100644
--- a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
@@ -124,7 +124,8 @@ export default {
 		// 	immediate: true,
 		// },
 		dataForm: {
-			handler: function (dataForm) {
+      handler: function (dataForm) {
+        console.log(dataForm);
 				this.innerDataForm = Object.assign({}, dataForm);
 
 				if (dataForm.productionLineId)
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/index.vue b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
index baac3742..38650b71 100644
--- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
@@ -66,7 +66,19 @@ export default {
 	mixins: [basicPageMixin],
 	data() {
 		return {
-			rows: [
+      rows: [
+        [
+          {
+            select: true,
+            label: '工单名称',
+            url: 'base/core-work-order/listbyfilter',
+            prop: 'workOrderId',
+            rules: [{ required: true, message: '工单名称不能为空', trigger: 'change' }],
+            bind: {
+              filterable: true,
+            },
+          }
+        ],
 				[
 					{
 						select: true,
@@ -122,18 +134,7 @@ export default {
 						label: '检测人员',
 						prop: 'checkPerson',
 					},
-					{
-						datetime: true,
-						label: '检测时间',
-						prop: 'checkTime',
-						rules: [{ required: true, message: '检测时间不能为空', trigger: 'blur' }],
-						bind: {
-							format: 'yyyy-MM-dd HH:mm:ss',
-							'value-format': 'timestamp',
-							// 'value-format': 'yyyy-MM-dd HH:mm:ss',
-							clearable: true,
-						},
-					},
+
 				],
 				[{ textarea: true, label: '描述', prop: 'explainText' }],
 				[{ input: true, label: '备注', prop: 'remark' }],
@@ -224,7 +225,7 @@ export default {
 				},
 				{
 					// width: 128,
-					prop: 'lineName',
+          prop: 'productionLineName',
 					label: '产线',
 				},
 				{
@@ -247,9 +248,10 @@ export default {
 				},
 			],
 			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
-			searchBarKeys: ['inspectionDetContent', 'checkTime', 'productionLineId'],
+      searchBarKeys: ['inspectionDetContent', 'checkTime', 'workOrderId'],
 			form: {
-				id: undefined,
+        id: undefined,
+        // workOrderId:undefined,
 				inspectionDetId: undefined,
 				inspectionDetContent: undefined,
 				productionLineId: undefined,
@@ -354,7 +356,8 @@ export default {
 				inspectionDetContent: undefined,
 				sectionId: undefined,
 				checkPerson: undefined,
-				checkTime: undefined,
+        checkTime: undefined,
+        workOrderId:undefined,
 				source: undefined,
 				explainText: undefined,
 				remark: undefined,
@@ -383,12 +386,14 @@ export default {
 			this.reset();
 			const id = row.id;
 			getQualityInspectionRecord(id).then((response) => {
-				/** 因为后端返回的时间是时间戳格式，需转换 */
+        /** 因为后端返回的时间是时间戳格式，需转换 */
+        console.log(response.data);
 				const info = {}
 				Object.keys(this.form).forEach(key => {
 					info[key] = response.data[key]
 				});
-				this.form = info;
+        this.form = info;
+        console.log(this.form);
 				this.open = true;
 				this.title = '修改质量检查信息记录表';
 			});
diff --git a/src/views/quality/monitoring/rawMaterialTraceability/index.vue b/src/views/quality/monitoring/rawMaterialTraceability/index.vue
index af0ab14e..9cdb23c1 100644
--- a/src/views/quality/monitoring/rawMaterialTraceability/index.vue
+++ b/src/views/quality/monitoring/rawMaterialTraceability/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-10 16:26:45
+ * @LastEditTime: 2023-12-01 16:38:00
  * @Description:
 -->
 <template>
@@ -123,7 +123,7 @@ export default {
         // },
         {
           type: 'button',
-          btnName: '搜索',
+          btnName: '查询',
           name: 'search',
           color: 'primary',
         },
diff --git a/src/views/quality/monitoring/statisticalData/index.vue b/src/views/quality/monitoring/statisticalData/index.vue
index e4db32b7..4fcb15db 100644
--- a/src/views/quality/monitoring/statisticalData/index.vue
+++ b/src/views/quality/monitoring/statisticalData/index.vue
@@ -351,7 +351,7 @@ export default {
           ...keyValuePairs,
           sumInput: item.sumInput,
           productionName: item.productionName,
-          workOrderId: item.workOrderId,
+          workOrderName: item.workOrderName,
           scrapRatio: item.scrapRatio,
         };
       });

From 1ce61f13b7d49998ddbe27c48a456bff751e68d7 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Tue, 5 Dec 2023 14:30:32 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=8E=9F=E6=A8=A1=E5=9D=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=83=BD=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |   4 +-
 src/api/base/energyQuantityManual.js          |  56 +++
 src/utils/dict.js                             |   2 +
 .../components/energyQuantityManualAdd.vue    | 150 ++++++++
 .../base/energyQuantityManual/index.vue       | 332 ++++++++++++++++++
 .../base/energyType/components/InnerTable.vue |   9 +-
 .../energyType/components/energyTypeAdd.vue   |  10 +
 .../energyLimit/components/energyLimitAdd.vue |  85 +++--
 .../energy/monitoring/energyLimit/index.vue   |  10 +
 .../monitoring/energyOverlimitLog/index.vue   | 114 +++++-
 .../group/base/groupTeamScheduling/index.vue  |   4 +-
 .../voc/vocDetectionHistory/index.vue         |   8 +
 .../voc/vocDetectionIndication/index.vue      |   8 +
 .../environmental/voc/vocManagement/index.vue |   8 +
 .../wasteGasDetectionHistory/index.vue        |   8 +
 .../wasteGasDetectionIndication/index.vue     |   8 +
 .../wasteGas/wasteGasManagement/index.vue     |   8 +
 .../wasteWaterDetectionHistory/index.vue      |   8 +
 .../components/wasteWaterAdd.vue              | 161 +++++++++
 .../wasteWaterDetectionIndication/index.vue   | 202 +++++++++++
 .../wasteWater/wasteWaterManagement/index.vue |   8 +
 21 files changed, 1159 insertions(+), 44 deletions(-)
 create mode 100644 src/api/base/energyQuantityManual.js
 create mode 100644 src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
 create mode 100644 src/views/energy/base/energyQuantityManual/index.vue
 create mode 100644 src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
 create mode 100644 src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
 create mode 100644 src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue
 create mode 100644 src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
 create mode 100644 src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
 create mode 100644 src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue
 create mode 100644 src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
 create mode 100644 src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/components/wasteWaterAdd.vue
 create mode 100644 src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
 create mode 100644 src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue

diff --git a/.env.dev b/.env.dev
index 1da25e71..8b5bbe52 100644
--- a/.env.dev
+++ b/.env.dev
@@ -13,8 +13,8 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
+# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8: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/utils/dict.js b/src/utils/dict.js
index ecaafb16..64695e1e 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',
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..8d40d3d8
--- /dev/null
+++ b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
@@ -0,0 +1,150 @@
+<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"
+            value-format="yyyy-MM-dd"
+            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) {
+      console.log(params)
+      this.form.recordTime = moment().format('YYYY-MM-DD')
+      console.log(this.form.recordTime)
+      if (params.type === 'add') {
+        this.isEdit = false
+      } else if (params.type === 'meterReading') {
+        this.isEdit = false
+        this.form.energyTypeId = params.energyType
+        this.form.tableName = params.tableName + ''
+      }else {
+        this.isEdit = true
+        this.form.id = params.id
+        energyQuantityManualGet({id: this.form.id}).then(res => {
+          console.log(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("抄表数单位不能为空");
+          }
+          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..33a5edf2
--- /dev/null
+++ b/src/views/energy/base/energyQuantityManual/index.vue
@@ -0,0 +1,332 @@
+<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 } from '@/utils/ruoyi'
+// import FileSaver from "file-saver"
+// import * as XLSX from 'xlsx/xlsx.mjs'
+import EnergyQuantityManualAdd from './components/energyQuantityManualAdd.vue'
+import moment from 'moment'
+const tableProps = [
+  {
+    prop: 'energyType',
+    label: '能源类型'
+  },
+  {
+    prop: 'tableName',
+    label: '水/气表名',
+    filter: publicFormatter('table_name')
+  },
+  {
+    prop: 'recordTime',
+    label: '抄表日期',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'readingQuantity',
+    label: '抄表值'
+  },
+  {
+    prop: 'recordTimeLast',
+    label: '上期抄表日期',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'readingQuantityLast',
+    label: '上期抄表值'
+  },
+  {
+    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
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        energyTypeId: '',
+        recordTime: []
+      },
+      energyTypeList: [],
+      exportList: [],
+      addOrEditTitle: '',
+      centervisible: false,
+
+    };
+  },
+  components: { EnergyQuantityManualAdd },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    if (location.href.indexOf('?') > 0) {
+      let arr = location.href.split('?')[1].split('&')
+      this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
+      this.queryParams.recordTime[0] = arr[0].split('=')[1]
+      this.queryParams.recordTime[1] = arr[1].split('=')[1]
+    } else {
+      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()
+  },
+  watch: {
+    $route: 'initData'
+  },
+  methods: {
+    initData(to) {
+      if (to.name === 'EnergyQuantityManual') {
+        if (location.href.indexOf('?') > 0) {
+          let arr = location.href.split('?')[1].split('&')
+          this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
+          this.queryParams.recordTime[0] = arr[0].split('=')[1]
+          this.queryParams.recordTime[1] = arr[1].split('=')[1]
+        } else {
+          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()
+      }
+    },
+    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.energyType = val.data.energyType
+          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..c7bfcfa7 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: {
@@ -87,6 +89,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 +98,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/energyTypeAdd.vue b/src/views/energy/base/energyType/components/energyTypeAdd.vue
index 78142f38..73c8cd2a 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
@@ -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..c9284dea 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"
@@ -65,6 +80,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 +143,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 +207,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..2682c964 100644
--- a/src/views/group/base/groupTeamScheduling/index.vue
+++ b/src/views/group/base/groupTeamScheduling/index.vue
@@ -290,8 +290,8 @@ 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
+            // path: '/energy/base/energy-quantity-realtime?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
+            path: '/energy/base/energy-quantity-manual?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
           })
           break;
         default:
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..29bbaec7
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>vocDetectionHistory</div>
+</template>
+<script>
+export default {
+  name: 'VocDetectionHistory'
+}
+</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..5df72f90
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>vocDetectionIndication</div>
+</template>
+<script>
+export default {
+  name: 'VocDetectionIndication'
+}
+</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..53bdef7e
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>voc</div>
+</template>
+<script>
+export default {
+  name: 'Voc'
+}
+</script>
\ 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..02e88ac7
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>wasteGasDetectionHistory</div>
+</template>
+<script>
+export default {
+  name: 'WasteGasDetectionHistory'
+}
+</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..f4db26d6
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>wasteGasDetectionIndication</div>
+</template>
+<script>
+export default {
+  name: 'WasteGasDetectionIndication'
+}
+</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..89de720d
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>wasteGas</div>
+</template>
+<script>
+export default {
+  name: 'WasteGas'
+}
+</script>
\ 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..1fe831bd
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>wasteWaterDetectionHistory</div>
+</template>
+<script>
+export default {
+  name: 'WasteWaterDetectionHistory'
+}
+</script>
\ 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..5785dbd3
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/components/wasteWaterAdd.vue
@@ -0,0 +1,161 @@
+<template>
+  <el-form ref="wasteWaterAddForm" :rules="rules" label-width="130px" :model="form">
+    <el-row :gutter="20">
+      <el-col :span='12'>
+        <el-form-item label="指标名称" prop="name">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="指标编码" prop="code">
+          <el-input v-model="form.code"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="指标名称" prop="name1">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="最小值" prop="code11">
+          <el-input v-model="form.code"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="最大值" prop="name12">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="备注" prop="code1122">
+          <el-input v-model="form.code"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+export default {
+  name: 'WasteWaterAdd',
+  data() {
+    return {
+      // rules: {
+      //   name: [{ required: true, message: "订单名称不能为空", trigger: "blur" }],
+      //   code: [{ required: true, message: "订单号不能为空", trigger: "blur" }],
+      //   planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }],
+      //   planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }]
+      // }
+    }
+  },
+  methods: {
+  //   init(id) {
+  //     this.getList()
+  //     if (id) {
+  //       this.isEdit = true
+  //       this.form.id = id
+  //       getOrderById({id: this.form.id}).then(res => {
+  //         if (res.code === 0) {
+  //           this.form.name = res.data.name
+  //           this.form.code = res.data.code
+  //           this.form.planQuantity = res.data.planQuantity
+  //           this.form.planProductId = res.data.planProductId
+  //           this.form.price = res.data.price
+  //           this.form.customerId = res.data.customerId
+  //           this.form.priority = res.data.priority ? res.data.priority + '' : ''
+  //           this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
+  //           this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : ''
+  //           this.form.workers = res.data.workers
+  //           this.form.processFlowId = res.data.processFlowId
+  //           this.form.materialMethod = res.data.materialMethod
+  //           this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null
+  //           this.form.remark = res.data.remark
+  //           // this.form.description = res.data.description
+  //         }
+  //       })
+  //     } else {
+  //       this.isEdit = false
+  //       this.form.id = ''
+  //       // 订单号
+  //       getOrderCode().then(res => {
+  //         this.form.code = res.data || ''
+  //       })
+  //     }
+  //   },
+  //   getList() {
+  //     // 产品
+  //     getProductAll().then(res => {
+  //       this.productList = res.data || []
+  //     })
+  //     // 客户
+  //     getCustomerList().then(res => {
+  //       this.customerList = res.data || []
+  //     })
+  //     // 工艺
+  //     getProcessFlowList().then(res => {
+  //       this.processFlowList = res.data || []
+  //     })
+  //   },
+  //   timeChange() {
+  //     if (this.form.planStartTime && this.form.planFinishTime) {
+  //       if (this.form.planStartTime > this.form.planFinishTime) {
+  //         this.$modal.msgError('计划开始时间不能大于结束时间')
+  //       }
+  //     }
+  //   },
+  //   // 工艺变更
+  //   materialMethodChange(val) {
+  //     if (val === 2 && !this.form.processFlowId) {
+  //       this.form.materialMethod = 1
+  //       this.$modal.msgError("请先选择关联工艺");
+  //     }
+  //   },
+  //   // 工艺变更
+  //   processFlowIdChange(val) {
+  //     console.log(val)
+  //     if (!val) {
+  //       this.form.materialMethod = 1
+  //     }
+  //   },
+  //   submitForm() {
+  //     this.$refs['orderAddForm'].validate((valid) => {
+  //       if (valid) {
+  //         if (this.form.planStartTime && this.form.planFinishTime) {
+  //           if (this.form.planStartTime > this.form.planFinishTime) {
+  //             this.$modal.msgError('计划开始时间不能大于结束时间')
+  //             return false
+  //           }
+  //         }
+  //         // console.log(this.form)
+  //         if (this.isEdit) {
+  //           //编辑
+  //           orderUpdate({ ...this.form }).then((res) => {
+  //             if (res.code === 0) {
+  //               this.$modal.msgSuccess("操作成功");
+  //               this.$emit('successSubmit')
+  //             }
+  //           })
+  //         } else {
+  //           this.form.status = 1
+  //           this.form.triggerOrigin = 1
+  //           orderCreate({ ...this.form }).then((res) => {
+  //             if (res.code === 0) {
+  //               this.$modal.msgSuccess("操作成功");
+  //               this.$emit('successSubmit')
+  //             }
+  //           })
+  //         }
+  //       } else {
+  //         return false
+  //       }
+  //     })
+  //   },
+  //   formClear() {
+  //     this.$refs.orderAddForm.resetFields()
+  //     this.form.materialMethod = 1
+  //     this.form.price = 0.00
+  //     this.form.planQuantity = 0
+  //     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..fff53a19
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
@@ -0,0 +1,202 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <search-bar
+      :formConfigs="formConfig"
+      ref="searchBarForm"
+      @headBtnClick="buttonClick"
+    />
+    <!-- 列表 -->
+    <base-table
+      :page="queryParams.pageNo"
+      :limit="queryParams.pageSize"
+      :table-props="tableProps"
+      :table-data="list"
+      :max-height="tableH"
+    >
+      <method-btn
+        v-if="tableBtn.length"
+        slot="handleBtn"
+        :width="120"
+        label="操作"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <pagination
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
+    <!-- 新增&编辑 -->
+    <base-dialog
+      :dialogTitle="addOrEditTitle"
+      :dialogVisible="centervisible"
+      @cancel="handleCancel"
+      @confirm="handleConfirm"
+      :before-close="handleCancel"
+      width='60%'
+    >
+      <waste-water-add ref="wasteWaterAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+// import { publicFormatter } from '@/utils/dict'
+const tableProps = [
+  {
+    prop: 'name',
+    label: '指示名称',
+    minWidth: 120,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'code',
+    label: '指示编码',
+    minWidth: 120
+  },
+  {
+    prop: 'customerId',
+    label: '单位'
+  },
+  {
+    prop: 'customerId1',
+    label: '最小值'
+  },
+  {
+    prop: 'customerId2',
+    label: '最大值'
+  },
+  {
+    prop: 'customerId3',
+    label: '创建人'
+  },
+  // {
+  //   prop: 'triggerOrigin',
+  //   label: '来源',
+  //   filter: publicFormatter('order_Origin')
+  // },
+  {
+    prop: 'createTime',
+    label: '创建时间',
+    filter: parseTime,
+    minWidth: 160
+  }
+]
+export default {
+  name: 'WasteWaterDetectionIndication',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'select',
+          label: '指标名称',
+          selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
+          labelField: 'label',
+          valueField: 'value',
+          param: 'name'
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+          btnName: '新增',
+          name: 'add',
+          color: 'success',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        name: null,
+        status: null
+      },
+      total: 0,
+      tableProps,
+      list: [
+        {name:'1111'}
+      ],
+      tableH: this.tableHeight(260),
+      tableBtn: [
+        this.$auth.hasPermi('base:order-manage:edit')
+          ? {
+              type: 'edit',
+              btnName: '编辑'
+            }
+          : undefined,
+        this.$auth.hasPermi('base:order-manage:delete')
+          ? {
+              type: 'delete',
+              btnName: '删除'
+            }
+          : undefined
+      ],
+      addOrEditTitle: '',
+      centervisible: false
+    }
+  },
+  methods: {
+    getList() {},
+    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 wasteWaterDelete({ 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..47fbfe48
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>wasteWater</div>
+</template>
+<script>
+export default {
+  name: 'WasteWater'
+}
+</script>
\ No newline at end of file

From fe0c84bc3a4096ae111c9462182222a2e7d924ca Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Wed, 6 Dec 2023 10:06:26 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=83=BD=E6=BA=90&bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  4 +-
 src/utils/ruoyi.js                            | 47 +++++++++++++-
 .../components/energyQuantityManualAdd.vue    | 11 ++--
 .../base/energyQuantityManual/index.vue       | 61 ++++++-------------
 .../base/energyType/components/InnerTable.vue |  1 -
 .../base/energyType/components/InputArea.vue  |  1 -
 .../energyType/components/TimePickerArea.vue  |  1 -
 .../energyType/components/energyTypeAdd.vue   |  8 +--
 .../monitoring/energyOverlimitLog/index.vue   |  1 +
 .../group/base/groupTeamScheduling/index.vue  |  3 +-
 src/views/system/dept/index.vue               |  1 +
 11 files changed, 79 insertions(+), 60 deletions(-)

diff --git a/.env.dev b/.env.dev
index 8b5bbe52..1da25e71 100644
--- a/.env.dev
+++ b/.env.dev
@@ -13,8 +13,8 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-VUE_APP_BASE_API = 'http://192.168.4.173:48080'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
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/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
index 8d40d3d8..1dda33d5 100644
--- a/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
+++ b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
@@ -45,7 +45,8 @@
           <el-date-picker
             v-model="form.recordTime"
             type="date"
-            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
+            value-format="timestamp"
             placeholder="选择日期"
             style="width: 100%;">
           </el-date-picker>
@@ -89,20 +90,17 @@ export default {
   },
   methods: {
     init(params) {
-      console.log(params)
-      this.form.recordTime = moment().format('YYYY-MM-DD')
-      console.log(this.form.recordTime)
+      this.form.recordTime = moment().valueOf()
       if (params.type === 'add') {
         this.isEdit = false
       } else if (params.type === 'meterReading') {
         this.isEdit = false
-        this.form.energyTypeId = params.energyType
+        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 => {
-          console.log(res)
           if (res.code === 0) {
             this.form.energyTypeId = res.data.energyTypeId
             this.form.tableName = res.data.tableName ? res.data.tableName+'' : ''
@@ -118,6 +116,7 @@ export default {
         if (valid) {
           if (!this.form.unit) {
             this.$modal.msgError("抄表数单位不能为空");
+            return false
           }
           if (this.isEdit) {
             // 编辑
diff --git a/src/views/energy/base/energyQuantityManual/index.vue b/src/views/energy/base/energyQuantityManual/index.vue
index 33a5edf2..e94da7bc 100644
--- a/src/views/energy/base/energyQuantityManual/index.vue
+++ b/src/views/energy/base/energyQuantityManual/index.vue
@@ -48,26 +48,29 @@
 import { energyQuantityManualPage, energyQuantityManualDelete, energyQuantityManualExport } from "@/api/base/energyQuantityManual"
 import { getEnergyTypeListAll } from "@/api/base/energyType"
 import { publicFormatter } from '@/utils/dict'
-import { parseTime } from '@/utils/ruoyi'
+import { parseTime, parseTimeTable } from '@/utils/ruoyi'
 // import FileSaver from "file-saver"
 // import * as XLSX from 'xlsx/xlsx.mjs'
-import EnergyQuantityManualAdd from './components/energyQuantityManualAdd.vue'
+import EnergyQuantityManualAdd from './components/energyQuantityManualAdd'
 import moment from 'moment'
 const tableProps = [
   {
     prop: 'energyType',
-    label: '能源类型'
+    label: '能源类型',
+    minWidth: 110,
+    showOverflowtooltip: true
   },
   {
     prop: 'tableName',
     label: '水/气表名',
-    filter: publicFormatter('table_name')
+    filter: publicFormatter('table_name'),
+    minWidth: 110
   },
   {
     prop: 'recordTime',
     label: '抄表日期',
-    filter: parseTime,
-    minWidth: 160
+    filter: parseTimeTable('{y}-{m}-{d}'),
+    minWidth: 110
   },
   {
     prop: 'readingQuantity',
@@ -76,12 +79,13 @@ const tableProps = [
   {
     prop: 'recordTimeLast',
     label: '上期抄表日期',
-    filter: parseTime,
-    minWidth: 160
+    filter: parseTimeTable('{y}-{m}-{d}'),
+    minWidth: 110
   },
   {
     prop: 'readingQuantityLast',
-    label: '上期抄表值'
+    label: '上期抄表值',
+    minWidth: 110
   },
   {
     prop: 'diff',
@@ -191,42 +195,15 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
     })
-    if (location.href.indexOf('?') > 0) {
-      let arr = location.href.split('?')[1].split('&')
-      this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
-      this.queryParams.recordTime[0] = arr[0].split('=')[1]
-      this.queryParams.recordTime[1] = arr[1].split('=')[1]
-    } else {
-      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
-    }
+    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()
   },
-  watch: {
-    $route: 'initData'
-  },
   methods: {
-    initData(to) {
-      if (to.name === 'EnergyQuantityManual') {
-        if (location.href.indexOf('?') > 0) {
-          let arr = location.href.split('?')[1].split('&')
-          this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
-          this.queryParams.recordTime[0] = arr[0].split('=')[1]
-          this.queryParams.recordTime[1] = arr[1].split('=')[1]
-        } else {
-          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()
-      }
-    },
     buttonClick(val) {
       this.queryParams.pageNo = 1;
       this.queryParams.energyTypeId = val.energyTypeId
@@ -293,7 +270,7 @@ export default {
           this.centervisible = true
           let paramB = {}
           paramB.type = 'meterReading'
-          paramB.energyType = val.data.energyType
+          paramB.energyTypeId = val.data.energyTypeId
           paramB.tableName = val.data.tableName
           this.$nextTick(() => {
             this.$refs.energyQuantityManualAdd.init(paramB)
diff --git a/src/views/energy/base/energyType/components/InnerTable.vue b/src/views/energy/base/energyType/components/InnerTable.vue
index c7bfcfa7..5eab7af9 100644
--- a/src/views/energy/base/energyType/components/InnerTable.vue
+++ b/src/views/energy/base/energyType/components/InnerTable.vue
@@ -80,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 = ''
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 73c8cd2a..0e9a9342 100644
--- a/src/views/energy/base/energyType/components/energyTypeAdd.vue
+++ b/src/views/energy/base/energyType/components/energyTypeAdd.vue
@@ -221,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 = ''
diff --git a/src/views/energy/monitoring/energyOverlimitLog/index.vue b/src/views/energy/monitoring/energyOverlimitLog/index.vue
index c9284dea..1cffef1e 100644
--- a/src/views/energy/monitoring/energyOverlimitLog/index.vue
+++ b/src/views/energy/monitoring/energyOverlimitLog/index.vue
@@ -43,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',
diff --git a/src/views/group/base/groupTeamScheduling/index.vue b/src/views/group/base/groupTeamScheduling/index.vue
index 2682c964..54800965 100644
--- a/src/views/group/base/groupTeamScheduling/index.vue
+++ b/src/views/group/base/groupTeamScheduling/index.vue
@@ -290,8 +290,7 @@ export default {
           break;
         case '2': // 能源
           this.$router.push({
-            // path: '/energy/base/energy-quantity-realtime?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
-            path: '/energy/base/energy-quantity-manual?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
+            path: '/energy/base/energy-quantity-realtime?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
           })
           break;
         default:
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>

From 8fdaa3e9683ab77108fa0852ce8484a7add80d3a Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Fri, 8 Dec 2023 17:03:01 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |    4 +-
 src/api/safetyEnvironmental/environmental.js  |   92 +
 src/assets/images/detectionData.png           |  Bin 0 -> 1591 bytes
 src/utils/dict.js                             |    3 +
 .../base/energyQuantityManual/index.vue       |    2 +-
 .../voc/vocDetectionHistory/index.vue         |  163 +-
 .../components/vocAdd.vue                     |  124 ++
 .../voc/vocDetectionIndication/index.vue      |  201 +-
 .../environmental/voc/vocManagement/index.vue |  122 +-
 .../wasteGasDetectionHistory/index.vue        |  163 +-
 .../components/wasteGasAdd.vue                |  124 ++
 .../wasteGasDetectionIndication/index.vue     |  201 +-
 .../wasteGas/wasteGasManagement/index.vue     |  122 +-
 .../wasteWaterDetectionHistory/index.vue      |  167 +-
 .../components/wasteWaterAdd.vue              |  211 +--
 .../wasteWaterDetectionIndication/index.vue   |   61 +-
 .../components/lineChart.vue                  |  128 ++
 .../wasteWater/wasteWaterManagement/index.vue |  169 +-
 yarn.lock                                     | 1624 ++++++++---------
 19 files changed, 2670 insertions(+), 1011 deletions(-)
 create mode 100644 src/api/safetyEnvironmental/environmental.js
 create mode 100644 src/assets/images/detectionData.png
 create mode 100644 src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/components/vocAdd.vue
 create mode 100644 src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/components/wasteGasAdd.vue
 create mode 100644 src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/components/lineChart.vue

diff --git a/.env.dev b/.env.dev
index 1da25e71..66e48313 100644
--- a/.env.dev
+++ b/.env.dev
@@ -13,14 +13,14 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # 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.62:48080'
 
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
diff --git a/src/api/safetyEnvironmental/environmental.js b/src/api/safetyEnvironmental/environmental.js
new file mode 100644
index 00000000..2adb8e10
--- /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(query) {
+  return request({
+    url: '/base/environmental-check-record/trend',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得环保检测指标分页
+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(query) {
+  return request({
+    url: '/base/environmental-check-record/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出环保检测记录 Excel
+export function environmentalCheckRecordExport(query) {
+  return request({
+    url: '/base/environmental-check-record/export-excel',
+    method: 'get',
+    params: query,
+    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/detectionData.png b/src/assets/images/detectionData.png
new file mode 100644
index 0000000000000000000000000000000000000000..7142140d04f147eb56adf862dd3f223e638b9b86
GIT binary patch
literal 1591
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

literal 0
HcmV?d00001

diff --git a/src/utils/dict.js b/src/utils/dict.js
index 64695e1e..7030db51 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -106,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/views/energy/base/energyQuantityManual/index.vue b/src/views/energy/base/energyQuantityManual/index.vue
index e94da7bc..39d25b8b 100644
--- a/src/views/energy/base/energyQuantityManual/index.vue
+++ b/src/views/energy/base/energyQuantityManual/index.vue
@@ -175,7 +175,7 @@ export default {
               btnName: '删除'
             }
           : undefined
-      ],
+      ].filter((v)=>v),
       // 查询参数
       queryParams: {
         pageNo: 1,
diff --git a/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue b/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
index 29bbaec7..40b0bb02 100644
--- a/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
@@ -1,8 +1,167 @@
 <template>
-  <div>vocDetectionHistory</div>
+  <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"
+    />
+    <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'
+  name: 'VocDetectionHistory',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'select',
+          label: '指标名称',
+          selectOptions: [],
+          param: 'checkId'
+        },
+        {
+          type: 'datePicker',
+          label: '时间',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 350
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+          btnName: '导出',
+          name: 'export',
+          color: 'primary',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        checkId: null,
+        checkType: 3,
+        checkTime: [],
+      },
+      tableProps,
+      list: [],
+      total: 0,
+      tableH: this.tableHeight(260)
+    }
+  },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    let end = moment().format('YYYY-MM-DD 23:59:59')
+    let start = moment().format('YYYY-MM-DD 00:00:00')
+    this.formConfig[1].defaultSelect = [start, end]
+    this.queryParams.checkTime[0] = start
+    this.queryParams.checkTime[1] = end
+    this.getSelectList()
+    this.getList()
+  },
+  methods: {
+    buttonClick(val) {
+      this.queryParams.pageNo = 1;
+      this.queryParams.checkId = val.checkId
+      this.queryParams.checkTime[0] = val.timeVal ? val.timeVal[0] : null
+      this.queryParams.checkTime[1] = 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 || []
+      })
+    }
+  }
 }
 </script>
\ 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
index 5df72f90..356822e0 100644
--- a/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
@@ -1,8 +1,205 @@
 <template>
-  <div>vocDetectionIndication</div>
+  <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'
+  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
index 53bdef7e..2d2efcc4 100644
--- a/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue
+++ b/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue
@@ -1,8 +1,124 @@
 <template>
-  <div>voc</div>
+  <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>
+    </div>
+  </div>
 </template>
 <script>
+import { environmentalCheckRealtime } from '@/api/safetyEnvironmental/environmental'
 export default {
-  name: 'Voc'
+  name: 'Voc',
+  data(){
+    return {
+      realtimeList:[]
+    }
+  },
+  mounted() {
+    this.getMsg()
+  },
+  methods: {
+    getMsg() {
+      environmentalCheckRealtime({checkType: 3}).then(res => {
+        console.log(res)
+        this.realtimeList = res.data || []
+      })
+    }
+  }
 }
-</script>
\ No newline at end of file
+</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
index 02e88ac7..273ec775 100644
--- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
@@ -1,8 +1,167 @@
 <template>
-  <div>wasteGasDetectionHistory</div>
+  <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"
+    />
+    <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'
+  name: 'WasteGasDetectionHistory',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'select',
+          label: '指标名称',
+          selectOptions: [],
+          param: 'checkId'
+        },
+        {
+          type: 'datePicker',
+          label: '时间',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 350
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+          btnName: '导出',
+          name: 'export',
+          color: 'primary',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        checkId: null,
+        checkType: 2,
+        checkTime: [],
+      },
+      tableProps,
+      list: [],
+      total: 0,
+      tableH: this.tableHeight(260)
+    }
+  },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    let end = moment().format('YYYY-MM-DD 23:59:59')
+    let start = moment().format('YYYY-MM-DD 00:00:00')
+    this.formConfig[1].defaultSelect = [start, end]
+    this.queryParams.checkTime[0] = start
+    this.queryParams.checkTime[1] = end
+    this.getSelectList()
+    this.getList()
+  },
+  methods: {
+    buttonClick(val) {
+      this.queryParams.pageNo = 1;
+      this.queryParams.checkId = val.checkId
+      this.queryParams.checkTime[0] = val.timeVal ? val.timeVal[0] : null
+      this.queryParams.checkTime[1] = 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 || []
+      })
+    }
+  }
 }
 </script>
\ 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
index f4db26d6..58c113b9 100644
--- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
@@ -1,8 +1,205 @@
 <template>
-  <div>wasteGasDetectionIndication</div>
+  <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'
+  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
index 89de720d..a4c4e47a 100644
--- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue
@@ -1,8 +1,124 @@
 <template>
-  <div>wasteGas</div>
+  <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>
+    </div>
+  </div>
 </template>
 <script>
+import { environmentalCheckRealtime } from '@/api/safetyEnvironmental/environmental'
 export default {
-  name: 'WasteGas'
+  name: 'WasteGasManagement',
+  data(){
+    return {
+      realtimeList:[]
+    }
+  },
+  mounted() {
+    this.getMsg()
+  },
+  methods: {
+    getMsg() {
+      environmentalCheckRealtime({checkType: 2}).then(res => {
+        console.log(res)
+        this.realtimeList = res.data || []
+      })
+    }
+  }
 }
-</script>
\ No newline at end of file
+</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
index 1fe831bd..b3cf394f 100644
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
@@ -1,8 +1,171 @@
 <template>
-  <div>wasteWaterDetectionHistory</div>
+  <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"
+    />
+    <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'
+  name: 'WasteWaterDetectionHistory',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'select',
+          label: '指标名称',
+          selectOptions: [],
+          param: 'checkId'
+        },
+        {
+          type: 'datePicker',
+          label: '检测时间',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 350
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+          btnName: '导出',
+          name: 'export',
+          color: 'primary',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        checkId: null,
+        checkType: 1,
+        // checkTime: [],
+      },
+      tableProps,
+      list: [],
+      total: 0,
+      tableH: this.tableHeight(260)
+    }
+  },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    let end = moment().format('YYYY-MM-DD 23:59:59')
+    let start = moment().format('YYYY-MM-DD 00:00:00')
+    this.formConfig[1].defaultSelect = [start, end]
+    this.queryParams.checkTime[0] = start
+    this.queryParams.checkTime[1] = end
+    this.getSelectList()
+    this.getList()
+  },
+  methods: {
+    buttonClick(val) {
+      this.queryParams.pageNo = 1;
+      this.queryParams.checkId = val.checkId
+      // this.queryParams.checkTime[0] = val.timeVal ? val.timeVal[0] : null
+      // this.queryParams.checkTime[1] = val.timeVal ? val.timeVal[1] : null
+      // this.queryParams.checkTime[0] = 1701014400000
+      // this.queryParams.checkTime[1] = 1701100800000
+      this.queryParams.startTime = 1701014400000
+      this.queryParams.endTime = 1701100800000
+      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 || []
+      })
+    }
+  }
 }
 </script>
\ 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
index 5785dbd3..df0b2ded 100644
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/components/wasteWaterAdd.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/components/wasteWaterAdd.vue
@@ -1,9 +1,9 @@
 <template>
-  <el-form ref="wasteWaterAddForm" :rules="rules" label-width="130px" :model="form">
+  <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"></el-input>
+          <el-input v-model="form.name" :disabled='isEdit'></el-input>
         </el-form-item>
       </el-col>
       <el-col :span='12'>
@@ -12,150 +12,113 @@
         </el-form-item>
       </el-col>
       <el-col :span='12'>
-        <el-form-item label="指标名称" prop="name1">
-          <el-input v-model="form.name"></el-input>
+        <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="code11">
-          <el-input v-model="form.code"></el-input>
+        <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="name12">
-          <el-input v-model="form.name"></el-input>
+        <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="code1122">
-          <el-input v-model="form.code"></el-input>
+        <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 {
-      // rules: {
-      //   name: [{ required: true, message: "订单名称不能为空", trigger: "blur" }],
-      //   code: [{ required: true, message: "订单号不能为空", trigger: "blur" }],
-      //   planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }],
-      //   planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }]
-      // }
+      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) {
-  //     this.getList()
-  //     if (id) {
-  //       this.isEdit = true
-  //       this.form.id = id
-  //       getOrderById({id: this.form.id}).then(res => {
-  //         if (res.code === 0) {
-  //           this.form.name = res.data.name
-  //           this.form.code = res.data.code
-  //           this.form.planQuantity = res.data.planQuantity
-  //           this.form.planProductId = res.data.planProductId
-  //           this.form.price = res.data.price
-  //           this.form.customerId = res.data.customerId
-  //           this.form.priority = res.data.priority ? res.data.priority + '' : ''
-  //           this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
-  //           this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : ''
-  //           this.form.workers = res.data.workers
-  //           this.form.processFlowId = res.data.processFlowId
-  //           this.form.materialMethod = res.data.materialMethod
-  //           this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null
-  //           this.form.remark = res.data.remark
-  //           // this.form.description = res.data.description
-  //         }
-  //       })
-  //     } else {
-  //       this.isEdit = false
-  //       this.form.id = ''
-  //       // 订单号
-  //       getOrderCode().then(res => {
-  //         this.form.code = res.data || ''
-  //       })
-  //     }
-  //   },
-  //   getList() {
-  //     // 产品
-  //     getProductAll().then(res => {
-  //       this.productList = res.data || []
-  //     })
-  //     // 客户
-  //     getCustomerList().then(res => {
-  //       this.customerList = res.data || []
-  //     })
-  //     // 工艺
-  //     getProcessFlowList().then(res => {
-  //       this.processFlowList = res.data || []
-  //     })
-  //   },
-  //   timeChange() {
-  //     if (this.form.planStartTime && this.form.planFinishTime) {
-  //       if (this.form.planStartTime > this.form.planFinishTime) {
-  //         this.$modal.msgError('计划开始时间不能大于结束时间')
-  //       }
-  //     }
-  //   },
-  //   // 工艺变更
-  //   materialMethodChange(val) {
-  //     if (val === 2 && !this.form.processFlowId) {
-  //       this.form.materialMethod = 1
-  //       this.$modal.msgError("请先选择关联工艺");
-  //     }
-  //   },
-  //   // 工艺变更
-  //   processFlowIdChange(val) {
-  //     console.log(val)
-  //     if (!val) {
-  //       this.form.materialMethod = 1
-  //     }
-  //   },
-  //   submitForm() {
-  //     this.$refs['orderAddForm'].validate((valid) => {
-  //       if (valid) {
-  //         if (this.form.planStartTime && this.form.planFinishTime) {
-  //           if (this.form.planStartTime > this.form.planFinishTime) {
-  //             this.$modal.msgError('计划开始时间不能大于结束时间')
-  //             return false
-  //           }
-  //         }
-  //         // console.log(this.form)
-  //         if (this.isEdit) {
-  //           //编辑
-  //           orderUpdate({ ...this.form }).then((res) => {
-  //             if (res.code === 0) {
-  //               this.$modal.msgSuccess("操作成功");
-  //               this.$emit('successSubmit')
-  //             }
-  //           })
-  //         } else {
-  //           this.form.status = 1
-  //           this.form.triggerOrigin = 1
-  //           orderCreate({ ...this.form }).then((res) => {
-  //             if (res.code === 0) {
-  //               this.$modal.msgSuccess("操作成功");
-  //               this.$emit('successSubmit')
-  //             }
-  //           })
-  //         }
-  //       } else {
-  //         return false
-  //       }
-  //     })
-  //   },
-  //   formClear() {
-  //     this.$refs.orderAddForm.resetFields()
-  //     this.form.materialMethod = 1
-  //     this.form.price = 0.00
-  //     this.form.planQuantity = 0
-  //     this.isEdit = false
-  //   }
+    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
index fff53a19..7a54de38 100644
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
@@ -17,7 +17,7 @@
       <method-btn
         v-if="tableBtn.length"
         slot="handleBtn"
-        :width="120"
+        :width="80"
         label="操作"
         :method-list="tableBtn"
         @clickBtn="handleClick"
@@ -44,11 +44,13 @@
 </template>
 <script>
 import { parseTime } from '@/utils/ruoyi'
-// import { publicFormatter } from '@/utils/dict'
+import WasteWaterAdd from './components/wasteWaterAdd'
+import { publicFormatter } from '@/utils/dict'
+import { environmentalCheckPage, environmentalCheckDelete } from '@/api/safetyEnvironmental/environmental'
 const tableProps = [
   {
     prop: 'name',
-    label: '指示名称',
+    label: '指标名称',
     minWidth: 120,
     showOverflowtooltip: true
   },
@@ -58,26 +60,22 @@ const tableProps = [
     minWidth: 120
   },
   {
-    prop: 'customerId',
-    label: '单位'
+    prop: 'unit',
+    label: '单位',
+    filter: publicFormatter('environment_check_unit')
   },
   {
-    prop: 'customerId1',
+    prop: 'minValue',
     label: '最小值'
   },
   {
-    prop: 'customerId2',
+    prop: 'maxValue',
     label: '最大值'
   },
   {
-    prop: 'customerId3',
+    prop: 'creator',
     label: '创建人'
   },
-  // {
-  //   prop: 'triggerOrigin',
-  //   label: '来源',
-  //   filter: publicFormatter('order_Origin')
-  // },
   {
     prop: 'createTime',
     label: '创建时间',
@@ -91,11 +89,9 @@ export default {
     return {
       formConfig: [
         {
-          type: 'select',
+          type: 'input',
           label: '指标名称',
-          selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
-          labelField: 'label',
-          valueField: 'value',
+          placeholder: '指标名称',
           param: 'name'
         },
         {
@@ -105,10 +101,10 @@ export default {
           color: 'primary'
         },
         {
-          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
+          type: this.$auth.hasPermi('base:waste-water:create') ? 'separate' : '',
         },
         {
-          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+          type: this.$auth.hasPermi('base:waste-water:create') ? 'button' : '',
           btnName: '新增',
           name: 'add',
           color: 'success',
@@ -119,35 +115,42 @@ export default {
       queryParams: {
         pageNo: 1,
         pageSize: 20,
-        name: null,
-        status: null
+        checkType: 1,
+        name: null
       },
       total: 0,
       tableProps,
-      list: [
-        {name:'1111'}
-      ],
+      list: [],
       tableH: this.tableHeight(260),
       tableBtn: [
-        this.$auth.hasPermi('base:order-manage:edit')
+        this.$auth.hasPermi('base:waste-water:update')
           ? {
               type: 'edit',
               btnName: '编辑'
             }
           : undefined,
-        this.$auth.hasPermi('base:order-manage:delete')
+        this.$auth.hasPermi('base:waste-water:delete')
           ? {
               type: 'delete',
               btnName: '删除'
             }
           : undefined
-      ],
+      ].filter((v)=>v),
       addOrEditTitle: '',
       centervisible: false
     }
   },
+  components: { WasteWaterAdd },
+  mounted() {
+    this.getList()
+  },
   methods: {
-    getList() {},
+    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') {
@@ -178,7 +181,7 @@ export default {
     // 删除
     handleDelete(val) {
       this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
-        // return wasteWaterDelete({ id: val.id })
+        return environmentalCheckDelete({ id: val.id })
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("操作成功");
diff --git a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/components/lineChart.vue b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/components/lineChart.vue
new file mode 100644
index 00000000..d07509a4
--- /dev/null
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/components/lineChart.vue
@@ -0,0 +1,128 @@
+<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)
+    }
+  },
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.chartHeight = this.tableHeight(420)
+    })
+    this.getChart()
+  },
+  methods: {
+    getChart() {
+      var chartDom = document.getElementById('wasteWaterLine');
+      var myChart = echarts.init(chartDom);
+      var option = {
+          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: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine'],
+            right: '1%',
+            icon: 'rect',
+            itemHeight: 8,
+            itemWidth: 8
+          },
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
+          toolbox: {
+            feature: {
+              saveAsImage: {}
+            }
+          },
+          xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+          },
+          yAxis: {
+            type: 'value'
+          },
+          axisPointer: {
+            type: 'line',
+            lineStyle: {
+              color: 'rgba(11, 88, 255, 1)'
+            }
+          },
+          series: [
+            {
+              name: 'Email',
+              type: 'line',
+              stack: 'Total',
+              symbol: 'none',
+              data: [120, 132, 101, 134, 90, 230, 210]
+            },
+            {
+              name: 'Union Ads',
+              type: 'line',
+              stack: 'Total',
+              symbol: 'none',
+              data: [220, 182, 191, 234, 290, 330, 310]
+            },
+            {
+              name: 'Video Ads',
+              type: 'line',
+              stack: 'Total',
+              symbol: 'none',
+              data: [150, 232, 201, 154, 190, 330, 410]
+            },
+            {
+              name: 'Direct',
+              type: 'line',
+              stack: 'Total',
+              symbol: 'none',
+              data: [320, 332, 301, 334, 390, 330, 320]
+            },
+            {
+              name: 'Search Engine',
+              type: 'line',
+              stack: 'Total',
+              symbol: 'none',
+              data: [820, 932, 901, 934, 1290, 1330, 1320]
+            }
+          ]
+        };
+
+        option && myChart.setOption(option);
+    }
+  }
+}
+</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
index 47fbfe48..e21e1049 100644
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue
@@ -1,8 +1,171 @@
 <template>
-  <div>wasteWater</div>
+  <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-bar
+        :formConfigs="formConfig"
+        ref="searchBarForm"
+        @headBtnClick="buttonClick"
+      />
+      <line-chart />
+    </div>
+  </div>
 </template>
 <script>
+import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
+import LineChart from './components/lineChart'
 export default {
-  name: 'WasteWater'
+  name: 'WasteWaterManagement',
+  data(){
+    return {
+      realtimeList:[],
+      queryParams:{
+        checkType: 1,
+        timeDim: null,
+        timeRange: []
+      },
+      formConfig: [
+        {
+          type: 'select',
+          label: '时间维度',
+          selectOptions: this.getDictDatas(this.DICT_TYPE.TIME_DIM),
+          labelField: 'label',
+          valueField: 'value',
+          param: 'timeDim',
+          width: 100
+        },
+        {
+          type: 'datePicker',
+          label: '时间范围',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 250
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        }
+      ],
+    }
+  },
+  components: { LineChart },
+  mounted() {
+    this.getMsg()
+  },
+  methods: {
+    getMsg() {
+      environmentalCheckRealtime({checkType: 1}).then(res => {
+        console.log(res)
+        this.realtimeList = res.data || []
+      })
+    },
+    getTrend() {
+      environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
+        console.log(res)
+      })
+    }
+  }
 }
-</script>
\ No newline at end of file
+</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/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"

From 1661615af41f5d074c353aab45b3a3797661f733 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Tue, 12 Dec 2023 10:56:25 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E7=8E=AF=E4=BF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |   4 +-
 src/api/safetyEnvironmental/environmental.js  |  18 +-
 .../components/searchArea.vue                 |  14 +-
 .../trendAnalysis/components/lineChart.vue    |   1 -
 .../trendAnalysis/components/searchArea.vue   |  18 +-
 .../components/lineChart.vue                  | 122 +++---
 .../environmental/components/searchArea.vue   | 378 ++++++++++++++++++
 .../voc/vocDetectionHistory/index.vue         |  44 +-
 .../environmental/voc/vocManagement/index.vue |  32 +-
 .../wasteGasDetectionHistory/index.vue        |  46 ++-
 .../wasteGas/wasteGasManagement/index.vue     |  32 +-
 .../wasteWaterDetectionHistory/index.vue      |  48 ++-
 .../wasteWater/wasteWaterManagement/index.vue |  57 +--
 13 files changed, 661 insertions(+), 153 deletions(-)
 rename src/views/safetyEnvironmental/environmental/{wasteWater/wasteWaterManagement => }/components/lineChart.vue (51%)
 create mode 100644 src/views/safetyEnvironmental/environmental/components/searchArea.vue

diff --git a/.env.dev b/.env.dev
index 66e48313..ce13987b 100644
--- a/.env.dev
+++ b/.env.dev
@@ -13,14 +13,14 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # 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.1.62:48080'
+# 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/safetyEnvironmental/environmental.js b/src/api/safetyEnvironmental/environmental.js
index 2adb8e10..355d0f89 100644
--- a/src/api/safetyEnvironmental/environmental.js
+++ b/src/api/safetyEnvironmental/environmental.js
@@ -10,11 +10,11 @@ export function environmentalCheckRealtime(query) {
 }
 
 // 获得环保检测指标趋势数据
-export function environmentalCheckRealtimeTrend(query) {
+export function environmentalCheckRealtimeTrend(data) {
   return request({
     url: '/base/environmental-check-record/trend',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: data
   })
 }
 
@@ -64,20 +64,20 @@ export function environmentalCheckDelete(query) {
 }
 
 // 获得环保检测记录分页
-export function environmentalCheckRecordPage(query) {
+export function environmentalCheckRecordPage(data) {
   return request({
     url: '/base/environmental-check-record/page',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: data
   })
 }
 
 // 导出环保检测记录 Excel
-export function environmentalCheckRecordExport(query) {
+export function environmentalCheckRecordExport(data) {
   return request({
     url: '/base/environmental-check-record/export-excel',
-    method: 'get',
-    params: query,
+    method: 'post',
+    data: data,
     responseType: 'blob'
   })
 }
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/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/components/lineChart.vue b/src/views/safetyEnvironmental/environmental/components/lineChart.vue
similarity index 51%
rename from src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/components/lineChart.vue
rename to src/views/safetyEnvironmental/environmental/components/lineChart.vue
index d07509a4..05860c12 100644
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/components/lineChart.vue
+++ b/src/views/safetyEnvironmental/environmental/components/lineChart.vue
@@ -18,17 +18,74 @@ export default {
       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() {
-      var chartDom = document.getElementById('wasteWaterLine');
-      var myChart = echarts.init(chartDom);
+      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) {
@@ -51,27 +108,28 @@ export default {
             }
           },
           legend: {
-            data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine'],
-            right: '1%',
+            data: legendData,
+            right: '2%',
             icon: 'rect',
             itemHeight: 8,
-            itemWidth: 8
+            itemWidth: 8,
+            textStyle: {
+              color: 'auto'
+            }
           },
           grid: {
             left: '3%',
-            right: '4%',
+            right: '2%',
             bottom: '3%',
             containLabel: true
           },
-          toolbox: {
-            feature: {
-              saveAsImage: {}
-            }
-          },
           xAxis: {
             type: 'category',
             boundaryGap: false,
-            data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+            data: xData,
+            axisLabel: {
+              rotate: "45"
+            }
           },
           yAxis: {
             type: 'value'
@@ -82,46 +140,10 @@ export default {
               color: 'rgba(11, 88, 255, 1)'
             }
           },
-          series: [
-            {
-              name: 'Email',
-              type: 'line',
-              stack: 'Total',
-              symbol: 'none',
-              data: [120, 132, 101, 134, 90, 230, 210]
-            },
-            {
-              name: 'Union Ads',
-              type: 'line',
-              stack: 'Total',
-              symbol: 'none',
-              data: [220, 182, 191, 234, 290, 330, 310]
-            },
-            {
-              name: 'Video Ads',
-              type: 'line',
-              stack: 'Total',
-              symbol: 'none',
-              data: [150, 232, 201, 154, 190, 330, 410]
-            },
-            {
-              name: 'Direct',
-              type: 'line',
-              stack: 'Total',
-              symbol: 'none',
-              data: [320, 332, 301, 334, 390, 330, 320]
-            },
-            {
-              name: 'Search Engine',
-              type: 'line',
-              stack: 'Total',
-              symbol: 'none',
-              data: [820, 932, 901, 934, 1290, 1330, 1320]
-            }
-          ]
+          series: seriesData
         };
 
-        option && myChart.setOption(option);
+        option && this.chart.setOption(option);
     }
   }
 }
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
index 40b0bb02..5bb80b45 100644
--- a/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container vocHis">
     <!-- 搜索工作栏 -->
     <search-bar
       :formConfigs="formConfig"
@@ -13,6 +13,7 @@
       :table-props="tableProps"
       :table-data="list"
       :max-height="tableH"
+      :row-class-name="tableRowClassName"
     />
     <pagination
       :page.sync="queryParams.pageNo"
@@ -72,14 +73,15 @@ export default {
           type: 'select',
           label: '指标名称',
           selectOptions: [],
-          param: 'checkId'
+          param: 'checkId',
+          filterable: true
         },
         {
           type: 'datePicker',
           label: '时间',
           dateType: 'datetimerange',
           format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "timestamp",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
@@ -94,10 +96,10 @@ export default {
           color: 'primary'
         },
         {
-          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
+          type: this.$auth.hasPermi('base:voc:export') ? 'separate' : '',
         },
         {
-          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+          type: this.$auth.hasPermi('base:voc:export') ? 'button' : '',
           btnName: '导出',
           name: 'export',
           color: 'primary',
@@ -110,7 +112,8 @@ export default {
         pageSize: 20,
         checkId: null,
         checkType: 3,
-        checkTime: [],
+        startTime: null,
+        endTime: null
       },
       tableProps,
       list: [],
@@ -122,11 +125,11 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
     })
-    let end = moment().format('YYYY-MM-DD 23:59:59')
-    let start = moment().format('YYYY-MM-DD 00:00:00')
+    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.checkTime[0] = start
-    this.queryParams.checkTime[1] = end
+    this.queryParams.startTime = start
+    this.queryParams.endTime = end
     this.getSelectList()
     this.getList()
   },
@@ -134,8 +137,8 @@ export default {
     buttonClick(val) {
       this.queryParams.pageNo = 1;
       this.queryParams.checkId = val.checkId
-      this.queryParams.checkTime[0] = val.timeVal ? val.timeVal[0] : null
-      this.queryParams.checkTime[1] = val.timeVal ? val.timeVal[1] : null
+      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 {
@@ -161,7 +164,22 @@ export default {
         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>
\ No newline at end of file
+</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/vocManagement/index.vue b/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue
index 2d2efcc4..eaf0dccd 100644
--- a/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue
+++ b/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue
@@ -23,18 +23,32 @@
         <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 } from '@/api/safetyEnvironmental/environmental'
+import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
+import LineChart from './../../components/lineChart'
+import SearchArea from './../../components/searchArea'
 export default {
   name: 'Voc',
   data(){
     return {
-      realtimeList:[]
+      realtimeList:[],
+      queryParams:{
+        checkType: 1,
+        timeDim: null,
+        timeRange: []
+      },
+      chartData: {}
     }
   },
+  components: { LineChart, SearchArea },
   mounted() {
     this.getMsg()
   },
@@ -44,6 +58,20 @@ export default {
         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 = {}
+        }
+      })
     }
   }
 }
diff --git a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
index 273ec775..a8b09572 100644
--- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container wasteGasHis">
     <!-- 搜索工作栏 -->
     <search-bar
       :formConfigs="formConfig"
@@ -13,6 +13,7 @@
       :table-props="tableProps"
       :table-data="list"
       :max-height="tableH"
+      :row-class-name="tableRowClassName"
     />
     <pagination
       :page.sync="queryParams.pageNo"
@@ -72,14 +73,15 @@ export default {
           type: 'select',
           label: '指标名称',
           selectOptions: [],
-          param: 'checkId'
+          param: 'checkId',
+          filterable: true
         },
         {
           type: 'datePicker',
           label: '时间',
           dateType: 'datetimerange',
           format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "timestamp",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
@@ -94,10 +96,10 @@ export default {
           color: 'primary'
         },
         {
-          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
+          type: this.$auth.hasPermi('base:waste-gas:export') ? 'separate' : '',
         },
         {
-          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+          type: this.$auth.hasPermi('base:waste-gas:export') ? 'button' : '',
           btnName: '导出',
           name: 'export',
           color: 'primary',
@@ -110,7 +112,8 @@ export default {
         pageSize: 20,
         checkId: null,
         checkType: 2,
-        checkTime: [],
+        startTime: null,
+        endTime: null
       },
       tableProps,
       list: [],
@@ -122,11 +125,11 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
     })
-    let end = moment().format('YYYY-MM-DD 23:59:59')
-    let start = moment().format('YYYY-MM-DD 00:00:00')
+    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.checkTime[0] = start
-    this.queryParams.checkTime[1] = end
+    this.queryParams.startTime = start
+    this.queryParams.endTime = end
     this.getSelectList()
     this.getList()
   },
@@ -134,15 +137,15 @@ export default {
     buttonClick(val) {
       this.queryParams.pageNo = 1;
       this.queryParams.checkId = val.checkId
-      this.queryParams.checkTime[0] = val.timeVal ? val.timeVal[0] : null
-      this.queryParams.checkTime[1] = val.timeVal ? val.timeVal[1] : null
+      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');
+            this.$download.excel(response, '废气检测历史记录.xls');
           }).catch(() => {})
       }
     },
@@ -161,7 +164,22 @@ export default {
         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>
\ No newline at end of file
+</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/wasteGasManagement/index.vue b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue
index a4c4e47a..854cb516 100644
--- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue
@@ -23,18 +23,32 @@
         <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 } from '@/api/safetyEnvironmental/environmental'
+import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
+import LineChart from './../../components/lineChart'
+import SearchArea from './../../components/searchArea'
 export default {
   name: 'WasteGasManagement',
   data(){
     return {
-      realtimeList:[]
+      realtimeList:[],
+      queryParams:{
+        checkType: 2,
+        timeDim: null,
+        timeRange: []
+      },
+      chartData: {}
     }
   },
+  components: { LineChart, SearchArea },
   mounted() {
     this.getMsg()
   },
@@ -44,6 +58,20 @@ export default {
         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 = {}
+        }
+      })
     }
   }
 }
diff --git a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
index b3cf394f..a0c1c1ab 100644
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container wasteWaterHis">
     <!-- 搜索工作栏 -->
     <search-bar
       :formConfigs="formConfig"
@@ -13,6 +13,7 @@
       :table-props="tableProps"
       :table-data="list"
       :max-height="tableH"
+      :row-class-name="tableRowClassName"
     />
     <pagination
       :page.sync="queryParams.pageNo"
@@ -72,14 +73,15 @@ export default {
           type: 'select',
           label: '指标名称',
           selectOptions: [],
-          param: 'checkId'
+          param: 'checkId',
+          filterable: true
         },
         {
           type: 'datePicker',
           label: '检测时间',
           dateType: 'datetimerange',
           format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "timestamp",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
@@ -94,10 +96,10 @@ export default {
           color: 'primary'
         },
         {
-          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
+          type: this.$auth.hasPermi('base:waste-water:export') ? 'separate' : '',
         },
         {
-          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+          type: this.$auth.hasPermi('base:waste-water:export') ? 'button' : '',
           btnName: '导出',
           name: 'export',
           color: 'primary',
@@ -110,7 +112,8 @@ export default {
         pageSize: 20,
         checkId: null,
         checkType: 1,
-        // checkTime: [],
+        startTime: null,
+        endTime: null
       },
       tableProps,
       list: [],
@@ -122,11 +125,11 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
     })
-    let end = moment().format('YYYY-MM-DD 23:59:59')
-    let start = moment().format('YYYY-MM-DD 00:00:00')
+    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.checkTime[0] = start
-    this.queryParams.checkTime[1] = end
+    this.queryParams.startTime = start
+    this.queryParams.endTime = end
     this.getSelectList()
     this.getList()
   },
@@ -134,12 +137,8 @@ export default {
     buttonClick(val) {
       this.queryParams.pageNo = 1;
       this.queryParams.checkId = val.checkId
-      // this.queryParams.checkTime[0] = val.timeVal ? val.timeVal[0] : null
-      // this.queryParams.checkTime[1] = val.timeVal ? val.timeVal[1] : null
-      // this.queryParams.checkTime[0] = 1701014400000
-      // this.queryParams.checkTime[1] = 1701100800000
-      this.queryParams.startTime = 1701014400000
-      this.queryParams.endTime = 1701100800000
+      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 {
@@ -165,7 +164,22 @@ export default {
         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>
\ No newline at end of file
+</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/wasteWaterManagement/index.vue b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue
index e21e1049..0545cb4c 100644
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue
@@ -22,18 +22,17 @@
         <span>检测指标趋势图</span>
       </div>
       <!-- 搜索工作栏 -->
-      <search-bar
-        :formConfigs="formConfig"
-        ref="searchBarForm"
-        @headBtnClick="buttonClick"
-      />
-      <line-chart />
+      <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 LineChart from './../../components/lineChart'
+import SearchArea from './../../components/searchArea'
 export default {
   name: 'WasteWaterManagement',
   data(){
@@ -44,39 +43,10 @@ export default {
         timeDim: null,
         timeRange: []
       },
-      formConfig: [
-        {
-          type: 'select',
-          label: '时间维度',
-          selectOptions: this.getDictDatas(this.DICT_TYPE.TIME_DIM),
-          labelField: 'label',
-          valueField: 'value',
-          param: 'timeDim',
-          width: 100
-        },
-        {
-          type: 'datePicker',
-          label: '时间范围',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultSelect: [],
-          width: 250
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        }
-      ],
+      chartData: {}
     }
   },
-  components: { LineChart },
+  components: { LineChart, SearchArea },
   mounted() {
     this.getMsg()
   },
@@ -87,9 +57,18 @@ export default {
         this.realtimeList = res.data || []
       })
     },
-    getTrend() {
+    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 = {}
+        }
       })
     }
   }

From 63b19d84e4487c6f0231ce70341dc96de55e9365 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Wed, 13 Dec 2023 09:12:52 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/choicepart/Cost.png         | Bin 0 -> 15007 bytes
 src/assets/images/choicepart/Databoard.png    | Bin 0 -> 11726 bytes
 .../images/choicepart/SafetyEnvironmental.png | Bin 0 -> 15417 bytes
 src/views/choicePart/index.vue                |  46 +++++++++++++-----
 4 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 src/assets/images/choicepart/Cost.png
 create mode 100644 src/assets/images/choicepart/Databoard.png
 create mode 100644 src/assets/images/choicepart/SafetyEnvironmental.png

diff --git a/src/assets/images/choicepart/Cost.png b/src/assets/images/choicepart/Cost.png
new file mode 100644
index 0000000000000000000000000000000000000000..76cf8538cdbddb757ff6ae179aa52625acfdc9a0
GIT binary patch
literal 15007
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/choicepart/Databoard.png b/src/assets/images/choicepart/Databoard.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9bc3d0cb9f8d6a2d989f16cc2bdb74780a8d176
GIT binary patch
literal 11726
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
W&>3z`gwezNOA0cdq^l)OLjNzK>;z8$

literal 0
HcmV?d00001

diff --git a/src/assets/images/choicepart/SafetyEnvironmental.png b/src/assets/images/choicepart/SafetyEnvironmental.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef6e9085a9030a87e819fd092cc434d79fef3885
GIT binary patch
literal 15417
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
Gf&T+v=p(uS

literal 0
HcmV?d00001

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

From 91d269e1ce5e72e6007122814d1d5b1fef534d65 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Wed, 13 Dec 2023 09:18:36 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E5=92=8C=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/cost/costEneryAutoReport.js           |  78 ++++++++
 src/api/cost/costMaterialAutoReport.js        |  73 +++++++
 src/api/cost/costMaterialSet.js               |  61 ++++++
 src/views/cost/energyCost/index.vue           | 162 +++++++++++++++
 src/views/cost/energyCostHis/index.vue        | 173 ++++++++++++++++
 src/views/cost/mixins/basic-add.js            | 121 ++++++++++++
 src/views/cost/mixins/basic-page.js           | 172 ++++++++++++++++
 src/views/cost/mixins/code-filter.js          |  79 ++++++++
 src/views/cost/mixins/connectTime.vue         |  23 +++
 .../cost/rawMaterialConfig/add-or-updata.vue  | 166 ++++++++++++++++
 src/views/cost/rawMaterialConfig/index.vue    | 186 ++++++++++++++++++
 src/views/cost/rawMaterialCost/index.vue      | 166 ++++++++++++++++
 src/views/cost/rawMaterialCostHis/index.vue   | 170 ++++++++++++++++
 .../end-material/warehouseGoods/index.vue     |   1 +
 .../end-material/warehouseRealtime/index.vue  |  24 +--
 .../add-or-updata.vue                         |   8 +-
 .../warehouseRealtimeLocation/index.vue       |  30 +--
 .../out-material/warehouseGoods/index.vue     |   1 +
 .../out-material/warehouseRealtime/index.vue  |  24 +--
 .../add-or-updata.vue                         |   8 +-
 .../warehouseRealtimeLocation/index.vue       |  30 +--
 .../package-material/warehouseGoods/index.vue |   1 +
 .../warehouseRealtime/index.vue               |  24 +--
 .../add-or-updata.vue                         |   8 +-
 .../warehouseRealtimeLocation/index.vue       |  30 +--
 .../part-material/warehouseGoods/index.vue    |   1 +
 .../part-material/warehouseRealtime/index.vue |  24 +--
 .../add-or-updata.vue                         |   8 +-
 .../warehouseRealtimeLocation/index.vue       |  30 +--
 .../raw-material/warehouseGoods/index.vue     |   1 +
 .../raw-material/warehouseRealtime/index.vue  |  22 +--
 .../add-or-updata.vue                         |   8 +-
 .../warehouseRealtimeLocation/index.vue       |  30 +--
 .../warehouse-info/add-or-updata1.vue         |   4 +-
 34 files changed, 1796 insertions(+), 151 deletions(-)
 create mode 100644 src/api/cost/costEneryAutoReport.js
 create mode 100644 src/api/cost/costMaterialAutoReport.js
 create mode 100644 src/api/cost/costMaterialSet.js
 create mode 100644 src/views/cost/energyCost/index.vue
 create mode 100644 src/views/cost/energyCostHis/index.vue
 create mode 100644 src/views/cost/mixins/basic-add.js
 create mode 100644 src/views/cost/mixins/basic-page.js
 create mode 100644 src/views/cost/mixins/code-filter.js
 create mode 100644 src/views/cost/mixins/connectTime.vue
 create mode 100644 src/views/cost/rawMaterialConfig/add-or-updata.vue
 create mode 100644 src/views/cost/rawMaterialConfig/index.vue
 create mode 100644 src/views/cost/rawMaterialCost/index.vue
 create mode 100644 src/views/cost/rawMaterialCostHis/index.vue

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/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/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,