zgty/zgty-mas-m
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

feat:样品分析元素显示与隐藏

Browse Source
This commit is contained in:
houjunxiang
2026-02-04 15:47:05 +08:00
parent b5d87a072e
commit e10c70e819
3 changed files with 22 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nx/helper/calcAnalysisValue.js
View File

@@ -60,14 +60,17 @@ const Get_C_KNO3_bySValue = function (sValue, weight, operator) {
return '' return ''
} }
const Get_C_KNO3 = function (sValue, weight, operator) { const Get_C_KNO3 = function (weight, sValue, operator) {
//判断sValue是数字 //判断sValue是数字
const S = number(sValue)
const W = number(weight)
console.log(S, W)
if (sValue === 0 || weight === 0) { //如果样重为0就不计算
if (W === 0) {
console.log('结束')
return '' return ''
} }
let S = number(sValue)
const W = number(weight)
if (W === 0) return '' if (W === 0) return ''
const V = ((W * S) / 100) * 22 - 75 const V = ((W * S) / 100) * 22 - 75
if (operator === '<' && V < 0) { if (operator === '<' && V < 0) {

66
pages/analysis/sample/sample-work-detail.vue
View File

File diff suppressed because it is too large Load Diff

6
pages/analysis/sample/sample-work-edit-task.vue
View File

@@ -331,10 +331,10 @@ function checkPropertyEquality() {
for (const column of allColumns) { for (const column of allColumns) {
const formula = column.formula const formula = column.formula
if (!formula) continue if (!formula) continue
for (const [key, value] of Object.entries(dynamicFormData.value)) { for (const [key, value] of Object.entries(realFormData.value)) {
if (formula.includes(key)) { if (formula.includes(key)) {
const originalValue = value const currentValue = value
const currentValue = realFormData.value[key] const originalValue = dynamicFormData.value[key]
if (!looseEqual(originalValue, currentValue)) { if (!looseEqual(originalValue, currentValue)) {
return true return true
} }