修改首件两检判断的bug

src/views/produce/components/qualityInspection/components/selfInspectionReporting.vue

@@ -720,14 +720,79 @@
         return true;
       },
 
+      // calcCheckResult(row, field) {
+      //   const value = Number(row[field]);
+
+      //   // 不是数字直接跳过
+      //   if (isNaN(value)) return;
+
+      //   let pass = true;
+
+      //   if (row.textType == 3) {
+      //     const min = Number(row.minValue);
+      //     const max = Number(row.maxValue);
+
+      //     if (!isNaN(min) && value < min) pass = false;
+      //     if (!isNaN(max) && value > max) pass = false;
+      //   } else {
+      //     const defaultVal = Number(row.defaultValue);
+
+      //     if (isNaN(defaultVal)) return;
+
+      //     switch (row.symbol) {
+      //       case '>':
+      //         pass = value > defaultVal;
+      //         break;
+      //       case '<':
+      //         pass = value < defaultVal;
+      //         break;
+      //       case '>=':
+      //         pass = value >= defaultVal;
+      //         break;
+      //       case '<=':
+      //         pass = value <= defaultVal;
+      //         break;
+      //       case '=':
+      //         pass = value == defaultVal;
+      //         break;
+      //     }
+      //   }
+      //   if (this.type == 1) {
+      //     row.selfCheckResult = pass ? 1 : 2;
+      //   }
+
+      //   if (this.type == 2) {
+      //     row.specialCheckResult = pass ? 1 : 2;
+      //   }
+      // },
+
       calcCheckResult(row, field) {
-        const value = Number(row[field]);
+        const rawValue = row[field];
+        if (rawValue === '' || rawValue === null || rawValue === undefined) {
+          if (this.type == 1) {
+            row.selfCheckResult = 1;
+          }
+          if (this.type == 2) {
+            row.specialCheckResult = 1;
+          }
+          return;
+        }
+
+        const value = Number(rawValue);
 
-        // 不是数字直接跳过
         if (isNaN(value)) return;
 
         let pass = true;
 
+        const symbolMap = {
+          '≥': '>=',
+          '≤': '<=',
+          '＞': '>',
+          '＜': '<'
+        };
+
+        const symbol = symbolMap[row.symbol] || row.symbol;
+
         if (row.textType == 3) {
           const min = Number(row.minValue);
           const max = Number(row.maxValue);
@@ -736,10 +801,9 @@
           if (!isNaN(max) && value > max) pass = false;
         } else {
           const defaultVal = Number(row.defaultValue);
-
           if (isNaN(defaultVal)) return;
 
-          switch (row.symbol) {
+          switch (symbol) {
             case '>':
               pass = value > defaultVal;
               break;
@@ -757,10 +821,10 @@
               break;
           }
         }
+
         if (this.type == 1) {
           row.selfCheckResult = pass ? 1 : 2;
         }
-
         if (this.type == 2) {
           row.specialCheckResult = pass ? 1 : 2;
         }

vue.config.js

@@ -32,9 +32,9 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://124.71.68.31:50001',
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18086',
-        // target: 'http://192.168.1.251:18186',
+        target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18086', // 开发环境
         // target: 'http://192.168.1.103:18086',192.168.1.116
         // target: 'http://192.168.1.144:18086',