diff --git a/src/api/batch/index.ts b/src/api/batch/index.ts index 4b8cbd1..402ac08 100644 --- a/src/api/batch/index.ts +++ b/src/api/batch/index.ts @@ -24,4 +24,28 @@ export function confirmInputMdl(query?: Object) { method: 'post', data: query, }); +} +// 调整数据 +export function adjustData(query?: Object) { + return request({ + url: '/batchCheck/adjustData', + method: 'post', + data: query, + }); +} +// 读取数据 +export function readData(query?: Object) { + return request({ + url: '/batchCheck/readData', + method: 'post', + data: query, + }); +} +// 保存数据 +export function saveData(query?: Object) { + return request({ + url: '/batchCheck/saveData', + method: 'post', + data: query, + }); } \ No newline at end of file diff --git a/src/utils/classCom.ts b/src/utils/classCom.ts index a76fcf7..7b05eb4 100644 --- a/src/utils/classCom.ts +++ b/src/utils/classCom.ts @@ -161,4 +161,26 @@ function useAutoSize() { return autoSize; } -export const classCom = { decimalToHexColor, convertHexToNumber, getContrastTextColor, printBase64PDF, printPDF, useAutoSize, getDayDiff } +/** + * 计算带 > < ≥ <= 等符号的数据平均值 + * 自动提取数字,忽略符号 + * @param {Array} arr 数据数组 例如 ['<2.0', '5092.1', '≥30', '>100'] + * @returns {number} 平均值(保留2位小数) + */ +function calcMeanWithSymbols(arr) { + const numbers = arr.map(item => { + if (item === null || item === undefined || item === '') return 0 + // 去掉所有非数字、非小数点的字符(> < ≥ <= >= <= 等) + const numStr = String(item).replace(/[^\d.]/g, '') + // 转数字,无效则 0 + const num = parseFloat(numStr) + return isNaN(num) ? 0 : num + }) + const total = numbers.reduce((sum, val) => sum + val, 0) + // 平均值(严格按原数组长度计算) + const avg = total / arr.length + // 保留2位小数返回 + return Math.round(avg * 100) / 100 +} + +export const classCom = { decimalToHexColor, convertHexToNumber, getContrastTextColor, printBase64PDF, printPDF, useAutoSize, getDayDiff, calcMeanWithSymbols } diff --git a/src/views/liswork/batchAdjustment/index.vue b/src/views/liswork/batchAdjustment/index.vue index e6c4555..ac8955c 100644 --- a/src/views/liswork/batchAdjustment/index.vue +++ b/src/views/liswork/batchAdjustment/index.vue @@ -9,11 +9,11 @@
- 调整 - 保存 - 读取 - 删除 - 删除全部 + 调整 + 保存 + 读取 + + 删除全部
@@ -22,29 +22,28 @@
- - + - - +
- + — - +
- + -
+
注:请输入包含R(检验结果)的表达式, 如:R*1.1为结果调整原来的1.1倍
@@ -52,9 +51,18 @@
- - - + + + + + + + + @@ -70,26 +78,82 @@ diff --git a/src/views/liswork/labItem/index.vue b/src/views/liswork/labItem/index.vue index b0f818e..2f703dc 100644 --- a/src/views/liswork/labItem/index.vue +++ b/src/views/liswork/labItem/index.vue @@ -1,7 +1,7 @@
@@ -54,7 +54,7 @@ const columns = ref([ ]); const tableConfig = ref({ border: true, // 边框 - height: '78vh', // 高度 + height: 'calc(100% - 30px)', // 高度 highlightCurrentRow: false, // 高亮当前行 actionWidth: 60, // 操作列宽度 // cellStyle: cellStyleHd diff --git a/src/views/liswork/qualityControl/components/setBatch/index.vue b/src/views/liswork/qualityControl/qualityParameters/components/setBatch/index.vue similarity index 100% rename from src/views/liswork/qualityControl/components/setBatch/index.vue rename to src/views/liswork/qualityControl/qualityParameters/components/setBatch/index.vue diff --git a/src/views/liswork/qualityControl/components/setParams/index.vue b/src/views/liswork/qualityControl/qualityParameters/components/setParams/index.vue similarity index 99% rename from src/views/liswork/qualityControl/components/setParams/index.vue rename to src/views/liswork/qualityControl/qualityParameters/components/setParams/index.vue index c126201..846bda3 100644 --- a/src/views/liswork/qualityControl/components/setParams/index.vue +++ b/src/views/liswork/qualityControl/qualityParameters/components/setParams/index.vue @@ -212,12 +212,11 @@ watch(yq, (newVal) => {