diff --git a/src/assets/green.png b/src/assets/car.png
similarity index 100%
rename from src/assets/green.png
rename to src/assets/car.png
diff --git a/src/assets/login.png b/src/assets/login.png
deleted file mode 100644
index faa05692f..000000000
Binary files a/src/assets/login.png and /dev/null differ
diff --git a/src/assets/svg/back_top.svg b/src/assets/svg/back_top.svg
new file mode 100644
index 000000000..3c75ca8a1
--- /dev/null
+++ b/src/assets/svg/back_top.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/ReMap/src/Amap.vue b/src/components/ReMap/src/Amap.vue
index 36d386a03..ef2c5e931 100644
--- a/src/components/ReMap/src/Amap.vue
+++ b/src/components/ReMap/src/Amap.vue
@@ -3,7 +3,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
import { reactive, getCurrentInstance, onBeforeMount, onUnmounted } from "vue";
import { mapJson } from "/@/api/mock";
import { deviceDetection } from "/@/utils/deviceDetection";
-import greenCar from "/@/assets/green.png";
+import car from "/@/assets/car.png";
export interface MapConfigureInter {
on: Fn;
@@ -15,6 +15,10 @@ export interface MapConfigureInter {
plugin?: Fn;
}
+type resultType = {
+ info: Array;
+};
+
export interface mapInter {
loading: boolean;
}
@@ -72,7 +76,7 @@ onBeforeMount(() => {
var { driver, plateNumber, orientation } = data[0];
var content = `
`;
+ }deg);" src='${car}' />`;
marker.setContent(content);
marker.setLabel({
direction: "bottom",
@@ -92,7 +96,7 @@ onBeforeMount(() => {
// 获取模拟车辆信息
mapJson()
- .then(res => {
+ .then((res: resultType) => {
let points: object = res.info.map((v: any) => {
return {
lnglat: [v.lng, v.lat],
diff --git a/src/layout/components/appMain.vue b/src/layout/components/appMain.vue
index e28ed909d..4040f0b64 100644
--- a/src/layout/components/appMain.vue
+++ b/src/layout/components/appMain.vue
@@ -8,6 +8,7 @@ import {
getCurrentInstance
} from "vue";
import { RouterView } from "vue-router";
+import backTop from "/@/assets/svg/back_top.svg";
import { usePermissionStoreHook } from "/@/store/modules/permission";
const props = defineProps({
@@ -65,7 +66,9 @@ const transitionMain = defineComponent({
-
+
+
+
{
-