Selaa lähdekoodia

feat: 问题修改

sunxiao 5 kuukautta sitten
vanhempi
commit
c9a49ce0b0

+ 4 - 3
src/api/report/lab.js

@@ -1,10 +1,11 @@
 import request from '@/utils/request'
 
 // 日报 - 获取首页的统计信息
-export function getHomeCounts(type) {
+export function getHomeCounts(params) {
   return request({
-    url: '/business/homeCountsInfo/'+ type,
-    method: 'get'
+    url: '/business/homeCountsInfo',
+    method: 'get',
+    params
   })
 }
 

+ 1 - 1
src/views/report/detection-month/index.vue

@@ -218,7 +218,7 @@ onMounted(async() => {
           <div class="flex items-center space-x-[20px]">
             <el-form-item label="统计时段">
               <el-radio-group v-model="queryParams.activeRadioName" @change="onRadioChange">
-                <el-radio-button label="按周" value="daterange" />
+                <el-radio-button label="自定义" value="daterange" />
                 <el-radio-button label="按月" value="month" />
               </el-radio-group>
             </el-form-item>

+ 1 - 1
src/views/report/laboratory-month/index.vue

@@ -245,7 +245,7 @@ onMounted(async () => {
           <div class="flex items-center space-x-[20px]">
             <el-form-item label="统计时段" style="flex-shrink: 0;">
               <el-radio-group v-model="queryParams.activeRadioName" @change="onRadioChange">
-                <el-radio-button label="按周" value="daterange" />
+                <el-radio-button label="自定义" value="daterange" />
                 <el-radio-button label="按月" value="month" />
               </el-radio-group>
             </el-form-item>

+ 0 - 1
src/views/report/record/index.vue

@@ -176,7 +176,6 @@ const test = (key, item) => {
     const n = item[key + 'Number'];
     if ( (n || n == 0) && Math.abs( n ) > 0.1 ) {
       color = 'red'
-      console.log( key,  );
     }
   }
 

+ 5 - 4
src/views/report/report-daily/index.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { RecordDrawer } from '@/views/report/components';
-import { getHomeCounts, getWaterFactory, getDailyTable, getDeviceList } from '@/api/report/lab';
+import { getHomeCounts, getDailyTable, getDeviceList } from '@/api/report/lab';
 import { dayjs } from 'element-plus';
 
 const drawerVisible = ref(false);
@@ -35,7 +35,7 @@ const queryParams = ref({
   assayStatus: '',
   assayDate: dayjs().format("YYYY-MM-DD"),
   deviceNo: '',
-  type: 1,
+  type: '',
   pageNum: 1,
   pageSize: 10
  });
@@ -99,11 +99,11 @@ const handleTableBtnClick = async (row) => {
 
 // 设备类型变化
 const reloadPageData = async (type) => {
-  queryParams.value.type = type || 1;
+  queryParams.value.type = type;
   queryParams.value.deviceNo = '';
   queryParams.value.pageNum = 1;
   queryParams.value.pageSize = 10;
-  const { data } = await getHomeCounts(queryParams.value.type);
+  const { data } = await getHomeCounts({type: queryParams.value.type});
   pageCountNums.value = {
     ...data,
     passAssayRates: Number(data.passAssayRates.slice(0, -1))
@@ -225,6 +225,7 @@ onMounted( async () => {
               v-model="queryParams.type"
               @change="reloadPageData"
             >
+              <el-option label="全部" value="" />
               <el-option
                 v-for="item in categoryOptions"
                 :key="item.value"