#

src/components/easy2/commpont/markDialog.vue

@@ -511,7 +511,7 @@ export default {
           c++
         }
       })
-      console.log(c , this.scoTitList.length);
+      // console.log(c , this.scoTitList.length);
       this.$forceUpdate()
       if (c == this.scoTitList.length) return c
       
@@ -639,7 +639,11 @@ export default {
       for (let i = 0; i < tit.length; i++) {
         if (tit[i].isai == 1) {
           let a = tit[i].detail
-          let result = a.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+          if (isNaN(parseFloat(a)) && a) {
+            var result = a.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+          }else{
+            var result = a
+          }
         
           laws += `评价维度：“${result}”， 评价细则：${tit[i].rule} \n`;
         }
@@ -744,8 +748,21 @@ export default {
             let IsAIsuccess = 0
             for (const tKey in this.scoTitList) {
               for (const key in processedData) {
-                let result = this.scoTitList[tKey].detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
-                let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+
+                if (isNaN(parseFloat(this.scoTitList[tKey].detail)) && this.scoTitList[tKey].detail) {
+                  var result = this.scoTitList[tKey].detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                }else{
+                  var result = this.scoTitList[tKey].detail
+                }
+
+                if (isNaN(parseFloat(key)) && key) {
+                  var key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                }else{
+                  var key2 = key
+                }
+                
+
+
                 if (key != "评语") {
                   let isNumK = /^\d+(\.\d+)?$/.test(processedData[key]);
                   if (result.indexOf(key2) != -1 && isNumK) {
@@ -783,8 +800,24 @@ export default {
             let processedDataCopy = {}
             for (const tKey in _this.scoTitList) {
               for (const key in processedData) {
-                let result = _this.scoTitList[tKey].detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
-                let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+
+
+                if (isNaN(parseFloat(_this.scoTitList[tKey].detail)) && _this.scoTitList[tKey].detail) {
+                  var result = _this.scoTitList[tKey].detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                }else{
+                  var result = _this.scoTitList[tKey].detail
+                }
+
+                if (isNaN(parseFloat(key)) && key) {
+                  var key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                }else{
+                  var key2 = key
+                }
+
+                // let result = _this.scoTitList[tKey].detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                // let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+
+
                 if (result.indexOf(key2) != -1) {
                   let aaa = _this.scoTitList[tKey].detail
                   processedDataCopy[aaa] = processedData[key]
@@ -977,7 +1010,7 @@ export default {
           data.forEach((e, index) => {
             if (e.userid == this.DgUid) {
               this.currentUid = e;
-              console.log('e',e);
+              // console.log('e',e);
               
               // 1截图  3问答 4word文档类型 5视频  10表格 13文档 
 
@@ -1200,8 +1233,20 @@ export default {
           e.cog = null;
           for (const key in data) {
 
-            let result = e.detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
-            let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+            if (isNaN(parseFloat(e.detail)) && e.detail) {
+              var result = e.detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+            }else{
+              var result = e.detail
+            }
+
+            if (isNaN(parseFloat(key)) && key) {
+              var key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+            }else{
+              var key2 = key
+            }
+
+            // let result = e.detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+            // let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
 
             if (result.indexOf(key2) != -1) {
               e.cog = data[key];

src/components/easy2/commpont/markScore.vue

@@ -190,8 +190,21 @@ export default {
                   // if (e.value.endsWith('。')) {
                   //   e.value = e.value.slice(0, -1); // 如果字符串以句号结尾，则去除最后一个字符
                   // }
-                  let result = e.detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
-                  let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+
+                  if (isNaN(parseFloat(e.detail)) && e.detail) {
+                    var result = e.detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                  }else{
+                    var result = e.detail
+                  }
+
+                  if (isNaN(parseFloat(key)) && key) {
+                    var key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                  }else{
+                    var key2 = key
+                  }
+
+                  // let result = e.detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                  // let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
 
                   if (result.indexOf(key2) != -1) {
                     e.cog = data[key];
@@ -527,8 +540,24 @@ export default {
 
               for (let tKey in this.scoTitList) {
                 for (let key in processedData) {
-                  let result = this.scoTitList[tKey].detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
-                  let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+
+
+                  if (isNaN(parseFloat(this.scoTitList[tKey].detail)) && this.scoTitList[tKey].detail) {
+                    var result = this.scoTitList[tKey].detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                  }else{
+                    var result = this.scoTitList[tKey].detail
+                  }
+
+                  if (isNaN(parseFloat(key)) && key) {
+                    var key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                  }else{
+                    var key2 = key
+                  }
+
+                  // let result = this.scoTitList[tKey].detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                  // let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+
+
                   if (key != "评语") {
                   let isNumK = /^\d+(\.\d+)?$/.test(processedData[key]);
 
@@ -557,8 +586,22 @@ export default {
               let processedDataCopy = {}
               for (const tKey in _this.scoTitList) {
                 for (const key in processedData) {
-                  let result = _this.scoTitList[tKey].detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
-                  let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+
+                  if (isNaN(parseFloat(_this.scoTitList[tKey].detail)) && _this.scoTitList[tKey].detail) {
+                    var result = _this.scoTitList[tKey].detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                  }else{
+                    var result = _this.scoTitList[tKey].detail
+                  }
+
+                  if (isNaN(parseFloat(key)) && key) {
+                    var key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                  }else{
+                    var key2 = key
+                  }
+
+
+                  // let result = _this.scoTitList[tKey].detail.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                  // let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
                   if (result.indexOf(key2) != -1) {
                     let aaa = _this.scoTitList[tKey].detail
                     processedDataCopy[aaa] = processedData[key]

src/components/easy2/studyStudent.vue

@@ -13712,7 +13712,13 @@ export default {
       for (let i = 0; i < tit.length; i++) {
         if(tit[i].isai == 1){
           let a = tit[i].detail
-          let result = a.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+          if (isNaN(parseFloat(a)) && a) {
+            var result = a.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+          }else{
+            var result = a
+          }
+
+          // let result = a.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
 
           laws += `评价维度：“${result}”， 评价细则：${tit[i].rule} \n`;
         }