${params.name}
@@ -194,43 +194,47 @@ const mapProps = reactive({
console.log("equipmentDialogRef999", params.data.name)
equipmentDialogRef.value.open(params.data.name)
},
- 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] }]
+ // 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] }
+ ]
})
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
- // }
- // ]
+ 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
+ }
+ ]
const curItem: any = listData.find((ele: any) => ele.name.slice(0, 2) == provinceName)
return curItem
}
diff --git a/src/components/customCom/hotProvider.vue b/src/components/customCom/hotProvider.vue
index 2f38453..1f22978 100644
--- a/src/components/customCom/hotProvider.vue
+++ b/src/components/customCom/hotProvider.vue
@@ -16,8 +16,11 @@
@@ -108,8 +108,9 @@
- ![]()
+
+ 
+ 
+ 
+ 
+
+
+
{{ item.ownCo }}
@@ -40,7 +43,36 @@ import { apiMaDevInfoHotList } from "http/api/echartApi"
const providerInfo: any = reactive({
- list: []
+ list: [
+ {
+ ownCo: "中铁一局",
+ count: 1
+ },
+ {
+ ownCo: "中铁二局",
+ count: 2
+ },
+ {
+ ownCo: "中铁三局",
+ count: 3
+ },
+ {
+ ownCo: "中铁四局",
+ count: 4
+ },
+ {
+ ownCo: "中铁五局",
+ count: 5
+ },
+ {
+ ownCo: "中铁十一局",
+ count: 10
+ },
+ {
+ ownCo: "中铁十一局",
+ count: 10
+ },
+ ]
})
const subActive = ref("provider")
diff --git a/src/components/echartsCom/Pie3dCom.vue b/src/components/echartsCom/Pie3dCom.vue
index dc29913..78fb1eb 100644
--- a/src/components/echartsCom/Pie3dCom.vue
+++ b/src/components/echartsCom/Pie3dCom.vue
@@ -15,7 +15,7 @@ onMounted(() => {
Highcharts.chart('container', options)
})
-const options = {
+const options:any = {
chart: {
type: 'pie',
backgroundColor: 'rgba(0, 0, 0, 0.32)',
@@ -50,7 +50,7 @@ const options = {
},
series: [{
name: '设备数量',
- data:props.list
+ data:props.list
}]
}
diff --git a/src/http/api/echartApi.ts b/src/http/api/echartApi.ts
index 17672e5..cac21d9 100644
--- a/src/http/api/echartApi.ts
+++ b/src/http/api/echartApi.ts
@@ -18,11 +18,11 @@ export function apiMaDevInfoMatypeList() {
}
// 查询今日订单额以及订单数量:
export function apiMaOrderInfoTodayList() {
- return get('maOrderInfo/today-list', {})
+ return get('order/maOrderInfo/today-list', {})
}
// 租赁订单月统计:
export function apiMaOrderInfoList() {
- return get('maOrderInfo/list', {})
+ return get('order/maOrderInfo/list', {})
}
// --
// 获取企业所属对应的机手数量以及机手总人数:
diff --git a/src/http/index.ts b/src/http/index.ts
index 6cb4302..6bb86fd 100644
--- a/src/http/index.ts
+++ b/src/http/index.ts
@@ -34,6 +34,8 @@ service.interceptors.response.use(
)
export function get(url: string, params: any) {
+ // 拼接查询字符串 ?platformId=20
+ url += '?platformId=20'
return new Promise((resolve, reject) => {
NProgress.start()
service
@@ -41,7 +43,7 @@ export function get(url: string, params: any) {
.then((res: any) => {
NProgress.done()
console.log("res-get",res)
- if (res.code == '200') {
+ if (res.code == '0') {
resolve(res.data)
} else {
reject(res.data)
diff --git a/src/views/screen/sharePlatform.vue b/src/views/screen/sharePlatform.vue
index c951cb1..966c48a 100644
--- a/src/views/screen/sharePlatform.vue
+++ b/src/views/screen/sharePlatform.vue
@@ -6,7 +6,7 @@
- 晴转多云 16℃
+ 晴转多云 16℃
{{ nowTime }}