fix:禅道474

src/views/statistics/total_statistics.vue

@@ -157,6 +157,12 @@ export default {
 	},
 	created() {},
 	methods: {
+		normalizeBangModel(model) {
+			if (model === "G05(粗)" || model === "G05(细)") {
+				return "G05";
+			}
+			return model;
+		},
 		getCountOk(type,models) {
 			let that = this;
 			let params = {
@@ -177,6 +183,7 @@ export default {
 							} else {
 								b_model = item.型号;
 							}
+							b_model = that.normalizeBangModel(b_model);
 							let index = models.indexOf(b_model);
 							if(index>-1){
 								that.tableData11[index].中检合格数 += item.合格数量;
@@ -189,6 +196,7 @@ export default {
 							} else {
 								b_model = item1.型号;
 							}
+							b_model = that.normalizeBangModel(b_model);
 							let index = models.indexOf(b_model);
 							if(index>-1){
 								that.tableData11[index].检验合格数 += item1.数量;
@@ -271,13 +279,15 @@ export default {
 			//按版型（型号）分组
 			data.forEach((item) => {
 				let index = 0;
+				let model = "";
 				if (item.型号.indexOf("+") > -1) {
-					let model = item.型号.split("+")[0];
+					model = item.型号.split("+")[0];
-					index = models.indexOf(model);
-					item.型号 = model;
 				} else {
-					index = models.indexOf(item.型号);
+					model = item.型号;
 				}
+				model = that.normalizeBangModel(model);
+				item.型号 = model;
+				index = models.indexOf(model);
 				if (index > -1) {
 					dataArr[index].push(item);
 				} else {
@@ -355,6 +365,7 @@ export default {
 				} else {
 					model = item.型号;
 				}
+				model = that.normalizeBangModel(model);
 				let index = models.indexOf(model);
 				if (index > -1) {
 					that.tableData11[index].检验合格数 += item.数量;