bonus
/
BigScreenUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口联调

This commit is contained in:
binbin_pan 2024-03-22 15:59:49 +08:00
parent 9e23127ce3
commit 88b4f8f016
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/customCom/equipmentDialog.vue
View File

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

15
src/components/customCom/equipmentLeasing.vue
View File

@ -159,9 +159,7 @@ const mapProps = reactive({
borderColor: "rgba(21, 29, 56,0)" borderColor: "rgba(21, 29, 56,0)"
}, },
tooltipFormat: (params: any) => { tooltipFormat: (params: any) => {
// console.log("params11", params)
const curItem = mapDataByProvice(params.name.slice(0, 2)) const curItem = mapDataByProvice(params.name.slice(0, 2))
// console.log("curitemcuritem", curItem)
if (!curItem) { if (!curItem) {
return "" return ""
} }
@ -269,20 +267,19 @@ const iniTapibmCompanyInfoColtdList = async () => {
listData = [] listData = []
let seriresData: any = [] let seriresData: any = []
const res: any = await apiBmCompanyInfoColtdList() const res: any = await apiBmCompanyInfoColtdList()
// console.log("apiBmCompanyInfoColtdList", res) // console.log('🚀 ~ iniTapibmCompanyInfoColtdList ~ res:', res);
const uniqueInfo: any = {} const uniqueInfo: any = {}
res.forEach((ele: any, index: any) => { res.forEach((ele: any, index: any) => {
let item: any = {} let item: any = {}
item.name = ele.companyName item.name = ele.companyName
ele.coltdVo.forEach((eleS: any) => { ele.coltdVo.forEach((eleS: any) => {
// console.log("eleS--->>>", eleS)
if (eleS.status === "110") { if (eleS.status === "110") {
item.selfCount = eleS.count item.inCount = eleS.count
eleS.list.forEach((subEle: any) => { eleS.list.forEach((subEle: any) => {
if (!uniqueInfo[subEle.maId]) { if (!uniqueInfo[subEle.maId]) {
seriresData.push({ seriresData.push({
name: subEle.maId, 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 uniqueInfo[subEle.maId] = true
} }
@ -299,7 +296,7 @@ const iniTapibmCompanyInfoColtdList = async () => {
} }
}) })
} else if (eleS.status === "10") { } else if (eleS.status === "10") {
item.inCount = eleS.count item.selfCount = eleS.count
eleS.list.forEach((subEle: any) => { eleS.list.forEach((subEle: any) => {
if (!uniqueInfo[subEle.maId]) { if (!uniqueInfo[subEle.maId]) {
seriresData.push({ seriresData.push({
@ -313,13 +310,9 @@ const iniTapibmCompanyInfoColtdList = async () => {
}) })
// console.log("itemitem", item)
listData.push(item) listData.push(item)
// console.log("listData", listData)
}) })
mapProps.seriesData = seriresData mapProps.seriesData = seriresData
// console.log("listData", res, listData, seriresData)
// console.log('mapProps--->', mapProps.seriesData)
} catch (error) { } catch (error) {
console.log(error) console.log(error)