|  | @@ -37,23 +37,23 @@
 | 
	
		
			
				|  |  |            <div class="nav-item" @click="onChange(4)">质量看板</div>
 | 
	
		
			
				|  |  |          </div>
 | 
	
		
			
				|  |  |          <div class="msg-2">
 | 
	
		
			
				|  |  | -          <div class="line-itme px-1">
 | 
	
		
			
				|  |  | -            <div class="items i-l c-g">
 | 
	
		
			
				|  |  | +          <div :class="['line-itme', index < 3 ? 'px-' + (index + 1) : 'px-' + (5-index)]" v-for="(item, index) in equipmentList">
 | 
	
		
			
				|  |  | +            <div :class="{'items':true, 'i-l':true, 'c-b':item[0].online == 0, 'c-g':item[0].online != 0}" >
 | 
	
		
			
				|  |  |                <div class="icon"/>
 | 
	
		
			
				|  |  |                <div class="numbers">
 | 
	
		
			
				|  |  |                  <div class="number">300W转</div>
 | 
	
		
			
				|  |  | -                <div class="des"><span>设备一</span>使用人:张三</div>
 | 
	
		
			
				|  |  | +                <div class="des"><span>{{item[0].name}}</span>使用人:{{item[0].userOfName}}</div>
 | 
	
		
			
				|  |  |                </div>
 | 
	
		
			
				|  |  |              </div>
 | 
	
		
			
				|  |  | -            <div class="items i-r c-b">
 | 
	
		
			
				|  |  | +            <div :class="{'items':true, 'i-r':true, 'c-b':item[1].online == 0, 'c-g':item[1].online != 0}">
 | 
	
		
			
				|  |  |                <div class="numbers">
 | 
	
		
			
				|  |  |                  <div class="number">300W转</div>
 | 
	
		
			
				|  |  | -                <div class="des">使用人:张三<span>设备一</span></div>
 | 
	
		
			
				|  |  | +                <div class="des">使用人:{{item[1].userOfName}}<span>{{item[1].name}}</span></div>
 | 
	
		
			
				|  |  |                </div>
 | 
	
		
			
				|  |  |                <div class="icon"/>
 | 
	
		
			
				|  |  |              </div>
 | 
	
		
			
				|  |  |            </div>
 | 
	
		
			
				|  |  | -          <div class="line-itme px-2">
 | 
	
		
			
				|  |  | +          <!-- <div class="line-itme px-2">
 | 
	
		
			
				|  |  |              <div class="items i-l c-y">
 | 
	
		
			
				|  |  |                <div class="icon"/>
 | 
	
		
			
				|  |  |                <div class="numbers">
 | 
	
	
		
			
				|  | @@ -116,7 +116,7 @@
 | 
	
		
			
				|  |  |                </div>
 | 
	
		
			
				|  |  |                <div class="icon"/>
 | 
	
		
			
				|  |  |              </div>
 | 
	
		
			
				|  |  | -          </div>
 | 
	
		
			
				|  |  | +          </div> -->
 | 
	
		
			
				|  |  |          </div>
 | 
	
		
			
				|  |  |        </div>
 | 
	
		
			
				|  |  |        <div class="center-3">
 | 
	
	
		
			
				|  | @@ -214,6 +214,7 @@
 | 
	
		
			
				|  |  |  <script>
 | 
	
		
			
				|  |  |  import {getOrgName} from '@/api/org'
 | 
	
		
			
				|  |  |  import {getEquipmentRepair, getTaskCount, getEquipmentUtilizationRate, getSubmittedRecord, getEquipmentAlarm} from '@/api/home1'
 | 
	
		
			
				|  |  | +import {getEquipmentList} from '@/api/production'
 | 
	
		
			
				|  |  |  export default {
 | 
	
		
			
				|  |  |    data () {
 | 
	
		
			
				|  |  |      return {
 | 
	
	
		
			
				|  | @@ -231,7 +232,8 @@ export default {
 | 
	
		
			
				|  |  |        utilizationRateList: [], // 设备运行效率统计
 | 
	
		
			
				|  |  |        submittedRecordList: [], // 实时报工列表
 | 
	
		
			
				|  |  |        equipmentAlarmCount: 0, // 设备报警记录总数量
 | 
	
		
			
				|  |  | -      equipmentAlarmList: [] // 设备报警记录
 | 
	
		
			
				|  |  | +      equipmentAlarmList: [], // 设备报警记录
 | 
	
		
			
				|  |  | +      equipmentList: [] // 设备列表
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    created () {
 | 
	
	
		
			
				|  | @@ -269,6 +271,8 @@ export default {
 | 
	
		
			
				|  |  |        this.getSubmittedRecord()
 | 
	
		
			
				|  |  |        // 设备报警记录
 | 
	
		
			
				|  |  |        this.getEquipmentAlarm()
 | 
	
		
			
				|  |  | +      // 设备列表
 | 
	
		
			
				|  |  | +      this.getEquipmentList()
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      getFullscreenElement () {
 | 
	
		
			
				|  |  |        return (
 | 
	
	
		
			
				|  | @@ -379,6 +383,20 @@ export default {
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  | +    // 设备列表
 | 
	
		
			
				|  |  | +    getEquipmentList () {
 | 
	
		
			
				|  |  | +      let param = {current: 1, size: 10}
 | 
	
		
			
				|  |  | +      getEquipmentList(param).then(({data}) => {
 | 
	
		
			
				|  |  | +        if (data && data.code === '200') {
 | 
	
		
			
				|  |  | +          if (data.data != null && data.data.records != null) {
 | 
	
		
			
				|  |  | +            let list = data.data.records
 | 
	
		
			
				|  |  | +            for (let i = 0; i < list.length; i += 2) {
 | 
	
		
			
				|  |  | +              this.equipmentList.push(list.slice(i, i + 2))
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  | +          }
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +      })
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    }
 | 
	
		
			
				|  |  |  }
 |