@@ -319,6 +319,14 @@ const handleDetail = (type: any) => {
params.title = '需求应答率'
params.type = 12
path = '/detail-list'
+ } else if (type == 20) {
+ params.title = '累计数'
+ params.type = 20
+ path = '/detail-list-new'
+ } else if (type == 21) {
+ params.title = '需求单位'
+ params.type = 21
+ path = '/detail-list-new'
}
router.push({
path,
diff --git a/src/views/big-screen/model-components/detailList.vue b/src/views/big-screen/model-components/detailList.vue
index a6c5100..1c26bfc 100644
--- a/src/views/big-screen/model-components/detailList.vue
+++ b/src/views/big-screen/model-components/detailList.vue
@@ -43,7 +43,9 @@
{{ row.leaseTotal || 0 }} 天
- {{ row.rate ? (Number(row.rate) * 100).toFixed(0) : 0 }}%
+ {{ row.rate ? (Number(row.rate) * 100).toFixed(0) : 0 }}%
{{ row.estimateDays || 0 }} 天
diff --git a/src/views/big-screen/model-components/details-new.vue b/src/views/big-screen/model-components/details-new.vue
index c30b4f3..b32eace 100644
--- a/src/views/big-screen/model-components/details-new.vue
+++ b/src/views/big-screen/model-components/details-new.vue
@@ -58,6 +58,8 @@ import {
getDevLeasingNumApi,
} from '@/http/api/screen-f/index.ts'
+import { getTotalCountApi, getDemandUnitApi } from '@/http/api/screen/index.ts'
+
const router = useRouter()
const currentType = ref(router.currentRoute.value.query.type)
const title = ref(router.currentRoute.value.query.title)
@@ -74,6 +76,7 @@ const orderCount = ref(0)
// 应答率
const answerRate = ref(0)
const columns = ref([])
+
if (currentType.value == 1 || currentType.value == 2) {
columns.value = [
{ label: '机具类型', prop: 'typeName' },
@@ -106,7 +109,7 @@ if (currentType.value == 1 || currentType.value == 2) {
{ label: '租赁单价', prop: 'dayLeasePrice' },
{ label: '租赁次数', prop: 'rentNum' },
]
-} else if (currentType.value == 6) {
+} else if (currentType.value == 6 || currentType.value == 20) {
columns.value = [
{ label: '机具名称', prop: 'deviceName' },
{ label: '规格型号', prop: 'modelName' },
@@ -120,6 +123,11 @@ if (currentType.value == 1 || currentType.value == 2) {
{ label: '订单结束时间', prop: 'endTime' },
{ label: '租赁金额', prop: 'cost' },
]
+} else if (currentType.value == 21) {
+ columns.value = [
+ { label: '单位名称', prop: 'deptName' },
+ { label: '创建时间', prop: 'createTime' },
+ ]
}
const total = ref(0)
@@ -136,6 +144,7 @@ const indexContinuation = (index) => {
}
const getList = async () => {
+ console.log('currentType.value ', currentType.value)
try {
const params = {
pageNum: queryParams.value.pageNum,
@@ -161,6 +170,10 @@ const getList = async () => {
} else if (currentType.value == 6) {
// 需求装备种类
res = await getDevLeasingNumApi(params)
+ } else if (currentType.value == 20) {
+ res = await getTotalCountApi(params)
+ } else if (currentType.value == 21) {
+ res = await getDemandUnitApi(params)
}
// console.log('🚀 ~ getList ~ res:', res)