Commit c9121193abdee9aee6168bcac4ed38ad28c1a860
Merge branch 'main_dev' into 'main'
Main dev See merge request yunteng/thingskit-view!176
Showing
7 changed files
with
5 additions
and
2 deletions
src/assets/external/marker/car/1.png
0 → 100644
5.85 KB
src/assets/external/marker/car/2.png
0 → 100644
5.92 KB
src/assets/external/marker/car/3.png
0 → 100644
5.92 KB
src/assets/external/marker/car/4.png
0 → 100644
5.94 KB
src/assets/external/marker/car/5.png
0 → 100644
5.95 KB
| @@ -4,6 +4,8 @@ import { AddHistoryTimeTrajectoryAmapConfig } from './index' | @@ -4,6 +4,8 @@ import { AddHistoryTimeTrajectoryAmapConfig } from './index' | ||
| 4 | import { chartInitConfig } from '@/settings/designSetting' | 4 | import { chartInitConfig } from '@/settings/designSetting' |
| 5 | import cloneDeep from 'lodash/cloneDeep' | 5 | import cloneDeep from 'lodash/cloneDeep' |
| 6 | import dataJson from './data.json' | 6 | import dataJson from './data.json' |
| 7 | +import markImage from '@/assets/external/marker/1.png' | ||
| 8 | + | ||
| 7 | 9 | ||
| 8 | export type dataJsonType = typeof dataJson //data.json类型 | 10 | export type dataJsonType = typeof dataJson //data.json类型 |
| 9 | 11 | ||
| @@ -62,7 +64,7 @@ export const option = { | @@ -62,7 +64,7 @@ export const option = { | ||
| 62 | amapLon: 104.108689, | 64 | amapLon: 104.108689, |
| 63 | amapLat: 30.66176, | 65 | amapLat: 30.66176, |
| 64 | amapZindex: 11, | 66 | amapZindex: 11, |
| 65 | - iconMarker: '1.png', | 67 | + iconMarker: markImage, |
| 66 | lineDuration: 2000, | 68 | lineDuration: 2000, |
| 67 | lineOpacity: 0.5, | 69 | lineOpacity: 0.5, |
| 68 | lineShowDir: false, | 70 | lineShowDir: false, |
| @@ -4,6 +4,7 @@ import { AddRealTimeTrajectoryAmapConfig } from './index' | @@ -4,6 +4,7 @@ import { AddRealTimeTrajectoryAmapConfig } from './index' | ||
| 4 | import { chartInitConfig } from '@/settings/designSetting' | 4 | import { chartInitConfig } from '@/settings/designSetting' |
| 5 | import cloneDeep from 'lodash/cloneDeep' | 5 | import cloneDeep from 'lodash/cloneDeep' |
| 6 | import dataJson from './data.json' | 6 | import dataJson from './data.json' |
| 7 | +import markImage from '@/assets/external/marker/1.png' | ||
| 7 | 8 | ||
| 8 | export type dataJsonType = typeof dataJson //data.json类型 | 9 | export type dataJsonType = typeof dataJson //data.json类型 |
| 9 | 10 | ||
| @@ -62,7 +63,7 @@ export const option = { | @@ -62,7 +63,7 @@ export const option = { | ||
| 62 | amapLon: 104.108689, | 63 | amapLon: 104.108689, |
| 63 | amapLat: 30.66176, | 64 | amapLat: 30.66176, |
| 64 | amapZindex: 11, | 65 | amapZindex: 11, |
| 65 | - iconMarker: '1.png', | 66 | + iconMarker: markImage, |
| 66 | lineOpacity: 0.5, | 67 | lineOpacity: 0.5, |
| 67 | lineShowDir: false, | 68 | lineShowDir: false, |
| 68 | mpBorderConfig: { | 69 | mpBorderConfig: { |