Merge branch 'new' of http://122.9.151.159:9090/r/smart-web into new

李喆(开发组)

2025-11-18 f8f6aef5508148a784c05e71366796bb0b61164d

 src/views/mdc/realtime-status/index.vue

@@ -212,6 +212,7 @@
         this.gettimestatus();
      },
      next() {

         if ((this.current * this.line) < this.total / this.column) {
            this.current = Number(this.current) + 1;
            this.gettimestatus();
@@ -292,6 +293,7 @@
                        if (eventData.data.DeviceStatus) {
                           var time = moment(eventData.data.DeviceStatus.t).format('YYYY-MM-DD HH:mm:ss');
                           var preT = moment(eventData.data.DeviceStatus.preT).format('YYYY-MM-DD HH:mm:ss');
                           //console.log('time='+time+",preT="+preT);
                           var diffTime = that.changeTime(time,preT);  //转换成差值（时分秒）
                           var diffTime = diffTime;
                           item.time = diffTime;
@@ -324,8 +326,12 @@
                           } else {
                              if(eventData.data[item1.key]) {
                                 if(item1.key == "Alarm") {
                                    var vJson = JSON.parse(eventData.data[item1.key].v);
                                    item1.code = JSON.stringify(vJson[0]);
                                    try {
                                      var vJson = JSON.parse(eventData.data[item1.key].v);
                                      item1.code = JSON.stringify(vJson[0]);
                                    } catch (e) {
                                      item1.code = eventData.data[item1.key].v;
                                    }
                                 }else {
                                    item1.code = eventData.data[item1.key].v;
                                 }