Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new

yangys

2025-11-18 831cfa4c439c6d073d706a82d2a439f8b1818498

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

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-09 22:11:21
 * @LastEditors: 李喆(开发组) lzhe@yxqiche.com
 * @LastEditTime: 2025-04-16 12:05:31
 * @LastEditTime: 2025-05-28 13:45:33
 * @FilePath: /cps-web/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;
                                 }
@@ -360,6 +366,7 @@
         this.$HTTP.get(`/api/mdc/work-station-analysis/device-status-statistics`).then(res => {
            if (res.code == 200) {
               var deviceNumAll = 0;
               var newResData = [];
               res.data.forEach(item => {
                  item.active = false;
                  this.allwcs.forEach(item1 => {
@@ -371,13 +378,23 @@
                     item.active = true;
                  }
                  deviceNumAll += item.deviceNum;
                  /*
                  //调试 后端数据已经取消
                  if(item.statusName != '调试') {
							
                  }*/
                  newResData.push(item);
                  if(item.statusName == '报警') {
                     item.icon = "Position";
                  }else if(item.statusName == '待机') {
                     item.icon = "Loading";
                  }else if(item.statusName == '离线') {
                     item.icon = "Clock";
                  }else {
                     item.icon = "Odometer";
                  }
               })
               res.data[0].icon = "Position";
               res.data[1].icon = "Loading";
               res.data[2].icon = "Clock";
               res.data[3].icon = "Warning";
               res.data[4].icon = "Odometer";
               res.data.push({
               newResData.push({
                  active: false,
                  color: "#08f1f4",
                  deviceNum: deviceNumAll,
@@ -385,7 +402,7 @@
                  status: "10",
                  statusName: "全部",
               })
               this.devicestatus = res.data;
               this.devicestatus = newResData;
            }
         })
      }