Merge branch 'develop' 碳源投加公式变更

src/views/control/MedicinalView.vue

@@ -66,6 +66,8 @@ const tabActiveKey = computed(() => tabKeyEnum[baseSourceParams.value.type]);
 const tdbNum = computed(() => {
   const type = tabActiveKey.value;
 
+  const [ r1, r2, rOne, rTwo] = getTotalNum();
+ 
   const { 
     jsLlOne, jsLlTwo,
     jsCodOne, jsCodTwo,
@@ -76,22 +78,21 @@ const tdbNum = computed(() => {
     tydl, zhxs
   } = baseSourceParams.value
  
-  const { tytjzl } = waterConfigParams.value;
-
   if ( type === 'auto' || type === 'worker' ) {
-    const jsll = Math.max( jsLlOne, jsLlTwo );
-    const cod = Math.max( jsCodOne, jsCodTwo );
-    const jsTn = Math.max( jsTnOne, jsTnTwo );
-    return Number(((tytjzl*1000/jsll*tydl+cod*zhxs*tydl)/jsTn).toFixed(2));
+    const rNum = Math.max( r1, r2 );
+    const jsll = rNum == r1 ? jsLlOne: jsLlTwo;
+    const cod = rNum == r1 ? jsCodOne: jsCodTwo;
+    const jsTn = rNum == r1 ? jsTnOne: jsTnTwo;
+    const n = rNum == r1 ? rOne : rOne
+    return Number(((n*1000/jsll*tydl+cod*zhxs*tydl)/jsTn).toFixed(2)) + "%";
   }
   if ( type === 'onePool' ) {
-    return Number(((tytjzl*1000/jsLlOne*tydl+jsCodOne*zhxs*tydl)/jsTnOne).toFixed(2));
+    return Number(((rOne*1000/jsLlOne*tydl+jsCodOne*zhxs*tydl)/jsTnOne).toFixed(2)) + "%";
   }
   if ( type === 'twoPool' ) {
-    return Number(((tytjzl*1000/jsLlTwo*tydl+jsCodTwo*zhxs*tydl)/jsTnTwo).toFixed(2));
+    return Number(((rTwo*1000/jsLlTwo*tydl+jsCodTwo*zhxs*tydl)/jsTnTwo).toFixed(2)) + "%";
   }
 })
-
 watch(() => tdbNum.value , tdb => {
   columnData.value[columnData.value.length - 1].value = tdb;
 })
@@ -141,7 +142,7 @@ const onUpdateTab = (index) => {
   handleMedicateAmount();
 }
 
-const getTotalNum = () => {
+function getTotalNum() {
   const {
     hycXsyOne = 0, hycXsyTwo = 0,
     qycAdOne = 0, qycAdTwo = 0,
@@ -165,7 +166,7 @@ const getTotalNum = () => {
   const r1 = Number((rOne3 < 0 || !rOne3) ? 0 : rOne3.toFixed(3)) || 0;
   const r2 = Number((rTwo3 < 0 || !rTwo3) ? 0 : rTwo3.toFixed(3)) || 0;
 
-  return [ r1, r2 ];
+  return [ r1, r2, rOne2, rTwo2 ];
 }
 
 const onConfirmUpdate = async () => {