Merge branch 'mergeBranch' into redUrgent

src/components/normal-basic-layout/details/index.vue

@@ -130,7 +130,7 @@ export default {
     mainAData () {
       try {
         let data = this.mainAreaData.filter(e=>{
-          if(e.label !== '备注') {
+          if(e.label != '备注' && e.label != '优势信息' && e.label != '劣势信息') {
             return e
           }
         })
@@ -143,7 +143,7 @@ export default {
     mainAData2 () {
       try {
         let data = this.mainAreaData.filter(e=>{
-          if(e.label == '备注') {
+          if(e.label == '备注' || e.label == '优势信息' || e.label == '劣势信息') {
             return e
           }
         })