diff --git a/components.d.ts b/components.d.ts
index 74cff02..08b60e6 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -9,6 +9,7 @@ declare module 'vue' {
export interface GlobalComponents {
BarCom: typeof import('./src/components/echartsCom/barCom.vue')['default']
CloudWords: typeof import('./src/components/echartsCom/CloudWords.vue')['default']
+ copy: typeof import('./src/components/mapBaidu/mapLine copy.vue')['default']
ElButton: typeof import('element-plus/es')['ElButton']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElForm: typeof import('element-plus/es')['ElForm']
@@ -24,6 +25,7 @@ declare module 'vue' {
MapEcharts: typeof import('./src/components/echarts/mapEcharts.vue')['default']
MapEcharts2: typeof import('./src/components/echartsCom/mapEcharts2.vue')['default']
MapLine: typeof import('./src/components/mapBaidu/mapLine.vue')['default']
+ 'MapLine copy': typeof import('./src/components/mapBaidu/mapLine copy.vue')['default']
Pie3dCom: typeof import('./src/components/echartsCom/Pie3dCom.vue')['default']
Pie3dCom1: typeof import('./src/components/echartsCom/Pie3dCom1.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/customCom/equipmentDialog.vue b/src/components/customCom/equipmentDialog.vue
index 9ba24c3..d95aa10 100644
--- a/src/components/customCom/equipmentDialog.vue
+++ b/src/components/customCom/equipmentDialog.vue
@@ -39,7 +39,7 @@ import moment from "moment";
const mapLineShow = ref(false)
const mapLineRef = ref()
const timeRange = ref<[Date, Date]>([
- new Date(2023, 11, 10, 10, 10),
+ new Date(2022, 11, 10, 10, 10),
new Date(2023, 12, 19, 10, 10),
])
const detailsInfo = reactive({
@@ -100,6 +100,7 @@ const searchByTimeFn=()=>{
startTime:moment(timeRange.value[0]).format('YYYY.MM.DD'),
endTime:moment(timeRange.value[1]).format('YYYY.MM.DD'),
id:maId
+ // id:1
}
mapLineRef.value.initMapLine(params)
}
@@ -112,6 +113,7 @@ const open = (maId:any) => {
startTime:moment(timeRange.value[0]).format('YYYY.MM.DD'),
endTime:moment(timeRange.value[1]).format('YYYY.MM.DD'),
id:maId
+ // id:1
}
setTimeout(()=>{
mapLineRef.value.initMapLine(params)
diff --git a/src/components/customCom/equipmentLeasing.vue b/src/components/customCom/equipmentLeasing.vue
index 1c79712..2b71274 100644
--- a/src/components/customCom/equipmentLeasing.vue
+++ b/src/components/customCom/equipmentLeasing.vue
@@ -182,28 +182,26 @@ const mapProps = reactive({
},
itemColorFormat: (params: any) => {
console.log("params001", params)
- if (params.value[2] > 0 && params.value[2] <= 100) {
+ if (params.value[2] ==2) {
return '#00ff31';
- } else if (params.value[2] > 100 && params.value[2] <= 200) {
+ } else if (params.value[2] ==1) {
return '#f00';
- } else if (params.value[2] > 200 && params.value[2] <= 300) {
- return '#0ff';
- } else if (params.value[2] > 300 && params.value[2] <= 400) {
+ } else if (params.value[2] ==3) {
return '#ff0';
}
},
effectScatterCallBack: (params: any) => {
- console.log("equipmentDialogRef", params.data.name)
+ console.log("equipmentDialogRef999", params.data.name)
equipmentDialogRef.value.open(params.data.name)
},
- seriesData: []
- // [{ name: '肇庆市', value: [112.48461, 23.05196, 100] },
- // { name: '佛山市', value: [110.130214, 23.018978, 200] },
- // { name: '广州', value: [115.261081, 23.139856, 300] },
- // { name: '南宁', value: [107.45, 22.139856, 400] },
- // { name: '贵阳', value: [106.7, 26.36, 200] },
- // { name: '昆明', value: [102.33, 24.23, 300] } ,
- // { name: '海口', value: [110.33,19.823, 10] }]
+ seriesData:[]
+ // [{ name: '肇庆市', value: [112.48461, 23.05196, 1] },
+ // { name: '佛山市', value: [110.130214, 23.018978, 1] },
+ // { name: '广州', value: [115.261081, 23.139856, 1] },
+ // { name: '南宁', value: [107.45, 22.139856, 1] },
+ // { name: '贵阳', value: [106.7, 26.36, 1] },
+ // { name: '昆明', value: [102.33, 24.23, 1] } ,
+ // { name: '海口', value: [110.33,19.823, 1] }]
})
let listData: any = []
const mapDataByProvice = (provinceName: String) => {
@@ -271,7 +269,7 @@ const iniTapibmCompanyInfoColtdList = async () => {
if (!uniqueInfo[subEle.maId]) {
seriresData.push({
name: subEle.maId,
- value: [Number(subEle.lon), Number(subEle.lat),eleS.count]
+ value: [Number(subEle.lon), Number(subEle.lat),eleS.count,3]
})
uniqueInfo[subEle.maId] = true
}
@@ -287,7 +285,7 @@ const iniTapibmCompanyInfoColtdList = async () => {
if (!uniqueInfo[subEle.maId]) {
seriresData.push({
name: subEle.maId,
- value: [Number(subEle.lon), Number(subEle.lat),eleS.count]
+ value: [Number(subEle.lon), Number(subEle.lat),eleS.count,2]
})
uniqueInfo[subEle.maId] = true
}
@@ -302,7 +300,7 @@ const iniTapibmCompanyInfoColtdList = async () => {
if (!uniqueInfo[subEle.maId]) {
seriresData.push({
name: subEle.maId,
- value: [Number(subEle.lon), Number(subEle.lat),eleS.count]
+ value: [Number(subEle.lon), Number(subEle.lat),eleS.count,1]
})
uniqueInfo[subEle.maId] = true
}
diff --git a/src/components/mapBaidu/mapLine copy.vue b/src/components/mapBaidu/mapLine copy.vue
new file mode 100644
index 0000000..a9254bf
--- /dev/null
+++ b/src/components/mapBaidu/mapLine copy.vue
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/mapBaidu/mapLine.vue b/src/components/mapBaidu/mapLine.vue
index 74b9366..e1273fb 100644
--- a/src/components/mapBaidu/mapLine.vue
+++ b/src/components/mapBaidu/mapLine.vue
@@ -1,46 +1,53 @@
-