Browse Source

桩号识别调整

MaiXinRong 3 years ago
parent
commit
a0a1068372

+ 1 - 1
app/lib/gcl_gather.js

@@ -85,7 +85,7 @@ const gclGatherModel = class {
      * @constructor
      */
     CheckPeg(text) {
-        const pegReg = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
+        const pegReg = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
         return pegReg.test(text);
     }
 

+ 4 - 4
app/lib/stage_im.js

@@ -145,21 +145,21 @@ class StageIm {
         return cur;
     }
     _checkPeg(text) {
-        const pegReg = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
+        const pegReg = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
         return pegReg.test(text);
     }
     _getPegStr(text) {
-        const pegReg1 = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?[~~—][a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
+        const pegReg1 = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?[~~—][a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
         const result1 = text.match(pegReg1);
         if (result1) {
             return result1[0];
         }
-        const pegReg2 = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?-[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
+        const pegReg2 = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?-[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
         const result2 = text.match(pegReg2);
         if (result2) {
             return result2[0];
         }
-        const pegReg3 = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
+        const pegReg3 = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
         const result3 = text.match(pegReg3);
         return result3 ? result3[0] : '';
 

+ 1 - 1
app/public/js/gcl_gather.js

@@ -128,7 +128,7 @@ const gclGatherModel = (function () {
      * @constructor
      */
     function CheckPeg(text) {
-        const pegReg = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
+        const pegReg = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
         return pegReg.test(text);
     }
 

+ 1 - 1
app/public/js/shares/gcl_gather_compare.js

@@ -67,7 +67,7 @@ const gclCompareModel = (function () {
      * @constructor
      */
     function CheckPeg(text) {
-        const pegReg = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
+        const pegReg = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
         return pegReg.test(text);
     }
 

+ 4 - 4
app/public/js/stage_im.js

@@ -159,22 +159,22 @@ const stageIm = (function () {
     }
 
     function CheckPeg(text) {
-        const pegReg = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
+        const pegReg = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
         return pegReg.test(text);
     }
 
     function getPegStr(text) {
-        const pegReg1 = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?[~~—][a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
+        const pegReg1 = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?[~~—][a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
         const result1 = text.match(pegReg1);
         if (result1) {
             return result1[0];
         } else {
-            const pegReg2 = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?-[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
+            const pegReg2 = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?-[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
             const result2 = text.match(pegReg2);
             if (result2) {
                 return result2[0];
             } else {
-                const pegReg3 = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
+                const pegReg3 = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
                 const result3 = text.match(pegReg3);
                 return result3 ? result3[0] : '';
             }