From 88b4f8f016c7326981e45b7b11b2c7bc66a7a801 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Fri, 22 Mar 2024 15:59:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/customCom/equipmentDialog.vue  |  2 +-
 src/components/customCom/equipmentLeasing.vue | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

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 @@
                 <span class="title_text">{{detailsInfo.maName}}</span>
                 <!-- <span class="sub_status">({{detailsInfo.maStatus}})</span> -->
                 <span class="sub_status" v-if="detailsInfo.maStatus === '20'">(待租)</span>
-                <span class="sub_status" v-else-if="detailsInfo.maStatus === '110'">(租赁中)</span>
+                <span class="sub_status" v-else-if="detailsInfo.maStatus === '110'">(在租)</span>
                 <span class="sub_status" v-else-if="detailsInfo.maStatus === '10'">(自有)</span>
             </div>
             <div class="more_info">
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)