diff --git a/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue b/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue
index beae16d1..4d72b92e 100644
--- a/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue
+++ b/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue
@@ -1,15 +1,29 @@
 <template>
-  <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
-    @row-update="rowUpdate" @row-del="rowDel" @row-save="rowSave" @search-change="searchChange"
-    @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
-    @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+  <avue-crud
+    :option="option"
+    :table-loading="loading"
+    :data="data"
+    v-model="form"
+    v-model:page="page"
+    ref="crud"
+    @row-update="rowUpdate"
+    @row-del="rowDel"
+    @row-save="rowSave"
+    @search-change="searchChange"
+    @search-reset="searchReset"
+    @selection-change="selectionChange"
+    @current-change="currentChange"
+    @size-change="sizeChange"
+    @refresh-change="refreshChange"
+    @on-load="onLoad"
+  >
     <template #menu-left> </template>
     <template #menu-right>
       <span>备注: 1、运行状态正常时，默认运行；异常时停止。2、pH值为正常运行的平均值</span>
     </template>
-   <!-- 运行 1 停止0 -->
+    <!-- 运行 1 停止0 -->
     <template #fan="scope">
-      <el-tag v-if="scope.row.fan === true" type="success">运行</el-tag>  
+      <el-tag v-if="scope.row.fan === true" type="success">运行</el-tag>
       <el-tag v-else type="danger">停止</el-tag>
     </template>
     <template #pump="scope">
@@ -43,15 +57,15 @@
   </avue-crud>
 </template>
 <script>
-  import { getList ,remove, update , getdutyManList } from '@/api/safetyManagement/wasteGasRunRec.js';
+import { getList, remove, update, getdutyManList } from '@/api/safetyManagement/wasteGasRunRec.js';
 export default {
   data() {
     return {
       selectionList: [],
-      dutyManList:[],
-      loading:false,
+      dutyManList: [],
+      loading: false,
       option: {
-        height: "auto",
+        height: 'auto',
         calcHeight: 32,
         tip: false,
         simplePage: true,
@@ -67,13 +81,13 @@ export default {
         delBtn: true,
         editBtn: true,
         addBtn: false,
-        editBtnText: "修改",
-        delBtnText: "删除",
-        addBtnIcon: " ",
-        viewBtnIcon: " ",
-        delBtnIcon: " ",
-        editBtnIcon: " ",
-        viewBtnText: "详情",
+        editBtnText: '修改',
+        delBtnText: '删除',
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        viewBtnText: '详情',
         labelWidth: 120,
         menuWidth: 120,
         dialogWidth: 1040,
@@ -88,18 +102,18 @@ export default {
         index: false,
         showOverflowTooltip: true,
         menu: true,
-        searchLabelPosition: "left",
-        searchLabelPosition: "left",
+        searchLabelPosition: 'left',
+        searchLabelPosition: 'left',
         searchGutter: 24,
         searchSpan: 6,
-        menuAlign: "left",
+        menuAlign: 'left',
         gridBtn: false,
-        searchMenuPosition: "right",
-        align: "center",
+        searchMenuPosition: 'right',
+        align: 'center',
         column: [
           {
-            label: "设备编号",
-            prop: "deviceNum",
+            label: '设备编号',
+            prop: 'deviceNum',
             sortable: true,
             filter: true,
             search: true,
@@ -112,7 +126,7 @@ export default {
               },
             ],
           },
-     
+
           // {
           //   label: "日期",
           //   prop: "startTime",
@@ -145,16 +159,16 @@ export default {
             hide: true,
             editDisplay: false,
             span: 12,
-            type: 'datetime',
+            type: 'date',
             searchRange: true,
-            startPlaceholder: "开始时间",
-            endPlaceholder: "结束时间",
-            format: 'YYYY-MM-DD HH:mm:ss',
-            valueFormat: 'YYYY-MM-DD HH:mm:ss',
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
           },
           {
-            label: "开始时间",
-            prop: "startTime",
+            label: '开始时间',
+            prop: 'startTime',
             search: false,
             sortable: true,
             filter: true,
@@ -180,17 +194,17 @@ export default {
             display: false,
             editDisplay: false,
             span: 12,
-            type: 'datetime',
-           
+            type: 'date',
+
             searchRange: true,
-            startPlaceholder: "开始时间",
-            endPlaceholder: "结束时间",
-            format: 'YYYY-MM-DD HH:mm:ss',
-            valueFormat: 'YYYY-MM-DD HH:mm:ss',
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
           },
           {
-            label: "结束时间",
-            prop: "endTime",
+            label: '结束时间',
+            prop: 'endTime',
             search: false,
             sortable: true,
             filter: true,
@@ -207,146 +221,145 @@ export default {
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
           },
           {
-            label: "运行时间(H)",
-            prop: "runTime",
+            label: '运行时间(H)',
+            prop: 'runTime',
             search: false,
             sortable: true,
             filter: true,
             width: 130,
           },
           {
-            label: "系统参数",
-            align: "sysData",
+            label: '系统参数',
+            align: 'sysData',
             children: [
               {
-                label: "PH",
-                prop: "sysData",
+                label: 'PH',
+                prop: 'sysData',
                 width: 120,
               },
             ],
           },
           {
-            label: "药品名称",
-            prop: "drugName",
+            label: '药品名称',
+            prop: 'drugName',
             search: false,
             sortable: true,
             filter: true,
             width: 120,
           },
           {
-            label: "药品投加量(kg)",
-            prop: "drugNum",
+            label: '药品投加量(kg)',
+            prop: 'drugNum',
             search: false,
             sortable: true,
             filter: true,
             width: 150,
           },
           {
-            label: "运行状态",
-            align: "center",
+            label: '运行状态',
+            align: 'center',
             children: [
               {
-                label: "风机",
-                prop: "fan",
+                label: '风机',
+                prop: 'fan',
                 type: 'switch',
-                dicData: [             
-                  { label: '停止', value:false},
-                  { label: '运行', value: true },  //运行 true  停止false
+                dicData: [
+                  { label: '停止', value: false },
+                  { label: '运行', value: true }, //运行 true  停止false
                 ],
-                value: 1
+                value: 1,
               },
               {
-                label: "循环泵",
-                prop: "pump",
+                label: '循环泵',
+                prop: 'pump',
                 type: 'switch',
-                dicData: [               
+                dicData: [
                   { label: '停止', value: 0 },
-                  { label: '运行', value: 1 },  //运行 1  停止0
+                  { label: '运行', value: 1 }, //运行 1  停止0
                 ],
-                value: 1
+                value: 1,
               },
             ],
           },
           {
-            label: "结构外观",
-            align: "center",
+            label: '结构外观',
+            align: 'center',
             children: [
               {
-                label: "结构外观",
-                prop: "jgwg",
+                label: '结构外观',
+                prop: 'jgwg',
                 width: 120,
                 type: 'switch',
                 dicData: [
                   { label: '不合格', value: 0 },
-                  { label: '合格', value: 1 },   //合格：1 不合格：0
+                  { label: '合格', value: 1 }, //合格：1 不合格：0
                 ],
-                value:1
+                value: 1,
               },
               {
-                label: "管道阀门",
-                prop: "gdfm",
+                label: '管道阀门',
+                prop: 'gdfm',
                 width: 120,
                 type: 'switch',
                 dicData: [
                   { label: '不合格', value: 0 },
-                  { label: '合格', value: 1 },   //合格：1 不合格：0
+                  { label: '合格', value: 1 }, //合格：1 不合格：0
                 ],
-                value: 1
+                value: 1,
               },
               {
-                label: "电器控制",
-                prop: "dqkz",
+                label: '电器控制',
+                prop: 'dqkz',
                 width: 120,
                 type: 'switch',
                 dicData: [
                   { label: '不合格', value: 0 },
-                  { label: '合格', value: 1 },   //合格：1 不合格：0
+                  { label: '合格', value: 1 }, //合格：1 不合格：0
                 ],
-                value: 1
+                value: 1,
               },
               {
-                label: "仪表显示",
-                prop: "ybxs",
+                label: '仪表显示',
+                prop: 'ybxs',
                 width: 120,
                 type: 'switch',
                 dicData: [
                   { label: '不合格', value: 0 },
-                  { label: '合格', value: 1 },   //合格：1 不合格：0
+                  { label: '合格', value: 1 }, //合格：1 不合格：0
                 ],
-                value: 1
+                value: 1,
               },
               {
-                label: "排口规范",
-                prop: "pkgf",
+                label: '排口规范',
+                prop: 'pkgf',
                 width: 120,
                 type: 'switch',
                 dicData: [
                   { label: '不合格', value: 0 },
-                  { label: '合格', value: 1 },   //合格：1 不合格：0
+                  { label: '合格', value: 1 }, //合格：1 不合格：0
                 ],
-                value: 1
+                value: 1,
               },
               {
-                label: "循环水箱",
-                prop: "xhsx",
+                label: '循环水箱',
+                prop: 'xhsx',
                 width: 120,
                 type: 'switch',
                 dicData: [
                   { label: '不合格', value: 0 },
-                  { label: '合格', value: 1 },   //合格：1 不合格：0
+                  { label: '合格', value: 1 }, //合格：1 不合格：0
                 ],
-                value: 1
+                value: 1,
               },
             ],
           },
           {
-            label: "维保记录",
-            prop: "record",
+            label: '维保记录',
+            prop: 'record',
             search: false,
             sortable: true,
             filter: true,
             width: 120,
-            
           },
           {
             label: '责任人',
@@ -356,7 +369,7 @@ export default {
             sortable: true,
             filter: true,
             span: 12,
-            type: "select",
+            type: 'select',
             dicData: [],
             rules: [
               {
@@ -367,7 +380,7 @@ export default {
             ],
             props: {
               label: 'name',
-              value: 'id'
+              value: 'id',
             },
           },
         ],
@@ -381,7 +394,7 @@ export default {
     };
   },
   mounted() {
-    this.fetchdutyManList()
+    this.fetchdutyManList();
   },
   methods: {
     // 环保技术员责任人用户
@@ -390,17 +403,17 @@ export default {
         current: 1,
         size: 10000000,
         // deptId
-        roleId: '2008473811712327681'
+        roleId: '2008473811712327681',
       }).then(res => {
-        const result = res.data.data.records
-        this.dutyManList = result
-        console.log("result", result)
+        const result = res.data.data.records;
+        this.dutyManList = result;
+        console.log('result', result);
         this.option.column.forEach(col => {
           if (col.prop === 'dutyMan') {
             col.dicData = this.dutyManList;
           }
         });
-      })
+      });
     },
     // 新增数据
     rowSave(row, done, loading) {
@@ -463,25 +476,25 @@ export default {
       } else {
         endTime = new Date().getTime();
       }
-      let str = "";
+      let str = '';
       const time = endTime - new Date(row.startTime).getTime();
 
       var date = new Date(time);
       // 获取小时
       var hh = Math.floor(time / (60 * 60 * 1000));
       // 获取分
-      var mm = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+      var mm = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
       // /获取秒
-      var ss = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+      var ss = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
 
       if (time > 24 * 60 * 60 * 1000) {
-        str = Math.floor(time / 86400000) + "天" + hh + "小时" + mm + "分" + ss + "秒";
+        str = Math.floor(time / 86400000) + '天' + hh + '小时' + mm + '分' + ss + '秒';
       } else if (time > 60 * 60 * 1000) {
-        str = hh + "小时" + mm + "分" + ss + "秒";
+        str = hh + '小时' + mm + '分' + ss + '秒';
       } else if (time > 60 * 1000) {
-        str = mm + "分" + ss + "秒";
+        str = mm + '分' + ss + '秒';
       } else {
-        str = ss + "秒";
+        str = ss + '秒';
       }
       return str;
     },
@@ -493,13 +506,12 @@ export default {
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
-      this.onLoad(this.page, params)
-      done()
-
+      this.onLoad(this.page, params);
+      done();
     },
-    searchReset(){
-      this.query = {}
-      this.onLoad(this.page)
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
     },
     // onLoad() {
     //   this.loading = true;
@@ -560,20 +572,24 @@ export default {
       this.loading = true;
       const requestParams = Object.assign({}, params, this.query);
       // 后端要字符串类型
+      // 处理开始时间
       if (requestParams.queryStartTime && Array.isArray(requestParams.queryStartTime)) {
-
-        requestParams.queryStartTime = requestParams.queryStartTime.join(',');
+        const start = requestParams.queryStartTime[0] + ' 00:00:00';
+        const end = requestParams.queryStartTime[1] + ' 23:59:59';
+        requestParams.queryStartTime = start + ',' + end;
       }
+      // 处理结束时间
       if (requestParams.queryEndTime && Array.isArray(requestParams.queryEndTime)) {
-
-        requestParams.queryEndTime = requestParams.queryEndTime.join(',');
+        const start = requestParams.queryEndTime[0] + ' 00:00:00';
+        const end = requestParams.queryEndTime[1] + ' 23:59:59';
+        requestParams.queryEndTime = start + ',' + end;
       }
       getList(page.currentPage, page.pageSize, requestParams)
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
-          console.log("this.data", this.data)
+          console.log('this.data', this.data);
           this.loading = false;
         })
         .catch(() => {