From d85eacf0f770d7c8020b90804025bd4a27dc5442 Mon Sep 17 00:00:00 2001
From: xhf <1424913779@qq.com>
Date: Wed, 26 Mar 2025 15:41:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.local                          |  4 ++--
 src/views/mapPage/logList/index.vue | 24 ++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.env.local b/.env.local
index 846499c4..b62d369a 100644
--- a/.env.local
+++ b/.env.local
@@ -4,9 +4,9 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-# VITE_BASE_URL='http://192.168.0.74:48080'
+VITE_BASE_URL='http://192.168.0.74:48080'
 # VITE_BASE_URL='http://192.168.0.226:48080'
-VITE_BASE_URL='http://192.168.0.45:48080'
+# VITE_BASE_URL='http://192.168.0.45:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
diff --git a/src/views/mapPage/logList/index.vue b/src/views/mapPage/logList/index.vue
index 9876fe90..50fc7099 100644
--- a/src/views/mapPage/logList/index.vue
+++ b/src/views/mapPage/logList/index.vue
@@ -189,7 +189,7 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="开始时间" prop="startTime" :formatter="dateFormatter">
+              <!-- <el-form-item label="开始时间" prop="startTime" :formatter="dateFormatter">
                 <el-date-picker
                   class="!w-240px"
                   v-model="taskLogParams.startTime"
@@ -208,6 +208,18 @@
                   value-format="YYYY-MM-DD HH:mm:ss"
                   format="YYYY-MM-DD HH:mm:ss"
                 />
+              </el-form-item> -->
+              <el-form-item label="时间" prop="endTime" :formatter="dateFormatter">
+              <el-date-picker
+                  v-model="taskLogParams.createTime"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  type="daterange"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+                  class="!w-240px"
+                  @change="handleTaskTimeQuery"
+                />
               </el-form-item>
               <el-form-item>
                 <el-button @click="handleQuery"
@@ -283,6 +295,7 @@ import * as MapTaskAPi from '@/api/map/mapTask'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 
+
 defineOptions({ name: 'mapLogQueriesList' })
 
 const message = useMessage() // 消息弹窗
@@ -336,7 +349,8 @@ const taskLogParams = reactive({
   taskType: null, //任务类型
   taskStatus: null, //任务状态
   startTime: null, //开始时间
-  endTime: null //结束时间
+  endTime: null, //结束时间
+  createTime: []
 })
 const taskLogList = ref()
 const taskLogTotal = ref(0)
@@ -388,10 +402,16 @@ const resetQuery = () => {
     carLogParamsRef.value.resetFields()
   } else if (activeName.value == 3) {
     taskLogParamsRef.value.resetFields()
+    taskLogParams.createTime = []
   }
   handleQuery()
 }
 
+const handleTaskTimeQuery = () => {
+  taskLogParams.startTime = taskLogParams.createTime[0]
+  taskLogParams.endTime = taskLogParams.createTime[1]
+}
+
 //查询能用的车辆
 const robotList = ref([])
 const getCanUseRobotList = async () => {