diff --git a/src/api/map/logList.ts b/src/api/map/logList.ts
index aa126b00..bee51c12 100644
--- a/src/api/map/logList.ts
+++ b/src/api/map/logList.ts
@@ -9,3 +9,8 @@ export const getRobotTaskPage = async (data) => {
 export const getTaskDetailPage = async (params) => {
   return await request.get({ url: `/system/robot/task-detail-action-log/page`, params })
 }
+
+//用户操作记录
+export const getUserOperationLogPage = async (params) => {
+  return await request.get({ url: `/system/log/user-operation-log/page`, params })
+}
diff --git a/src/views/mapPage/logList/index.vue b/src/views/mapPage/logList/index.vue
index 4f02a4bc..3aa70f45 100644
--- a/src/views/mapPage/logList/index.vue
+++ b/src/views/mapPage/logList/index.vue
@@ -8,18 +8,19 @@
             <el-form
               class=""
               :model="operationLogParams"
-              ref="queryFormRef"
+              ref="operationLogParamsRef"
               :inline="true"
               label-width="68px"
             >
               <el-form-item label="创建时间" prop="createTime">
                 <el-date-picker
-                  class="!w-240px"
                   v-model="operationLogParams.createTime"
-                  type="datetime"
-                  placeholder="请选择创建时间"
                   value-format="YYYY-MM-DD HH:mm:ss"
-                  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"
                 />
               </el-form-item>
               <el-form-item>
@@ -44,10 +45,10 @@
               v-loading="loading"
             >
               <el-table-column label="序号" type="index" width="80" align="center" />
-              <el-table-column prop="date" label="用户名" align="center" />
-              <el-table-column prop="name" label="操作内容" align="center" />
+              <el-table-column prop="nickName" label="用户名" align="center" />
+              <el-table-column prop="operateAction" label="操作内容" align="center" />
               <el-table-column
-                prop="address"
+                prop="createTime"
                 label="操作时间"
                 align="center"
                 :formatter="dateFormatter"
@@ -70,7 +71,7 @@
             <el-form
               class=""
               :model="carLogParams"
-              ref="queryFormRef"
+              ref="carLogParamsRef"
               :inline="true"
               label-width="68px"
             >
@@ -142,7 +143,7 @@
             <el-form
               class=""
               :model="taskLogParams"
-              ref="queryFormRef"
+              ref="taskLogParamsRef"
               :inline="true"
               label-width="68px"
             >
@@ -291,8 +292,15 @@ const operationLogParams = reactive({
 })
 const operationLogList = ref()
 const operationLogTotal = ref(0)
-const getOperationLogList = () => {
-  loading.value = false
+const getOperationLogList = async () => {
+  loading.value = true
+  try {
+    const data = await LogListAPi.getUserOperationLogPage(operationLogParams)
+    operationLogList.value = data.list
+    operationLogTotal.value = data.total
+  } finally {
+    loading.value = false
+  }
 }
 //车辆日志
 const carLogParams = reactive({
@@ -361,9 +369,19 @@ const handleQuery = () => {
   }
 }
 
+const operationLogParamsRef = ref()
+const carLogParamsRef = ref()
+const taskLogParamsRef = ref()
+
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  if (activeName.value == 1) {
+    operationLogParamsRef.value.resetFields()
+  } else if (activeName.value == 2) {
+    carLogParamsRef.value.resetFields()
+  } else if (activeName.value == 3) {
+    taskLogParamsRef.value.resetFields()
+  }
   handleQuery()
 }
 
diff --git a/src/views/mapPage/realTimeMap/components-tool/editMapRouteDialog.vue b/src/views/mapPage/realTimeMap/components-tool/editMapRouteDialog.vue
index aa3dbc9b..2d13aede 100644
--- a/src/views/mapPage/realTimeMap/components-tool/editMapRouteDialog.vue
+++ b/src/views/mapPage/realTimeMap/components-tool/editMapRouteDialog.vue
@@ -53,7 +53,7 @@
               style="width: 100%"
               v-model="form.endPointY"
               :min="0"
-              :max="imgBgObj.width"
+              :max="imgBgObj.height"
               placeholder="请输入结束点位y轴"
               controls-position="right"
             />
diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue
index 77949a51..620993cb 100644
--- a/src/views/mapPage/realTimeMap/editMap.vue
+++ b/src/views/mapPage/realTimeMap/editMap.vue
@@ -2029,16 +2029,28 @@ const clickDrawSelectionArea = () => {
 //将一个数组中的点位 按照第一个和最后一个排成一条直线
 const mapPointsToLine = (points) => {
   // 找出 locationX 最大和最小的项
+  // let minXPoint = points[0]
+  // let maxXPoint = points[0]
+  // points.forEach((point) => {
+  //   if (point.locationX < minXPoint.locationX) {
+  //     minXPoint = point
+  //   }
+  //   if (point.locationX > maxXPoint.locationX) {
+  //     maxXPoint = point
+  //   }
+  // })
+
+  // 找出sortNum最小和最大的点
   let minXPoint = points[0]
   let maxXPoint = points[0]
-  points.forEach((point) => {
-    if (point.locationX < minXPoint.locationX) {
-      minXPoint = point
+  for (let i = 1; i < points.length; i++) {
+    if (points[i].sortNum < minXPoint.sortNum) {
+      minXPoint = points[i]
     }
-    if (point.locationX > maxXPoint.locationX) {
-      maxXPoint = point
+    if (points[i].sortNum > maxXPoint.sortNum) {
+      maxXPoint = points[i]
     }
-  })
+  }
 
   const dx = maxXPoint.locationX - minXPoint.locationX
   const dy = maxXPoint.locationY - minXPoint.locationY