Merge pull request '1' (#238) from pc-master into portal

Reviewed-on: #238

src/views/page/realTime.vue

@@ -1422,8 +1422,8 @@ export default {
                                     } else {
                                         num = el.environmentData + el1.unit
                                     }
-                                 
-                                  if (el.targetValue == 1) {
+                                    if(el.equipmentName==30){
+                                           if (el.targetValue == 1) {
                                         if (el.equipmentNumber == 0) {
                                             name = '目标' + el.environmentDataId
                                         } else {
@@ -1438,7 +1438,10 @@ export default {
                                             name = el.equipmentNumber + '#' + el.environmentDataId
                                         }
                                     }
-
+                                    }else{
+                                        name=el.environmentDataId
+                                    }
+                               
 
                                     this.list.push({
                                         ...el,