调整导出的参数

src/views/dye/device/index.vue

@@ -28,22 +28,22 @@
           />
         </el-select>
       </el-form-item>
-      <!--      <el-form-item label="设备类型" prop="typeId">-->
-      <!--        <el-select-->
-      <!--            v-model="queryParams.typeId"-->
-      <!--            placeholder="请选择设备类型"-->
-      <!--            clearable-->
-      <!--            style="width: 150px"-->
-      <!--            @change="handleQuery"-->
-      <!--        >-->
-      <!--          <el-option-->
-      <!--              v-for="item in typeList"-->
-      <!--              :key="item.typeId"-->
-      <!--              :label="item.typeName"-->
-      <!--              :value="item.typeId"-->
-      <!--          />-->
-      <!--        </el-select>-->
-      <!--      </el-form-item>-->
+      <el-form-item label="设备类型" prop="typeId">
+        <el-select
+            v-model="queryParams.typeId"
+            placeholder="请选择设备类型"
+            clearable
+            style="width: 150px"
+            @change="handleQuery"
+        >
+                <el-option
+                    v-for="item in typeList"
+                    :key="item.typeId"
+                    :label="item.typeName"
+                    :value="item.typeId"
+                />
+              </el-select>
+            </el-form-item>
       <el-form-item label="设备编码" prop="deviceCode">
         <el-input
             v-model="queryParams.deviceCode"

src/views/dye/process/export.vue

@@ -9,16 +9,13 @@
           <div style="display: flex; align-items: center; justify-content: center;">
             <span style="white-space: nowrap; margin-right: 10px;">时间：</span>
             <el-date-picker clearable
-                            v-model="processParams.date"
-                            type="date"
-                            value-format="YYYY-MM-DD"
-                            placeholder="请选择日期"
-                            style="width: 130px">
+                            v-model="processParams.time"
+                            type="datetime"
+                            value-format="YYYY-MM-DD HH:mm:ss"
+                            format="YYYY-MM-DD HH:mm:ss"
+                            placeholder="请选择时间"
+                            style="width: 220px">
             </el-date-picker>
-            <el-select v-model="processParams.hour" placeholder="小时" style="width: 80px; margin-left: 5px;">
-              <el-option v-for="hour in 24" :key="hour - 1" :label="(hour - 1).toString().padStart(2, '0') + ':00'"
-                         :value="hour - 1"></el-option>
-            </el-select>
           </div>
         </el-col>
 
@@ -145,8 +142,7 @@ import {ref} from 'vue';
 const {proxy} = getCurrentInstance();
 
 const processParams = reactive({
-  date: new Date().Format('yyyy-MM-dd'),
-  hour: new Date().getHours(),
+  time: new Date().Format('yyyy-MM-dd') + ' ' + new Date().getHours().toString().padStart(2, '0') + ':' + new Date().getMinutes().toString().padStart(2, '0') + ':00',
   types: [],
   lines: []
 });
@@ -190,11 +186,10 @@ function getList() {
 // 导出工艺参数
 function exportProcessParams() {
   proxy.download('dye/process/exportProc', {
-    date: processParams.date,
-    hour: processParams.hour,
+    time: processParams.time,
     types: processParams.types,
     lines: processParams.lines
-  }, `前整车间工艺参数_${new Date().Format('yyyyMMddhhmmss')}.xlsx`)
+  }, `前整车间工艺参数_${new Date(processParams.time.replace(/-/g, '/')).Format('yyyyMMddhhmmss')}.xlsx`)
 }
 
 // 导出电量
@@ -203,7 +198,7 @@ function exportElectricity() {
     date: electricityParams.date.join(","),
     types: electricityParams.types,
     lines: electricityParams.lines
-  }, `前整车间电量_${new Date().getTime()}.xlsx`)
+  }, `前整车间电量_${new Date(electricityParams.date[0].replace(/-/g, '/')).Format('yyyyMMdd')}至${new Date(electricityParams.date[1].replace(/-/g, '/')).Format('yyyyMMdd')}.xlsx`)
 }
 
 getList();