修改显示

src/views/cs/index2.vue

@@ -83,7 +83,7 @@
           生产中
         </div>
         <div class="infoModel" :style="`display:${loopIndex === k?'inline-block':''}`">
-          <div class="title">{{ i.equName }}</div>
+          <div class="title">{{ (i||{}).equName }}</div>
           <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> {{ i.quantity }}</div>
           <div class="equipmentInfo"><span style="color: #fff9">设备状态:</span> {{
               parseFloat(i.quantity) > 0 ? '运行' : '停机'
@@ -96,10 +96,10 @@
            :style="`top: ${equipmentLocation[k].top}%;left: ${equipmentLocation[k].left}%;`">
         <div :class="equipmentLocation[k].isRight?`equipmentName1`:`equipmentName`"
              :style="`display:${loopIndex === 18+k?'inline-block':''}`">
-          <div class="title">{{ i.equName }}</div>
+          <div class="title">{{ (i||{}).equName }}</div>
-          <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> {{ i.quantity }}</div>
+          <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> {{ (i||{}).quantity }}</div>
           <div class="equipmentInfo"><span style="color: #fff9">设备状态:</span> {{
-              parseFloat(i.quantity) > 0 ? '运行' : '停机'
+              parseFloat((i||{}).quantity) > 0 ? '运行' : '停机'
             }}
           </div>
         </div>
@@ -108,7 +108,7 @@
            v-for="(i,k) in ringLocation"></div>
 
 
-      <div :class="`${i.IsLoad? 'agv2':'agv1'}`" v-for="i in agvData" v-show="i.show"
+      <div :class="`${i.IsLoad? 'agv2':'agv1'}`" v-for="i in agvData" v-show="i.show && !(i.x>0.3&&i.x<0.62 && i.y <0.8)"
            :style="`${getLocation(i.x,i.y)}transform: rotate(${parseFloat(i.rotate )- 180}deg);`"></div>
     </div>
   </div>
@@ -350,6 +350,8 @@ export default {
     },
     getData() {
 
+
+
       let time = parseTime(new Date(), '{h}-{i}').split('-')
       let i = parseFloat(time[0]) || 0
       let s = parseFloat(time [1]) || 0
@@ -382,6 +384,8 @@ export default {
         }
         this.hfData = hfArr
         this.equipmentData = equipmentArr
+        console.log(this.hfData)
+        console.log(this.equipmentData)
       })
     }
   },

src/views/cs/index3.vue

@@ -134,7 +134,7 @@ export default {
   methods: {
     getData() {
       dryRoomDataCarousel().then(e => {
-        this.table1Data = e.data.dryingroomList || []
+        this.table1Data = e.data.dryingroomList.filter(v=>parseFloat(v.expend/v.yield)) || []
       })
       EnergyExpend().then(e => {
         this.expend = e.map(v => v.expend).reduce((a, b) => a + b, 0).toFixed(2)
@@ -206,7 +206,8 @@ export default {
             axisLabel: {
               color: '#ccc'
             },
-            data: e.checkList.map(v => v.machineName),
+            // data: e.checkList.map(v => v.machineName),
+            data: e.checkList.map((v,k) => '产品'+k),
           },
           series: [
             {