diff --git a/components.d.ts b/components.d.ts index a0486f8..06def7a 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,28 +9,45 @@ declare module 'vue' { export interface GlobalComponents { Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default'] EditorModel: typeof import('./src/components/EditorModel/index.vue')['default'] + ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBadge: typeof import('element-plus/es')['ElBadge'] + ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] + ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] + ElCard: typeof import('element-plus/es')['ElCard'] ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] + ElCollapse: typeof import('element-plus/es')['ElCollapse'] + ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] + ElCountdown: typeof import('element-plus/es')['ElCountdown'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] + ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] + ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] + ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] + ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] + ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElSelect: typeof import('element-plus/es')['ElSelect'] + ElStep: typeof import('element-plus/es')['ElStep'] + ElSteps: typeof import('element-plus/es')['ElSteps'] + ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] diff --git a/src/assets/img/screen/999.svg b/src/assets/img/screen/999.svg new file mode 100644 index 0000000..5fb4923 --- /dev/null +++ b/src/assets/img/screen/999.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/img/screen/right_3_1.svg b/src/assets/img/screen/right_3_1.svg new file mode 100644 index 0000000..6aececb --- /dev/null +++ b/src/assets/img/screen/right_3_1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/http/api/screen/index.ts b/src/http/api/screen/index.ts index 9a56774..a84e66e 100644 --- a/src/http/api/screen/index.ts +++ b/src/http/api/screen/index.ts @@ -29,5 +29,13 @@ export const getDemandCountApi = (data: any = {}) => { export const getDeviceShareRankingApi = (data: any = {}) => { return get('/material-mall/largeScreen/getDeviceShareRanking', data) } +// 租赁跟踪 +export const getOrderTrackingApi = (data: any = {}) => { + return get('/material-mall/largeScreen/getOrderTracking', data) +} +// 租赁需求分析 +export const getLeaseCountByPublishCompanyApi = (data: any = {}) => { + return get('/material-mall/largeScreen/getLeaseCountByPublishCompany', data) +} diff --git a/src/views/big-screen/model-components/center-model.vue b/src/views/big-screen/model-components/center-model.vue index 32d08c4..e1f812a 100644 --- a/src/views/big-screen/model-components/center-model.vue +++ b/src/views/big-screen/model-components/center-model.vue @@ -51,17 +51,17 @@
- {{ devNum }} + {{ maTypeLeasingNum }} 台
-
租赁订单数
+
在租赁种类
- {{ devNum }} + {{ devLeasingNum }} 台
@@ -71,7 +71,7 @@
- {{ devNum }} + {{ devRepairingNum }} 台
@@ -80,10 +80,8 @@
- - {{ devNum }} - - 台 + {{ devUsageRatio }}% +
装备利用率
@@ -135,6 +133,10 @@ const devQcWaningNum = ref(0) const leaseNum = ref(0) const leaseOrderRatio = ref(0) const topPopularTypeName = ref('') +const maTypeLeasingNum = ref(0) +const devLeasingNum = ref(0) +const devRepairingNum = ref(0) +const devUsageRatio = ref(0) const getDevCountData = async () => { const res: any = await getDevCountApi() devNum.value = res.data.devNum @@ -146,10 +148,13 @@ const getDevCountData = async () => { leaseNum.value = result1.data.leaseNum leaseOrderRatio.value = result1.data.leaseOrderRatio topPopularTypeName.value = result1.data.topPopularTypeName - // const result = await getDevLeaseCountApi() + const { data: result }: any = await getDevLeaseCountApi() - // console.log(result) - console.log(result1) + maTypeLeasingNum.value = result.maTypeLeasingNum + devLeasingNum.value = result.devLeasingNum + devRepairingNum.value = result.devRepairingNum + devUsageRatio.value = result.devUsageRatio + console.log(result, '装备租赁') } onMounted(() => { diff --git a/src/views/big-screen/model-components/left-three-model.vue b/src/views/big-screen/model-components/left-three-model.vue index 079e5a0..784534c 100644 --- a/src/views/big-screen/model-components/left-three-model.vue +++ b/src/views/big-screen/model-components/left-three-model.vue @@ -9,6 +9,7 @@ diff --git a/src/views/big-screen/model-components/right-three-model.vue b/src/views/big-screen/model-components/right-three-model.vue index 09b1f57..ae4accb 100644 --- a/src/views/big-screen/model-components/right-three-model.vue +++ b/src/views/big-screen/model-components/right-three-model.vue @@ -9,35 +9,26 @@ @@ -599,7 +265,7 @@ onMounted(() => { left: 20%; width: 80px; height: 80px; - z-index: 999999999; + // z-index: 10; background: url('@/assets/img/screen/right_3.png') no-repeat; background-size: 100% 100%; } diff --git a/src/views/big-screen/model-components/right-two-model.vue b/src/views/big-screen/model-components/right-two-model.vue index 06b8256..e551a02 100644 --- a/src/views/big-screen/model-components/right-two-model.vue +++ b/src/views/big-screen/model-components/right-two-model.vue @@ -6,28 +6,28 @@
租赁跟踪
- 139 + {{ orderNumNew }} 单
订单数量
- 139 + {{ orderNum2 }} 单
已完成出租订单
- 139 + {{ orderNum3 }} 单
-
待接收装备
+
待出库订单
- 139 + {{ orderNum4 }} 单
正出租订单
@@ -38,6 +38,33 @@