diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index e84d0a48..254e145b 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -61,6 +61,13 @@ export class SupplyManagementVehicleComponent implements OnInit {
...a
};
}
+ afterRes = (data: any[], rawData?: any) => {
+ console.log(data)
+ return data.map(item => ({
+ ...item,
+ disabled: item.auditStatus !== '1'
+ }));
+ };
get selectedRows() {
return this.st?.list.filter(item => item.checked) || [];
}
diff --git a/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts b/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts
index 0d350056..79644769 100644
--- a/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts
+++ b/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts
@@ -18,59 +18,60 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
pathSimplifierIns: any;
@Input()
- pathList = [
+ pathList : any= [
{
name: '路线1',
- points: [
- {
- name: '点a',
- lnglat: [116.405289, 39.904987]
- },
- {
- name: '点b',
- lnglat: [113.964458, 40.54664]
- },
- {
- name: '点c',
- lnglat: [111.47836, 41.135964]
- },
- {
- name: '点d',
- lnglat: [108.949297, 41.670904]
- },
- {
- name: '点e',
- lnglat: [106.380111, 42.149509]
- },
- {
- name: '点f',
- lnglat: [103.774185, 42.56996]
- },
- {
- name: '点g',
- lnglat: [101.135432, 42.930601]
- },
- {
- name: '点h',
- lnglat: [98.46826, 43.229964]
- },
- {
- name: '点i',
- lnglat: [95.777529, 43.466798]
- },
- {
- name: '点j',
- lnglat: [93.068486, 43.64009]
- },
- {
- name: '点k',
- lnglat: [90.34669, 43.749086]
- },
- {
- name: '点l',
- lnglat: [87.61792, 43.793308]
- }
- ]
+ points: []
+ // points: [
+ // {
+ // name: '点a',
+ // lnglat: [116.405289, 39.904987]
+ // },
+ // {
+ // name: '点b',
+ // lnglat: [113.964458, 40.54664]
+ // },
+ // {
+ // name: '点c',
+ // lnglat: [111.47836, 41.135964]
+ // },
+ // {
+ // name: '点d',
+ // lnglat: [108.949297, 41.670904]
+ // },
+ // {
+ // name: '点e',
+ // lnglat: [106.380111, 42.149509]
+ // },
+ // {
+ // name: '点f',
+ // lnglat: [103.774185, 42.56996]
+ // },
+ // {
+ // name: '点g',
+ // lnglat: [101.135432, 42.930601]
+ // },
+ // {
+ // name: '点h',
+ // lnglat: [98.46826, 43.229964]
+ // },
+ // {
+ // name: '点i',
+ // lnglat: [95.777529, 43.466798]
+ // },
+ // {
+ // name: '点j',
+ // lnglat: [93.068486, 43.64009]
+ // },
+ // {
+ // name: '点k',
+ // lnglat: [90.34669, 43.749086]
+ // },
+ // {
+ // name: '点l',
+ // lnglat: [87.61792, 43.793308]
+ // }
+ // ]
}
];
@Input()
@@ -92,6 +93,669 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
}
ngOnInit(): void {
this.mapInit();
+ const points = [
+ {
+ "agl":"0",
+ "gtm":"20210818/143018",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807550",
+ "mlg":"1002.0",
+ "spd":"60.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/143018",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807550",
+ "mlg":"1002.0",
+ "spd":"60.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/143019",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807550",
+ "mlg":"1002.0",
+ "12spd":"60.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/143020",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807550",
+ "mlg":"1002.0",
+ "spd":"60.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/143104",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807550",
+ "mlg":"1002.0",
+ "spd":"60.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/143105",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807550",
+ "mlg":"1002.0",
+ "spd":"60.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/143106",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807550",
+ "mlg":"1002.0",
+ "spd":"60.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/143106",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807550",
+ "mlg":"1002.0",
+ "spd":"60.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/143110",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807550",
+ "mlg":"1002.0",
+ "spd":"60.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/143113",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807549",
+ "mlg":"1002.0",
+ "spd":"60.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/143114",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807549",
+ "mlg":"1002.0",
+ "spd":"60.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/143115",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807549",
+ "mlg":"1002.0",
+ "spd":"60.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/143116",
+ "hgt":"500",
+ "lat":"23986841",
+ "lon":"69807549",
+ "mlg":"1002.0",
+ "spd":"60.0"
+ },
+ {
+ "agl":"213",
+ "gtm":"20210818/145810",
+ "hgt":"500",
+ "lat":"18249159",
+ "lon":"69784998",
+ "mlg":"1913.0",
+ "spd":"75.0"
+ },
+ {
+ "agl":"201",
+ "gtm":"20210818/145820",
+ "hgt":"500",
+ "lat":"18241809",
+ "lon":"69781350",
+ "mlg":"1916.0",
+ "spd":"104.0"
+ },
+ {
+ "agl":"201",
+ "gtm":"20210818/145830",
+ "hgt":"500",
+ "lat":"18234378",
+ "lon":"69777969",
+ "mlg":"1919.0",
+ "spd":"79.0"
+ },
+ {
+ "agl":"226",
+ "gtm":"20210818/145840",
+ "hgt":"500",
+ "lat":"18227730",
+ "lon":"69773709",
+ "mlg":"1922.0",
+ "spd":"80.0"
+ },
+ {
+ "agl":"244",
+ "gtm":"20210818/145850",
+ "hgt":"500",
+ "lat":"18223848",
+ "lon":"69765879",
+ "mlg":"1925.0",
+ "spd":"76.0"
+ },
+ {
+ "agl":"237",
+ "gtm":"20210818/145900",
+ "hgt":"500",
+ "lat":"18220848",
+ "lon":"69759309",
+ "mlg":"1928.0",
+ "spd":"62.0"
+ },
+ {
+ "agl":"223",
+ "gtm":"20210818/145910",
+ "hgt":"500",
+ "lat":"18216108",
+ "lon":"69752670",
+ "mlg":"1931.0",
+ "spd":"90.0"
+ },
+ {
+ "agl":"215",
+ "gtm":"20210818/145920",
+ "hgt":"500",
+ "lat":"18210438",
+ "lon":"69747369",
+ "mlg":"1934.0",
+ "spd":"80.0"
+ },
+ {
+ "agl":"223",
+ "gtm":"20210818/145930",
+ "hgt":"500",
+ "lat":"18204129",
+ "lon":"69741948",
+ "mlg":"1937.0",
+ "spd":"76.0"
+ },
+ {
+ "agl":"229",
+ "gtm":"20210818/145940",
+ "hgt":"500",
+ "lat":"18199218",
+ "lon":"69735558",
+ "mlg":"1940.0",
+ "spd":"84.0"
+ },
+ {
+ "agl":"197",
+ "gtm":"20210818/145950",
+ "hgt":"500",
+ "lat":"18193989",
+ "lon":"69730818",
+ "mlg":"1943.0",
+ "spd":"76.0"
+ },
+ {
+ "agl":"207",
+ "gtm":"20210818/150000",
+ "hgt":"500",
+ "lat":"18178518",
+ "lon":"69724290",
+ "mlg":"1949.0",
+ "spd":"101.0"
+ },
+ {
+ "agl":"221",
+ "gtm":"20210818/150010",
+ "hgt":"500",
+ "lat":"18172389",
+ "lon":"69719379",
+ "mlg":"1952.0",
+ "spd":"84.0"
+ },
+ {
+ "agl":"231",
+ "gtm":"20210818/150020",
+ "hgt":"500",
+ "lat":"18167088",
+ "lon":"69712380",
+ "mlg":"1955.0",
+ "spd":"91.0"
+ },
+ {
+ "agl":"224",
+ "gtm":"20210818/150030",
+ "hgt":"500",
+ "lat":"18161859",
+ "lon":"69705558",
+ "mlg":"1958.0",
+ "spd":"81.0"
+ },
+ {
+ "agl":"225",
+ "gtm":"20210818/150040",
+ "hgt":"500",
+ "lat":"18156309",
+ "lon":"69699270",
+ "mlg":"1961.0",
+ "spd":"90.0"
+ },
+ {
+ "agl":"227",
+ "gtm":"20210818/150050",
+ "hgt":"500",
+ "lat":"18151590",
+ "lon":"69692910",
+ "mlg":"1964.0",
+ "spd":"82.0"
+ },
+ {
+ "agl":"224",
+ "gtm":"20210818/150100",
+ "hgt":"500",
+ "lat":"18146079",
+ "lon":"69687138",
+ "mlg":"1967.0",
+ "spd":"85.0"
+ },
+ {
+ "agl":"233",
+ "gtm":"20210818/150110",
+ "hgt":"500",
+ "lat":"18141198",
+ "lon":"69680229",
+ "mlg":"1970.0",
+ "spd":"90.0"
+ },
+ {
+ "agl":"231",
+ "gtm":"20210818/150120",
+ "hgt":"500",
+ "lat":"18136299",
+ "lon":"69673020",
+ "mlg":"1973.0",
+ "spd":"88.0"
+ },
+ {
+ "agl":"198",
+ "gtm":"20210818/150130",
+ "hgt":"500",
+ "lat":"18130170",
+ "lon":"69668670",
+ "mlg":"1976.0",
+ "spd":"80.0"
+ },
+ {
+ "agl":"191",
+ "gtm":"20210818/150140",
+ "hgt":"500",
+ "lat":"18123399",
+ "lon":"69666309",
+ "mlg":"1979.0",
+ "spd":"77.0"
+ },
+ {
+ "agl":"183",
+ "gtm":"20210818/150150",
+ "hgt":"500",
+ "lat":"1813116928",
+ "lon":"69665250",
+ "mlg":"1982.0",
+ "spd":"73.0"
+ },
+ {
+ "agl":"184",
+ "gtm":"20210818/150200",
+ "hgt":"500",
+ "lat":"18110490",
+ "lon":"69664770",
+ "mlg":"1985.0",
+ "spd":"55.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150210",
+ "hgt":"500",
+ "lat":"18108669",
+ "lon":"69664578",
+ "mlg":"1988.0",
+ "spd":"0.0"
+ },
+ {
+ "agl":"184",
+ "gtm":"20210818/150220",
+ "hgt":"500",
+ "lat":"18108639",
+ "lon":"69664578",
+ "mlg":"1991.0",
+ "spd":"3.0"
+ },
+ {
+ "agl":"184",
+ "gtm":"20210818/150230",
+ "hgt":"500",
+ "lat":"18108639",
+ "lon":"69664578",
+ "mlg":"1994.0",
+ "spd":"3.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150240",
+ "hgt":"500",
+ "lat":"18108579",
+ "lon":"69664569",
+ "mlg":"1997.0",
+ "spd":"0.1"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150250",
+ "hgt":"500",
+ "lat":"18108588",
+ "lon":"69664590",
+ "mlg":"2000.0",
+ "spd":"0.1"
+ },
+ {
+ "agl":"186",
+ "gtm":"20210818/150300",
+ "hgt":"500",
+ "lat":"18108570",
+ "lon":"69664590",
+ "mlg":"2003.0",
+ "spd":"3.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150310",
+ "hgt":"500",
+ "lat":"18108480",
+ "lon":"69664590",
+ "mlg":"2006.0",
+ "spd":"0.1"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150320",
+ "hgt":"500",
+ "lat":"18108348",
+ "lon":"69664560",
+ "mlg":"2009.0",
+ "spd":"2.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150330",
+ "hgt":"500",
+ "lat":"18108330",
+ "lon":"69664560",
+ "mlg":"2012.0",
+ "spd":"2.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150340",
+ "hgt":"500",
+ "lat":"18108330",
+ "lon":"69664548",
+ "mlg":"2015.0",
+ "spd":"0.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150350",
+ "hgt":"500",
+ "lat":"18108390",
+ "lon":"69664560",
+ "mlg":"2018.0",
+ "spd":"0.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150400",
+ "hgt":"500",
+ "lat":"18108369",
+ "lon":"69664548",
+ "mlg":"2021.0",
+ "spd":"3.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150410",
+ "hgt":"500",
+ "lat":"18108348",
+ "lon":"69664548",
+ "mlg":"2024.0",
+ "spd":"0.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150420",
+ "hgt":"500",
+ "lat":"18108330",
+ "lon":"69664539",
+ "mlg":"2027.0",
+ "spd":"3.0"
+ },
+ {
+ "agl":"189",
+ "gtm":"20210818/150430",
+ "hgt":"500",
+ "lat":"18107700",
+ "lon":"69664509",
+ "mlg":"2030.0",
+ "spd":"23.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150440",
+ "hgt":"500",
+ "lat":"18107328",
+ "lon":"69664449",
+ "mlg":"2033.0",
+ "spd":"0.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150450",
+ "hgt":"500",
+ "lat":"18107298",
+ "lon":"69664449",
+ "mlg":"2036.0",
+ "spd":"0.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150500",
+ "hgt":"500",
+ "lat":"18107298",
+ "lon":"69664449",
+ "mlg":"2039.0",
+ "spd":"0.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150510",
+ "hgt":"500",
+ "lat":"18107310",
+ "lon":"69664458",
+ "mlg":"2042.0",
+ "spd":"0.0"
+ },
+ {
+ "agl":"183",
+ "gtm":"20210818/150520",
+ "hgt":"500",
+ "lat":"18107298",
+ "lon":"69664449",
+ "mlg":"2045.0",
+ "spd":"7.0"
+ },
+ {
+ "agl":"192",
+ "gtm":"20210818/150530",
+ "hgt":"500",
+ "lat":"18105558",
+ "lon":"69664200",
+ "mlg":"2048.0",
+ "spd":"52.0"
+ },
+ {
+ "agl":"196",
+ "gtm":"20210818/150540",
+ "hgt":"500",
+ "lat":"18099798",
+ "lon":"69662679",
+ "mlg":"2051.0",
+ "spd":"73.0"
+ },
+ {
+ "agl":"199",
+ "gtm":"20210818/150550",
+ "hgt":"500",
+ "lat":"18092538",
+ "lon":"69659478",
+ "mlg":"2054.0",
+ "spd":"84.0"
+ },
+ {
+ "agl":"187",
+ "gtm":"20210818/150600",
+ "hgt":"500",
+ "lat":"18085290",
+ "lon":"69657000",
+ "mlg":"2057.0",
+ "spd":"83.0"
+ },
+ {
+ "agl":"184",
+ "gtm":"20210818/150610",
+ "hgt":"500",
+ "lat":"18078798",
+ "lon":"69656340",
+ "mlg":"2060.0",
+ "spd":"64.0"
+ },
+ {
+ "agl":"219",
+ "gtm":"20210818/150620",
+ "hgt":"500",
+ "lat":"18072798",
+ "lon":"69654069",
+ "mlg":"2063.0",
+ "spd":"83.0"
+ },
+ {
+ "agl":"273",
+ "gtm":"20210818/150630",
+ "hgt":"500",
+ "lat":"18071670",
+ "lon":"69646119",
+ "mlg":"2066.0",
+ "spd":"71.0"
+ },
+ {
+ "agl":"273",
+ "gtm":"20210818/150640",
+ "hgt":"500",
+ "lat":"18072078",
+ "lon":"69638340",
+ "mlg":"2069.0",
+ "spd":"79.0"
+ },
+ {
+ "agl":"274",
+ "gtm":"20210818/150650",
+ "hgt":"500",
+ "lat":"18072090",
+ "lon":"69638208",
+ "mlg":"2072.0",
+ "spd":"78.0"
+ },
+ {
+ "agl":"257",
+ "gtm":"20210818/150700",
+ "hgt":"500",
+ "lat":"18071898",
+ "lon":"69631200",
+ "mlg":"2075.0",
+ "spd":"69.0"
+ },
+ {
+ "agl":"246",
+ "gtm":"20210818/150710",
+ "hgt":"500",
+ "lat":"18068829",
+ "lon":"69623100",
+ "mlg":"2078.0",
+ "spd":"86.0"
+ },
+ {
+ "agl":"265",
+ "gtm":"20210818/150720",
+ "hgt":"500",
+ "lat14":"18067518",
+ "lon":"69619899",
+ "mlg":"2081.0",
+ "spd":"6.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150730",
+ "hgt":"500",
+ "lat":"18067458",
+ "lon":"69619680",
+ "mlg":"2084.0",
+ "spd":"0.0"
+ },
+ {
+ "agl":"230",
+ "gtm":"20210818/150740",
+ "hgt":"500",
+ "lat":"18067449",
+ "lon":"69619650",
+ "mlg":"2087.0",
+ "spd":"3.0"
+ },
+ {
+ "agl":"0",
+ "gtm":"20210818/150750",
+ "hgt":"500",
+ "lat":"18067410",
+ "lon":"69619560",
+ "mlg":"2090.0",
+ "spd":"0.0"
+ }
+ ]
+ // "lat":"23986841",
+ // "lon":"69807550",
+ // "mlg":"1002.0",
+ // "spd":"60.0"
+ points.forEach((item) => {
+ this.pathList[0].points.push(
+ {
+ name: '海淀区',
+ lnglat: [Number(item?.mlg), Number(item?.spd)]
+ }
+ )
+ })
+ console.log(this.pathList)
}
ngOnDestroy(): void {
@@ -138,7 +802,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
var points = pathData.points,
lnglatList = [];
- for (var i = 0, len = points.length; i < len; i++) {
+ for (var i = 0, len = points?.length; i < len; i++) {
lnglatList.push(points[i].lnglat);
}
@@ -149,7 +813,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
//point
return pathData.name + ',' + pathData.points[pointIndex].name;
}
- return pathData.name + ',点数量' + pathData.points.length;
+ return pathData.name + ',点数量' + pathData.points?.length;
},
renderOptions: {
renderAllPointsIfNumberBelow: 100 //绘制路线节点,如不需要可设置为-1