diff --git a/index.html b/index.html index 537511f..c7c7ed4 100644 --- a/index.html +++ b/index.html @@ -11,8 +11,8 @@
- - - + + + diff --git a/src/components/customCom/equipmentDialog.vue b/src/components/customCom/equipmentDialog.vue index 90a2a1e..acd9f49 100644 --- a/src/components/customCom/equipmentDialog.vue +++ b/src/components/customCom/equipmentDialog.vue @@ -123,36 +123,37 @@ const open = (maId:any) => { }) } const initApiBmCompanyInfoTimeListTime = async (val: any) => { + // console.log("val-->",val) try { - // const res: any = await apiBmCompanyInfoTimeListTime(val) + const res: any = await apiBmCompanyInfoTimeListTime(val) // 假数据 - const res = [ - { - "id": 1, - "lat": 31.22, - "lon": 121.48, - "time": "2022-12-10 10:10:10" - }, - { - "id": 2, - "lat": 29.588885, - "lon": 106.621131, - "time": "2023-12-19 10:10:10" - }, - { - "id": 3, - "lat": 39.904989, - "lon": 116.405285, - "time": "2023-12-19 10:10:10" - }, - { - "id": 4, - "lat": 31.820587, - "lon": 117.227219, - "time": "2023-12-19 10:10:10" - } - ] + // const res = [ + // { + // "id": 1, + // "lat": 31.22, + // "lon": 121.48, + // "time": "2022-12-10 10:10:10" + // }, + // // { + // // "id": 2, + // // "lat": 29.588885, + // // "lon": 106.621131, + // // "time": "2023-12-19 10:10:10" + // // }, + // // { + // // "id": 3, + // // "lat": 39.904989, + // // "lon": 116.405285, + // // "time": "2023-12-19 10:10:10" + // // }, + // { + // "id": 4, + // "lat": 31.820587, + // "lon": 117.227219, + // "time": "2023-12-19 10:10:10" + // } + // ] console.log("res-apiBmCompanyInfoTimeListTime",res) // domShow.value = true // console.log("apiBmCompanyInfoTimeListTime", res) @@ -169,7 +170,7 @@ const initApiBmCompanyInfoTimeListTime = async (val: any) => { // }) } catch (error) { - + console.log('err-->>>', error) } } diff --git a/src/components/customCom/equipmentLeasing.vue b/src/components/customCom/equipmentLeasing.vue index b6fabd3..de4b486 100644 --- a/src/components/customCom/equipmentLeasing.vue +++ b/src/components/customCom/equipmentLeasing.vue @@ -65,6 +65,7 @@ import gdJSON from './mapData/gd.json' import gzJSON from './mapData/gz.json' import ynJSON from './mapData/yn.json' import hnJSON from './mapData/hn.json' +import szJSON from './mapData/sz.json' import { apiBmCompanyInfoColtdList } from "http/api/echartApi" const mapEchartsRef = ref() const equipmentDialogRef = ref() @@ -107,7 +108,8 @@ const navInfo = reactive({ }, { text: "深圳供电局", - navId: "7" + navId: "7", + // jsonData: szJSON }, { text: "超高压公司", @@ -181,7 +183,7 @@ const mapProps = reactive({ return fromatStr }, itemColorFormat: (params: any) => { - console.log("params001", params) + // console.log("params001", params) if (params.value[2] ==2) { return '#00ff31'; } else if (params.value[2] ==1) { @@ -191,56 +193,56 @@ const mapProps = reactive({ } }, effectScatterCallBack: (params: any) => { - console.log("equipmentDialogRef999", params.data.name) + console.log("equipmentDialogRef999", params) equipmentDialogRef.value.open(params.data.name) }, // seriesData:[] 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] } + // { name: 240314000002, value: [112.48461, 23.05196, 1] }, + // { name: 240314000003, value: [110.130214, 23.018978, 1] }, + // { name: 240314000004, value: [115.261081, 23.139856, 1] }, + // { name: 240314000005, value: [107.45, 22.139856, 1] }, + // { name: 240314000006, value: [106.7, 26.36, 1] }, + // { name: 240314000007, value: [102.33, 24.23, 1] }, + // { name: 240314000001, value: [110.33,19.823, 1] } ] }) let listData: any = [] const mapDataByProvice = (provinceName: String) => { - let listData = [ - // 设备租赁分布图的数据 - { - name: "广东省", - selfCount: 123, - toCount: 300, - inCount: 987 - }, - { - name: "广西壮族自治区", - selfCount: 23, - toCount: 55, - inCount: 278 - }, - { - name: "云南省", - selfCount: 256, - toCount: 2456, - inCount: 745 - }, - { - name: "贵州省", - selfCount: 963, - toCount: 4521, - inCount: 963 - }, - { - name: "海南省", - selfCount: 123, - toCount: 300, - inCount: 987 - } - ] + // let listData = [ + // // 设备租赁分布图的数据 + // { + // name: "广东省", + // selfCount: 123, + // toCount: 300, + // inCount: 987 + // }, + // { + // name: "广西壮族自治区", + // selfCount: 23, + // toCount: 55, + // inCount: 278 + // }, + // { + // name: "云南省", + // selfCount: 256, + // toCount: 2456, + // inCount: 745 + // }, + // { + // name: "贵州省", + // selfCount: 963, + // toCount: 4521, + // inCount: 963 + // }, + // { + // name: "海南省", + // selfCount: 123, + // toCount: 300, + // inCount: 987 + // } + // ] const curItem: any = listData.find((ele: any) => ele.name.slice(0, 2) == provinceName) return curItem } @@ -271,24 +273,23 @@ const iniTapibmCompanyInfoColtdList = async () => { let item: any = {} item.name = ele.companyName ele.coltdVo.forEach((eleS: any) => { - console.log() - if (eleS.status == "在租") { + if (eleS.status == "110") { item.selfCount = eleS.count } eleS.list.forEach((subEle: any) => { if (!uniqueInfo[subEle.maId]) { seriresData.push({ name: subEle.maId, - value: [Number(subEle.lon), Number(subEle.lat),eleS.count,3] + value: [Number(subEle.lon), Number(subEle.lat),eleS.count,3]// 参数1:经度, 参数2:纬度, 参数3:数量, 参数4:状态 }) uniqueInfo[subEle.maId] = true } }) }) - item.toCount = ele.coltdVo.forEach((eleS: any) => { - if (eleS.status == "待租") { - item.toCount = ele.count + ele.coltdVo.forEach((eleS: any) => { + if (eleS.status == "20") { + item.toCount = eleS.count } eleS.list.forEach((subEle: any) => { @@ -301,9 +302,9 @@ const iniTapibmCompanyInfoColtdList = async () => { } }) }) - item.inCount = ele.coltdVo.forEach((eleS: any) => { - if (eleS.status == "自有") { - item.inCount = ele.count + ele.coltdVo.forEach((eleS: any) => { + if (eleS.status == "10") { + item.inCount = eleS.count } eleS.list.forEach((subEle: any) => { @@ -318,9 +319,11 @@ 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("listData", res, listData, seriresData) + console.log('mapProps--->', mapProps.seriesData) } catch (error) { console.log(error) diff --git a/src/components/customCom/hotProvider.vue b/src/components/customCom/hotProvider.vue index 4e153ec..3260e14 100644 --- a/src/components/customCom/hotProvider.vue +++ b/src/components/customCom/hotProvider.vue @@ -23,7 +23,7 @@
- {{ item.ownCo }} + {{ item.organizeName }}
@@ -32,7 +32,7 @@
- +
@@ -41,37 +41,37 @@ import CloudWords from "components/echartsCom/CloudWords.vue" import { apiMaDevInfoHotList } from "http/api/echartApi" - +const data: any = ref([]) const providerInfo: any = reactive({ list: [ - { - ownCo: "中铁一局", - count: 1 - }, - { - ownCo: "中铁二局", - count: 2 - }, - { - ownCo: "中铁三局", - count: 3 - }, - { - ownCo: "中铁四局", - count: 4 - }, - { - ownCo: "中铁五局", - count: 5 - }, - { - ownCo: "中铁十一局", - count: 10 - }, - { - ownCo: "中铁十一局", - count: 10 - }, + // { + // ownCo: "中铁一局", + // count: 1 + // }, + // { + // ownCo: "中铁二局", + // count: 2 + // }, + // { + // ownCo: "中铁三局", + // count: 3 + // }, + // { + // ownCo: "中铁四局", + // count: 4 + // }, + // { + // ownCo: "中铁五局", + // count: 5 + // }, + // { + // ownCo: "中铁十一局", + // count: 10 + // }, + // { + // ownCo: "中铁十一局", + // count: 10 + // }, ] }) @@ -87,6 +87,12 @@ const InitApiMaDevInfoHotList = async () => { const res: any = await apiMaDevInfoHotList() console.log("apiMaDevInfoHotList", res) providerInfo.list = res + res[0].itemNames.map((item: any) => { + data.value.push({ + name: item, + value: Math.floor(Math.random() * (519 - 199 + 1) + 169) + }) + }) } catch (error) { console.log(error) } diff --git a/src/components/customCom/mapData/sz.json b/src/components/customCom/mapData/sz.json new file mode 100644 index 0000000..e69de29 diff --git a/src/components/echartsCom/CloudWords.vue b/src/components/echartsCom/CloudWords.vue index 552ed68..570b68d 100644 --- a/src/components/echartsCom/CloudWords.vue +++ b/src/components/echartsCom/CloudWords.vue @@ -5,10 +5,20 @@