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

Reviewed-on: #244

src/views/page/dataAnalysis.vue

@@ -151,6 +151,8 @@ export default {
                     });
                     realTimeLine1('realTime-line', chartsData)
                 } else {
+                     var chartsData=[]
+                     realTimeLine1('realTime-line', chartsData)
                     this.$message.error(res.data.msg);
                 }
             })

src/views/page/realTime.vue

@@ -1367,7 +1367,60 @@ export default {
                     // })
                 }
             } else if (this.deviceName == 30) {
-               this.getControlRtDatastation(formData)
+                 this.api.getControlRtDatastation(formData).then(res => {
+                    this.controlList = []
+                      this.list = []
+                    this.updateTime=res.data.data[0].updateTime
+                    if (res.data.code == 200) {
+                        res.data.data.forEach((el, index) => {
+                            list.forEach((el1, index1) => {
+                                if (el.formula == el1.value) {
+                                    // console.log(el1);
+                                    var num = 0
+                                    var name = ''
+                                    if (el.equipmentStart == 0) {
+                                        num = '故障'
+                                    } else {
+                                        num = el.environmentData + el1.unit
+                                    }
+                                    if(el.equipmentName==30){
+                                           if (el.targetValue == 1) {
+                                        if (el.equipmentNumber == 0) {
+                                            name = '目标' + el.environmentDataId
+                                        } else {
+                                            name = '目标' + el.equipmentNumber + '#' + el.environmentDataId
+                                        }
+                                    } else {
+                                        if (el.equipmentNumber == 0) {
+                                            name = '1#平均' + el.environmentDataId
+                                        } else if (el.equipmentNumber == 15) {
+                                            name = '2#平均' + el.environmentDataId
+                                        } else {
+                                            name = el.equipmentNumber + '#' + el.environmentDataId
+                                        }
+                                    }
+                                    }else{
+                                        name=el.environmentDataId
+                                    }
+                                
+
+                                    this.list.push({
+                                        ...el,
+                                        name: name,
+                                        num: num,
+                                        img: require(`../../assets/image/real-time-${el.formula}.png`)
+                                    })
+                                    this.controlList.push({
+                                        ...el,
+                                        num: num,
+                                        img: require(`../../assets/image/real-time-${el.formula}.png`)
+                                    })
+                                }
+                            })
+                        })
+                    }
+                    // console.log(this.controlList);
+                })
                 this.api.getControlChartdata(equipmentId).then(res => {
                     if (res.data.code == 200) {
                         res.data.data.forEach((el, index) => {
@@ -1465,6 +1518,9 @@ export default {
                 })
         },
         getControlRtDatastation(formData){
+            
+            var store = this.$store.state
+               var list = store.typeList
               this.api.getControlRtDatastation(formData).then(res => {
                     this.controlList = []
                     if (res.data.code == 200) {
@@ -1491,6 +1547,9 @@ export default {
                 })
         },
         getFi_rtdata(formData){
+            
+            var store = this.$store.state
+               var list = store.typeList
               this.api.getFi_rtdata(formData).then(res=>{
                     if (res.data.code == 200) {
                         this.inputData = res.data.data;