diff --git a/.env.development b/.env.development index ad77649..ba1835b 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ # 开发环境 # 请求接口地址 VITE_REQUEST_BASE_URL = https://36.112.48.190 -#VITE_REQUEST_BASE_URL = http://10.75.15.249:8080 +#VITE_REQUEST_BASE_URL = http://10.75.166.6:8080 diff --git a/pages/views/shengchan/ribaoshuju/rbsjLsxq.vue b/pages/views/shengchan/ribaoshuju/rbsjLsxq.vue index 2946695..00fe50f 100644 --- a/pages/views/shengchan/ribaoshuju/rbsjLsxq.vue +++ b/pages/views/shengchan/ribaoshuju/rbsjLsxq.vue @@ -1,13 +1,15 @@ @@ -53,7 +79,11 @@ const dateRange = ref([]); const dataList = ref([]); const endDate = ref(''); const startDate = ref(''); -const dataStats = ref({ min: 0, max: 0, avg: 0 }); +const dataStats = ref({ + min: 0, + max: 0, + avg: 0 +}); const getJinriShengchansj = (tempDateRange) => { // console.log(tempDateRange); // 添加日期有效性检查 @@ -99,7 +129,7 @@ const getJinriYuanyouShengchansj = (tempDateRange) => { queryParms.pageSize = 500; // 添加参数有效性检查 - if (!queryParms.rqDate_begin || !queryParms.rqDate_end) { + if (!queryParms.scrq_begin || !queryParms.scrq_end) { console.error('参数格式化失败:', queryParms); return; } @@ -108,7 +138,7 @@ const getJinriYuanyouShengchansj = (tempDateRange) => { if (res.success) { console.log(res); dataList.value = res.result.records; - dataStats.value = calculateStats(dataList.value, 'rcwy'); + dataStats.value = calculateStats(dataList.value, 'rcwy').reverse(); } }); }; @@ -151,6 +181,7 @@ function calculateStats(data, field) { average: average }; } + function convertToDate(str) { try { const date = new Date(str); @@ -187,7 +218,10 @@ watch( console.warn('未知类型:', newType); } }, - { immediate: true, deep: true } + { + immediate: true, + deep: true + } ); onMounted(() => { // nextTick(); @@ -219,67 +253,64 @@ onLoad((options) => { overflow: hidden; } -.table { - min-width: 100%; - border: 2rpx solid #e8e8e8; - - .tr { - display: flex; - border-bottom: 2rpx solid #e8e8e8; - - &.header { - background-color: #fafafa; - font-weight: 600; - } - - &.even { - background-color: #f8f8f8; - } - } - - .th, - .td { - flex: 1; - min-width: 80rpx; - padding: 10rpx; - font-size: 22rpx; - font-weight: bold; - color: #333; - text-align: center; - white-space: nowrap; - height: 30rpx; - vertical-align: middle; - } - - .th1, - .td1 { - flex: 1; - max-width: 40rpx; - padding: 10rpx; - font-size: 22rpx; - font-weight: bold; - color: #333; - text-align: center; - white-space: nowrap; - height: 30rpx; - vertical-align: middle; - } - - .th { - background-color: #f0f0f0; - } - - .td.negative { - color: #ff4444; - font-weight: 500; - } +.scroll-wrapper { + width: 100%; + height: 35vh; } + +.tr { + display: flex; + min-height: 14px; + font-size: 12px; + border-bottom: 1px solid #e8e8e8; +} + +.th, +.td { + flex: 1; + min-width: 80px; + padding: 10px; + font-size: 12px; + font-weight: bold; + color: #333; + text-align: center; + white-space: nowrap; + height: 18px; + vertical-align: middle; + overflow: hidden; + text-overflow: ellipsis; +} + +.th1, +.td1 { + flex: 1; + max-width: 40px; + padding: 10px; + font-size: 12px; + font-weight: bold; + color: #333; + text-align: center; + white-space: nowrap; + height: 14px; + vertical-align: middle; +} + +.th { + background-color: #f0f0f0; +} + +.td.negative { + color: #ff4444; + font-weight: 500; +} + .empty { - padding: 40rpx; + padding: 40px; text-align: center; color: #888; - font-size: 16rpx; + font-size: 16px; } + .stats-container { display: flex; justify-content: space-around; @@ -291,6 +322,7 @@ onLoad((options) => { padding: 10px; margin: 15 15px; } + .dateSelect { display: flex; justify-content: space-around; @@ -302,6 +334,7 @@ onLoad((options) => { padding: 5px; margin: 10px; } + .stats-item { font-size: 12px; color: #00aa00; diff --git a/pages/views/shengchan/ribaoshuju/trqRbsj.vue b/pages/views/shengchan/ribaoshuju/trqRbsj.vue index f438459..156ae90 100644 --- a/pages/views/shengchan/ribaoshuju/trqRbsj.vue +++ b/pages/views/shengchan/ribaoshuju/trqRbsj.vue @@ -1,13 +1,23 @@