增加点标记

ruoyi-ui/src/views/basecar/car/index.vue

@@ -305,22 +305,28 @@
       <el-table-column :label="t('baseCar.car.carQueueId')" align="center" prop="carQueueId" width="150"/>
       <el-table-column :label="t('baseCar.car.carTypeId')" align="center" prop="carTypeId" :width="locale ? 150:170"/>
       <el-table-column :label="t('baseCar.car.carLicense')" align="center" prop="carLicense" width="150"/>
-      <el-table-column :label="t('baseCar.car.carLicenseIn')" align="center" prop="carLicenseIn" :width="locale ? 150:170"/>
+      <el-table-column :label="t('baseCar.car.carLicenseIn')" align="center" prop="carLicenseIn"
-      <el-table-column :label="t('baseCar.car.carLicenseParent')" align="center" prop="carLicenseParent" :width="locale ? 150:170"/>
+                       :width="locale ? 150:170"/>
+      <el-table-column :label="t('baseCar.car.carLicenseParent')" align="center" prop="carLicenseParent"
+                       :width="locale ? 150:170"/>
       <el-table-column :label="t('baseCar.car.carIdParent')" align="center" prop="carIdParent" width="150"/>
       <el-table-column :label="t('baseCar.car.userId')" align="center" prop="userId" width="150"/>
       <el-table-column :label="t('baseCar.car.userName')" align="center" prop="userName" width="150"/>
       <el-table-column :label="t('baseCar.car.deviceId')" align="center" prop="deviceId" width="150"/>
-      <el-table-column :label="t('baseCar.car.deviceBindTime')" align="center" prop="deviceBindTime" :width="locale ? 150:170"/>
+      <el-table-column :label="t('baseCar.car.deviceBindTime')" align="center" prop="deviceBindTime"
-      <el-table-column :label="t('baseCar.car.firstChangeDate')" align="center" prop="firstChangeDate" :width="locale ? 150:170"/>
+                       :width="locale ? 150:170"/>
+      <el-table-column :label="t('baseCar.car.firstChangeDate')" align="center" prop="firstChangeDate"
+                       :width="locale ? 150:170"/>
       <el-table-column :label="t('baseCar.car.trailerNum')" align="center" prop="trailerNum" width="150"/>
-      <el-table-column :label="t('baseCar.car.isHandDevice')" align="center" prop="isHandDevice" :width="locale ? 150:310"/>
+      <el-table-column :label="t('baseCar.car.isHandDevice')" align="center" prop="isHandDevice"
-      <el-table-column :label="t('baseCar.car.isHasDevice')" align="center" prop="isHasDevice" :width="locale ? 150:260"/>
+                       :width="locale ? 150:310"/>
+      <el-table-column :label="t('baseCar.car.isHasDevice')" align="center" prop="isHasDevice"
+                       :width="locale ? 150:260"/>
       <el-table-column :label="t('baseCar.car.longitude')" align="center" prop="longitude" width="150"/>
       <el-table-column :label="t('baseCar.car.latitude')" align="center" prop="latitude" width="150"/>
       <el-table-column :label="t('baseCar.car.tiresTotal')" align="center" prop="tiresTotal" width="150"/>
       <el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>
-      <el-table-column :label="t('common.createTime')" align="center" prop="createTime" width="150"/>
+      <el-table-column :label="t('common.createTime')" align="center" prop="createTime" width="160"/>
       <el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>
       <el-table-column :label="t('common.createBy')" align="center" prop="createBy" width="150"/>
       <el-table-column :label="t('common.creatorName')" align="center" prop="createName" width="150"/>
@@ -417,8 +423,8 @@
               type="date"
               format="YYYY/MM/DD"
               value-format="YYYY-MM-DD"
-              :placeholder="t('common.PleaseSelect') + t('baseCar.car.deviceBindTime')">
+              :placeholder="t('common.PleaseSelect') + t('baseCar.car.deviceBindTime')"
-          </el-date-picker>
+          />
         </el-form-item>
         <el-form-item :label="t('baseCar.car.firstChangeDate')" prop="firstChangeDate">
           <el-date-picker
@@ -427,8 +433,8 @@
               type="date"
               format="YYYY/MM/DD"
               value-format="YYYY-MM-DD"
-              :placeholder="t('common.PleaseSelect') + t('baseCar.car.firstChangeDate')">
+              :placeholder="t('common.PleaseSelect') + t('baseCar.car.firstChangeDate')"
-          </el-date-picker>
+          />
         </el-form-item>
         <el-form-item :label="t('baseCar.car.trailerNum')" prop="trailerNum">
           <el-input
@@ -472,8 +478,8 @@
               type="date"
               format="YYYY/MM/DD"
               value-format="YYYY-MM-DD"
-              :placeholder="t('common.PleaseSelect') + t('common.createTime')">
+              :placeholder="t('common.PleaseSelect') + t('common.createTime')"
-          </el-date-picker>
+          />
         </el-form-item>
         <el-form-item :label="t('common.creatorId')" prop="createId">
           <el-input
@@ -497,8 +503,8 @@
               type="date"
               format="YYYY/MM/DD"
               value-format="YYYY-MM-DD"
-              :placeholder="t('common.PleaseSelect') + t('common.editTime')">
+              :placeholder="t('common.PleaseSelect') + t('common.editTime')"
-          </el-date-picker>
+          />
         </el-form-item>
         <el-form-item :label="t('common.editID')" prop="modifyId">
           <el-input
@@ -754,7 +760,7 @@ function handleExport() {
 getList();
 </script>
 <style>
-.el-form-item__label{
+.el-form-item__label {
-  line-height:16px !important;
+  line-height: 16px !important;
 }
 </style>

ruoyi-ui/src/views/demo/map.vue

@@ -31,8 +31,14 @@ AMapLoader.load({
     center: [116.397428, 39.90923], //初始化地图中心点位置
   });
 
+  let marker = new AMap.Marker({
+    position: new AMap.LngLat(116.478935, 39.997761),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+    title: '北京'
+  });
+  map.add(marker);
+  map.setFitView()
   // initroad()
-  pathSimplifierInsLine()
+  // pathSimplifierInsLine()
 }).catch(e => {
   console.log(e);
 })
@@ -58,7 +64,7 @@ const initroad = () => {
 
   map.add(polyline);
   map.add(passedPolyline);
-  map.setFitView(map.getAllOverlays("polyline"))
+  map.setFitView()
   mouseTool = new AMap.MouseTool(map);
 
   mouseTool.rule({