diff --git a/src/components/customCom/equipmentDialog.vue b/src/components/customCom/equipmentDialog.vue
index 4557d94..adf7eea 100644
--- a/src/components/customCom/equipmentDialog.vue
+++ b/src/components/customCom/equipmentDialog.vue
@@ -8,7 +8,7 @@
{{detailsInfo.maName}}
(待租)
- (租赁中)
+ (在租)
(自有)
diff --git a/src/components/customCom/equipmentLeasing.vue b/src/components/customCom/equipmentLeasing.vue
index ecd5a65..8cb7550 100644
--- a/src/components/customCom/equipmentLeasing.vue
+++ b/src/components/customCom/equipmentLeasing.vue
@@ -159,9 +159,7 @@ const mapProps = reactive({
borderColor: "rgba(21, 29, 56,0)"
},
tooltipFormat: (params: any) => {
- // console.log("params11", params)
const curItem = mapDataByProvice(params.name.slice(0, 2))
- // console.log("curitemcuritem", curItem)
if (!curItem) {
return ""
}
@@ -269,20 +267,19 @@ const iniTapibmCompanyInfoColtdList = async () => {
listData = []
let seriresData: any = []
const res: any = await apiBmCompanyInfoColtdList()
- // console.log("apiBmCompanyInfoColtdList", res)
+ // console.log('🚀 ~ iniTapibmCompanyInfoColtdList ~ res:', res);
const uniqueInfo: any = {}
res.forEach((ele: any, index: any) => {
let item: any = {}
item.name = ele.companyName
ele.coltdVo.forEach((eleS: any) => {
- // console.log("eleS--->>>", eleS)
if (eleS.status === "110") {
- item.selfCount = eleS.count
+ item.inCount = eleS.count
eleS.list.forEach((subEle: any) => {
if (!uniqueInfo[subEle.maId]) {
seriresData.push({
name: subEle.maId,
- value: [Number(subEle.lon), Number(subEle.lat), 3]// 参数1:经度, 参数2:纬度, 参数3:数量, 参数4:状态
+ value: [Number(subEle.lon), Number(subEle.lat), 3]
})
uniqueInfo[subEle.maId] = true
}
@@ -299,7 +296,7 @@ const iniTapibmCompanyInfoColtdList = async () => {
}
})
} else if (eleS.status === "10") {
- item.inCount = eleS.count
+ item.selfCount = eleS.count
eleS.list.forEach((subEle: any) => {
if (!uniqueInfo[subEle.maId]) {
seriresData.push({
@@ -313,13 +310,9 @@ const iniTapibmCompanyInfoColtdList = async () => {
})
- // console.log("itemitem", item)
listData.push(item)
- // console.log("listData", listData)
})
mapProps.seriesData = seriresData
- // console.log("listData", res, listData, seriresData)
- // console.log('mapProps--->', mapProps.seriesData)
} catch (error) {
console.log(error)